优化

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_BI_DEVICEINFO01.wql

@@ -18,6 +18,7 @@
 	输入.workprocedure_code			    TYPEAS s_string
 	输入.workprocedure_id			    TYPEAS s_string
 	输入.is_active			            TYPEAS s_string
+	输入.is_produceuse			            TYPEAS s_string
 
 
 [临时表]
@@ -52,9 +53,11 @@
             	LEFT JOIN sys_dict_detail d ON e.device_attribute_scode = d.value AND name = 'DEVICE_ATTRIBUTE_SCODE'
             WHERE
                 e.is_delete = '0'
-
                 OPTION 输入.workprocedure_code <> ""
                     e.workprocedure_code = 输入.workprocedure_code
+                ENDOPTION
+                 OPTION 输入.is_produceuse <> ""
+                    e.is_produceuse = 输入.is_produceuse
                 ENDOPTION
                 OPTION 输入.workprocedure_id <> ""
                     e.workprocedure_id = 输入.workprocedure_id

mes/qd/src/views/wms/pdm/produce/worktask/index.vue

@@ -241,12 +241,12 @@ import pagination from '@crud/Pagination'
 import DeviceDialog from '@/views/wms/pub/DeviceDialog'
 import ViewDialog from '@/views/wms/pdm/produce/workorder/ViewDialog'
 import print2Dialog from '@/views/wms/pdm/produce/worktask/print2Dialog'
-import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
+import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
-import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
+import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
-import Date from "@/utils/datetime";
+import Date from '@/utils/datetime'
 
 export default {
-  name: 'worktask',
+  name: 'Worktask',
   components: { print2Dialog, ViewDialog, DeviceDialog, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({ title: '工令工序任务', idField: 'worktask_id', url: 'api/worktask',
@@ -337,7 +337,7 @@ export default {
           if (rows[i].order_status < '40' || rows.length !== 1) {
             this.print1_flag = true
           }
-          if (rows.length !== 1 || "GX003,GX004,GX009,GX010,GX011".indexOf(rows[i].workprocedure_code)===-1) {
+          if (rows.length !== 1 || 'GX003,GX004,GX009,GX010,GX011'.indexOf(rows[i].workprocedure_code) === -1) {
             this.print2_flag = true
           }
         }
@@ -382,7 +382,7 @@ export default {
         return false
       }
       this.mstrow = this.checkrows.pop()
-      this.$refs.child.getMsg(this.mstrow.workprocedure_id)
+      this.$refs.child.getMsg(this.mstrow.workprocedure_id, '1')
       this.dtlShow = true
     },
     tableChanged(row) {
@@ -443,7 +443,6 @@ export default {
         })
         .catch(_ => {
         })
-
     },
     print1() {
       this.checkrows = this.$refs.table.selection

mes/qd/src/views/wms/pub/DeviceDialog.vue

@@ -21,13 +21,13 @@
         /> </el-col>
       <el-col :span="6">
         <el-select
+          v-show="disablePro"
           v-model="query.workprocedure_id"
           clearable
           size="mini"
           placeholder="全部"
           class="filter-item"
           style="width: 200px;"
-            v-show="disablePro"
         >
           <el-option
             v-for="item in workProcedureList"
@@ -79,7 +79,7 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudDeviceinfo from '@/api/wms/basedata/em/deviceinfo'
-import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
+import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 
 export default {
   name: 'DeviceDialog',
@@ -91,7 +91,7 @@ export default {
       url: 'api/deviceinfo',
       idField: 'device_id',
       sort: '',
-      query: { device_code: '', workprocedure_id: '' }
+      query: { device_code: '', workprocedure_id: '', is_produceuse: '' }
     })
   },
   dicts: ['IS_OR_NOT'],
@@ -132,9 +132,10 @@ export default {
      * 接受父组件传值
      * @param msg
      */
-    getMsg(msg) {
+    getMsg(msg, msg2) {
       this.disablePro = false
       this.crud.query.workprocedure_id = msg
+      this.crud.query.is_produceuse = msg2
       this.crud.toQuery()
     },
     formatProduceuserName(row, column) {