From 9af611f09c6415f3c08ad00cf47a7f6d2a7c714e Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 26 Jul 2022 16:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pdm/service/impl/WorkOrderServiceImpl.java    | 4 ++++
 .../main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql    | 5 +++++
 mes/qd/src/views/wms/pdm/produce/workorder/index.vue     | 9 +++++++++
 3 files changed, 18 insertions(+)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
index e3333c96..6b8f8b2a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
@@ -63,6 +63,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
         if (StrUtil.isNotEmpty(end_time)) {
             map.put("end_time", end_time.substring(0,10)+" 23:59:59");
         }
+        String device_code = map.get("device_code");
+        if (StrUtil.isNotEmpty(device_code)) {
+            map.put("device_code", "%" + device_code + "%");
+        }
         JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.planstart_time,mb.material_code,WorkOrder.pcsn");
         return json;
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
index 3a032c6e..c6c0db65 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
@@ -26,6 +26,7 @@
     输入.workprocedure_id				        TYPEAS s_string
     输入.device_id				        TYPEAS s_string
     输入.pcsn				        TYPEAS s_string
+    输入.device_code			        TYPEAS s_string
 
 
 [临时表]
@@ -71,6 +72,10 @@
             	WorkOrder.is_delete = '0'
              OPTION 输入.workorder_code <> ""
                   WorkOrder.workorder_code like 输入.workorder_code
+             ENDOPTION
+             OPTION 输入.device_code <> ""
+                  (device.device_code like 输入.device_code or
+                   device.device_name like 输入.device_code)
              ENDOPTION
               OPTION 输入.pcsn <> ""
                    WorkOrder.pcsn like 输入.pcsn
diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
index db1b305b..6a53ad9c 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -103,6 +103,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="关键设备">
+            <el-input
+              v-model="query.device_code"
+              size="mini"
+              clearable
+              placeholder="编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>