From 1653f4ce3185afc81b43e20b553431c8d35fd8ee Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Wed, 2 Nov 2022 10:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DevicerepairmstServiceImpl.java | 9 +- .../sb/repair/wql/EM_BI_DEVICEREPAIR001.wql | 2 +- .../wms/sb/repair/devicerepair/AddDialog.vue | 132 ++++++++---------- .../sb/repair/devicerepairpa/StartDialog.vue | 10 +- .../wms/sb/repair/devicerepairpa/index.vue | 4 +- 5 files changed, 75 insertions(+), 82 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java index de9cb6d3..3e63550c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java @@ -219,6 +219,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { jsonMst.put("fault_level", whereJson.getString("fault_level")); jsonMst.put("remark", whereJson.getString("remark")); jsonMst.put("plan_start_date", whereJson.getString("plan_start_date")); + jsonMst.put("estimaterepair_times", whereJson.getString("estimaterepair_times")); jsonMst.put("detail_count", tableData.size()); mstTab.update(jsonMst); @@ -480,9 +481,11 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { } // 3.更新维修单主表 jsonRemst.put("invstatus",invstatus); - jsonRemst.put("confirm_optid",currentUserId); - jsonRemst.put("confirm_optname",nickName); - jsonRemst.put("confirm_time",DateUtil.now()); + if("07".equals(invstatus)){ + jsonRemst.put("confirm_optid",currentUserId); + jsonRemst.put("confirm_optname",nickName); + jsonRemst.put("confirm_time",DateUtil.now()); + } reMstTab.update(jsonRemst); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql index 8d5920e8..038836fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql @@ -286,7 +286,7 @@ WHERE mst.is_delete = '0' AND file.is_delete = '0' - AND mst.invstatus not in ('04','06','99') + AND mst.invstatus not in ('04','06','07','99') OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or file.device_name like 输入.device_code) diff --git a/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue index f7d03597..fff391c6 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue @@ -18,78 +18,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -123,9 +104,9 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - - - + + +