优化

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

@@ -89,6 +89,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("material_code"))) {
             map.put("material_code", "%" + map.get("material_code") + "%");
         }
+        if (StrUtil.isNotEmpty(map.get("username"))) {
+            map.put("username", "%" + map.get("username") + "%");
+        }
         if (StrUtil.isNotEmpty(map.get("pcsn"))) {
             map.put("pcsn", "%" + map.get("pcsn") + "%");
         }
@@ -100,6 +103,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(end_time)) {
             map.put("end_time", end_time.substring(0,10)+" 23:59:59");
         }
+        String source_bill_code = map.get("source_bill_code");
+        if (StrUtil.isNotEmpty(source_bill_code)) {
+            StringBuilder sb = new StringBuilder();
+            String[] strs = source_bill_code.split(",");
+            for(int i=0;i<strs.length;i++){
+                sb.append(",'" + strs[i] + "'");
+            }
+            String str = sb.toString();
+            str = "(" + str.substring(1) + ")";
+            map.put("source_bill_code", str);
+        }
         JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iosdtl2.material_id");
         return jo;
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql

@@ -16,7 +16,7 @@
 	输入.flag					        TYPEAS s_string
     输入.bill_status					    TYPEAS s_string
 	输入.bill_code					    TYPEAS s_string
-	输入.source_bill_code					    TYPEAS s_string
+	输入.source_bill_code					    TYPEAS f_string
 	输入.username					    TYPEAS s_string
 	输入.create_mode					    TYPEAS s_string
 	输入.bill_type					    TYPEAS s_string
@@ -632,21 +632,22 @@
                 			ST_IVT_IOStorInvDtl iosdtl
                 		LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id
                 		LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
+                		LEFT JOIN sys_user user ON ios.input_optid = user.user_id
                 		WHERE
                 			1 = 1
                 		AND ios.is_delete = '0'
                 		AND ios.bill_type in ('010301','010302')
-                        OPTION 输入.remark <> ""
-                             (mb.material_code like 输入.remark or mb.material_name like 输入.remark)
+                        OPTION 输入.material_code <> ""
+                             (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code)
                        ENDOPTION
                         OPTION 输入.username <> ""
-                            (ios.input_optid = 输入.username or ios.input_optname = 输入.username)
+                            (user.username like 输入.username or ios.input_optname like 输入.username)
                       ENDOPTION
                         OPTION 输入.pcsn <> ""
                             iosdtl.pcsn like 输入.pcsn
                       ENDOPTION
                        OPTION 输入.source_bill_code <> ""
-                               iosdtl.source_bill_code = 输入.source_bill_code
+                               iosdtl.source_bill_code in 输入.source_bill_code
                        ENDOPTION
                        OPTION 输入.begin_time <> ""
                            ios.biz_date >= 输入.begin_time

mes/qd/src/views/wms/statistics/outStorQuery/StructIvt.vue

@@ -0,0 +1,269 @@
+<template>
+  <el-dialog
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @open="open"
+  >
+    <span slot="title" class="dialog-footer">
+      <div class="crud-opts2">
+        <span class="el-dialog__title2">工令查询</span>
+        <span class="crud-opts-right2">
+          <!--左侧插槽-->
+          <slot name="left" />
+          <el-button slot="left" type="info" @click="submit">关闭</el-button>
+          <el-button slot="left" type="primary" @click="submit">确定</el-button>
+        </span>
+      </div>
+    </span>
+    <div class="head-container">
+      <div >
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="120px"
+          label-suffix=":"
+        >
+          <el-form-item label="工令号">
+            <el-input
+              v-model="query.workorder_code"
+              size="mini"
+              clearable
+              placeholder="工令号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="产品">
+            <el-input
+              v-model="query.material_id"
+              size="mini"
+              clearable
+              placeholder="物料编码或物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工令日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              @input="onInput()"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工令类型">
+            <el-select
+              v-model="query.workorder_type"
+              clearable
+              size="mini"
+              placeholder="工令类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.workorder_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="工令状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="工令状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.workorder_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="所属组织">
+            <el-select
+              v-model="query.org_id"
+              clearable
+              size="mini"
+              placeholder="所属组织"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in Depts"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-input
+              v-model="query.pcsn"
+              size="mini"
+              clearable
+              placeholder="批次"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="workorder_date" min-width="85" label="工令日期" :formatter="workorder_dateFormat"/>
+        <el-table-column prop="workorder_code" width="130" label="工令号" />
+        <el-table-column prop="org_id" :formatter="orgFormat" min-width="110" label="所属组织" />
+        <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="80" label="工令类型" />
+        <el-table-column  :formatter="stateFormat" min-width="80" prop="status" label="工令状态" />
+        <el-table-column prop="material_code" min-width="130" label="物料编码"/>
+        <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
+        <el-table-column prop="pcsn" min-width="80" label="批次"/>
+        <el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/>
+        <el-table-column prop="bill_qty" min-width="80" label="开单总重量" :formatter="crud.formatNum3" />
+        <el-table-column prop="productin_qty" min-width="100" label="实际生产重量" :formatter="crud.formatNum3"/>
+        <el-table-column prop="qty_unit_name" min-width="80" label="单位"/>
+        <el-table-column prop="remark" min-width="120" label="备注"/>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </el-dialog>
+</template>
+<script>
+
+import workorder from '@/api/wms/pdm/workorder'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
+import Date from "@/utils/datetime";
+import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
+
+export default {
+  name: 'StrctIvt',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '工令', idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['workorder_status', 'workorder_type', 'product_series'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'workorder:add'],
+        edit: ['admin', 'workorder:edit'],
+        del: ['admin', 'workorder:del']
+      },
+      dialogVisible: false,
+      XLList: [],
+      Depts: [],
+      workProcedureList: [],
+      checkrows: []
+    }
+  },
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudseriesProcessRoute.getXLlist2().then(res => {
+      this.XLList = res
+    })
+    crudWorkProcedure.downSelect().then(res => {
+      this.workProcedureList = res
+    })
+    workorder.getDepts().then(res => {
+      this.Depts = res
+    })
+  },
+  methods: {
+    open() {
+      this.crud.query.createTime = [new Date(), new Date().daysLater(1)]
+      this.crud.toQuery()
+    },
+    stateFormat(row) {
+      return this.dict.label.workorder_status[row.status]
+    },
+    bill_typeFormat(row) {
+      return this.dict.label.workorder_type[row.workorder_type]
+    },
+    seriesFormat(row) {
+      for (const item of this.XLList) {
+        if (item.id === row.product_series_id) {
+          return item.name
+        }
+      }
+    },
+    orgFormat(row) {
+      for (const item of this.Depts) {
+        if (item.id === row.org_id) {
+          return item.name
+        }
+      }
+    },
+    workorder_dateFormat(row) {
+      return row.planstart_time.substring(0, 10)
+    },
+    onInput() {
+      this.$forceUpdate()
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      this.$emit('update:dialogShow', false)
+      this.$emit('StructIvtClosed', this.rows)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>

mes/qd/src/views/wms/statistics/outStorQuery/index.vue

@@ -58,15 +58,6 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="工令">
-            <el-input
-              v-model="query.source_bill_code"
-              size="mini"
-              clearable
-              placeholder="工令"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="物料">
             <el-input
               v-model="query.material_code"
@@ -85,6 +76,11 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="工令">
+            <el-input v-model="query.source_bill_code"  size="mini" placeholder="工令号" disabled class="input-with-select">
+              <el-button slot="append" icon="el-icon-search" @click="queryMater" />
+            </el-input>
+          </el-form-item>
           <el-form-item label="人员">
             <el-input
               v-model="query.username"
@@ -109,9 +105,6 @@
         style="width: 100%;"
         :highlight-current-row="true"
         @selection-change="crud.selectionChangeHandler"
-        @current-change="handleCurrentChange"
-        @select="handleSelectionChange"
-        @select-all="onSelectAll"
       >
         <el-table-column type="index" label="序号" width="50" align="center" />
         <el-table-column prop="material_code" label="物料编码" width="150" align="center" />
@@ -127,6 +120,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <StructIvt :dialog-show.sync="structshow" @StructIvtClosed="queryTableDtl" />
   </div>
 </template>
 
@@ -138,11 +132,12 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import crudStorattr from '@/api/wms/basedata/st/storattr'
 import Date from '@/utils/datetime'
+import StructIvt from '@/views/wms/statistics/outStorQuery/StructIvt'
 import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
 
 export default {
   name: 'outStorQuery',
-  components: { crudOperation, rrOperation, pagination },
+  components: { StructIvt, crudOperation, rrOperation, pagination },
   cruds() {
     return CRUD({ title: '生产配粉领料', idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill },
       optShow: {
@@ -161,11 +156,8 @@ export default {
       height: document.documentElement.clientHeight - 180 + 'px;',
       permission: {
       },
-      divShow: false,
-      openParam: [],
-      mstrow: {},
+      structshow: false,
       currentRow: null,
-      checkrows: [],
       storlist: [],
       billtypelist: []
     }
@@ -187,31 +179,11 @@ export default {
     this.crud.toQuery()
   },
   methods: {
-    [CRUD.HOOK.beforeRefresh]() {
-      this.handleCurrentChange(null)
-    },
     onInput() {
       this.$forceUpdate()
     },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-        this.buttonChange(row)
-      } else if (val.length === 1) {
-        this.buttonChange(row)
-      } else {
-        this.handleCurrentChange(null)
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-      this.handleCurrentChange(null)
-    },
-    buttonChange(current) {
-      if (current !== null) {
-        this.currentRow = current
-      }
+    async queryMater() {
+      this.structshow = true
     },
     quality_scodeFormat(row, column) {
       return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
@@ -222,14 +194,19 @@ export default {
     is_activeFormat(row, column) {
       return this.dict.label.is_usable[row.is_active]
     },
-    handleCurrentChange(current) {
-      if (current === null) {
-        this.currentRow = {}
+    queryTableDtl(rows) {
+      let devices = ''
+      for (let i = 0; i < rows.length; i++) {
+        if ( i === 0 ) {
+          devices = rows[i].workorder_code
+        }else{
+          devices = devices + ',' + rows[i].workorder_code
+        }
+      }
+      if(rows.length > 0){
+        this.crud.query.source_bill_code = devices
+        this.crud.toQuery()
       }
-    },
-    querytable() {
-      this.crud.toQuery()
-      this.handleCurrentChange(null)
     }
   }
 }