优化

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java

@@ -49,6 +49,14 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
         if (StrUtil.isNotEmpty(map.get("material_code"))) {
             map.put("material_code", "%" + map.get("material_code") + "%");
         }
+        String begin_time = map.get("begin_time");
+        if (StrUtil.isNotEmpty(begin_time)) {
+            map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
+        }
+        String end_time = map.get("end_time");
+        if (StrUtil.isNotEmpty(end_time)) {
+            map.put("end_time", end_time.substring(0,10)+" 23:59:59");
+        }
         String deptIds = DataAuthUtil.getDeptStr();
         map.put("deptIds", deptIds);
         if (StrUtil.isNotEmpty(map.get("buss_type"))) {

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql

@@ -182,7 +182,7 @@
                           struct.struct_code like 输入.struct_code
                     ENDOPTION
                     OPTION 输入.stor_id <> ""
-                          ivt2.stor_id = 输入.stor_id
+                          struct.stor_id = 输入.stor_id
                     ENDOPTION
                     OPTION 输入.sect_id <> ""
                           struct.sect_id = 输入.sect_id

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java

@@ -184,7 +184,7 @@ public class IvtQueryServiceImpl implements IvtQueryService {
             dtl_map.put("品质类型", jo.getString("quality_scode"));
             dtl_map.put("库存等级", jo.getString("ivt_level"));
             dtl_map.put("是否可用", jo.getString("is_active"));
-            dtl_map.put("桶数", jo.getString("bucket_num"));
+            dtl_map.put("桶数", jo.getIntValue("bucket_num"));
             dtl_map.put("库存重量", jo.getString("ivt_qty"));
             dtl_map.put("可用重量", jo.getString("canuse_qty"));
             dtl_map.put("冻结数", jo.getString("frozen_qty"));

mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue

@@ -130,19 +130,19 @@
     >
       <el-table-column key="1" type="index" label="序号" width="50" align="center" />
       <el-table-column v-if="crud.status.add!==1" key="2" prop="work_status" label="状态" align="center" :formatter="bill_statusFormat" />
-      <el-table-column key="3" show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
-      <el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
-      <el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="100" show-overflow-tooltip />
+      <el-table-column key="3"  prop="material_code" label="物料编码" width="120" align="center" />
+      <el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="120"  />
+      <el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="100"  />
       <el-table-column key="6" prop="qty_unit_name" label="单位" align="center" />
       <el-table-column key="7" prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
       <el-table-column key="8" prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
       <el-table-column key="9" prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
-      <el-table-column key="10" show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" width="120" align="center" />
-      <el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
-      <el-table-column key="12" show-overflow-tooltip prop="turnout_sect_name" label="移出库区" />
-      <el-table-column key="13" show-overflow-tooltip prop="turnout_struct_code" label="移出货位" />
-      <el-table-column key="14" show-overflow-tooltip prop="turnin_sect_name" label="移入库区" />
-      <el-table-column key="15" show-overflow-tooltip prop="turnin_struct_code" label="移入货位" width="190" align="center">
+      <el-table-column key="10"  prop="qty" label="重量" :formatter="crud.formatNum3" width="120" align="center" />
+      <el-table-column key="11"  prop="storagevehicle_code" label="载具号" />
+      <el-table-column key="12"  prop="turnout_sect_name" label="移出库区" />
+      <el-table-column key="13"  prop="turnout_struct_code" label="移出货位" />
+      <el-table-column key="14"  prop="turnin_sect_name" label="移入库区" />
+      <el-table-column key="15"  prop="turnin_struct_code" label="移入货位" width="190" align="center">
         <template scope="scope">
           <el-input v-show="!scope.row.edit" v-model="scope.row.turnin_struct_code" disabled class="input-with-select">
             <el-button slot="append" icon="el-icon-search" @click="queryStruct(scope.$index, scope.row)" />

mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDtl.vue

@@ -100,7 +100,7 @@ export default {
   name: 'AddDtl',
   components: { rrOperation, pagination },
   cruds() {
-    return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/handmovestor/getStructIvt',
+    return CRUD({ title: '库存物料', idField: 'stockrecord_id', url: 'api/handmovestor/getStructIvt',
       query: {
         struct_code: '',
         remark: '',

mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue

@@ -108,7 +108,8 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :default-time="['00:00:00', '23:59:59']"
-                @change="crud.toQuery"
+                @input="onInput()"
+                @change="mytoQuery"
               />
             </el-form-item>
           </el-form-item>
@@ -200,6 +201,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/st/inStor/moveStor/handmovestor/AddDialog'
 import crudStorattr from '@/api/wms/basedata/st/storattr'
+import Date from '@/utils/datetime'
 
 export default {
   name: 'Handmovestor',
@@ -234,6 +236,7 @@ export default {
       confirm_flag: true,
       mstrow: {},
       currentRow: null,
+      query_flag: true,
       storlist: []
     }
   },
@@ -247,6 +250,7 @@ export default {
     crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
       this.storlist = res.content
     })
+    this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
   },
   methods: {
     canUd(row) {
@@ -254,6 +258,11 @@ export default {
     },
     [CRUD.HOOK.beforeRefresh]() {
       this.crud.query.buss_type = ''
+      if (this.query_flag) {
+        this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
+        this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+        this.query_flag = false
+      }
       this.handleCurrentChange(null)
     },
     stateFormat(row) {
@@ -302,6 +311,19 @@ export default {
         this.currentRow = {}
       }
     },
+    onInput() {
+      this.$forceUpdate()
+    },
+    mytoQuery(array1) {
+      if (array1 === null) {
+        this.crud.query.begin_time = ''
+        this.crud.query.end_time = ''
+      } else {
+        this.crud.query.begin_time = array1[0]
+        this.crud.query.end_time = array1[1]
+      }
+      this.crud.toQuery()
+    },
     checkboxT(row) {
       return row.bill_status !== '99'
     },