From 58623edab360211d1c90a799ccb2c8fed9d6c0f1 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 22 Mar 2023 09:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java  | 4 ----
 .../src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql | 2 +-
 mes/qd/src/views/wms/mps/produce/index.vue                    | 3 ++-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
index 3a7df4d0..4aa390f9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
@@ -158,15 +158,11 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
     public void update(ProduceWorkorderDto dto) {
         ProduceWorkorderDto entity = this.findById(dto.getWorkorder_id());
         if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
-
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
-
-
         dto.setUpdate_time(DateUtil.now());
         dto.setUpdate_id(currentUserId);
         dto.setUpdate_name(nickName);
-
         WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         wo.update(json);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
index 0f72af8a..1d9a0451 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
@@ -125,7 +125,7 @@
                 and device.device_code not in (
                     select o.current_device_code as device_code
                     from PDM_produce_workOrder o
-                    where o.workorder_status <> '5'
+                    where o.workorder_status <> '5' and o.is_delete = '0'
                 )
             ENDOPTION
         ENDSELECT
diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue
index 3493eb6f..2fc9e338 100644
--- a/mes/qd/src/views/wms/mps/produce/index.vue
+++ b/mes/qd/src/views/wms/mps/produce/index.vue
@@ -369,7 +369,7 @@
         <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
         <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
-        <el-table-column prop="material_weight" label="物料单重" width="100" />
+        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
         <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
         <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
@@ -459,6 +459,7 @@ const defaultForm = {
   person_real_qty: null,
   dq_real_qty: null,
   material_id: null,
+  material_code: null,
   material_weight: null,
   planproducestart_date: null,
   planproduceend_date: null,