From 4333de556ce0d220ed4af960dde0c3f196110606 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 21 Jul 2022 16:29:43 +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 --- .../service/impl/DevicerepairmstServiceImpl.java | 10 +++++++--- .../service/impl/DevicerepairplanmstServiceImpl.java | 4 ++++ .../impl/DevicemaintenanceplanmstServiceImpl.java | 3 +++ 3 files changed, 14 insertions(+), 3 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 0bbc4b04..b017c2a4 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 @@ -622,17 +622,21 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { public void submitReceive(JSONObject whereJson) { JSONObject jsonMst = whereJson.getJSONObject("mst"); // 维修单主表 JSONArray tableData = whereJson.getJSONArray("tableData"); // 更换备件明细 + String devicerecord_id = jsonMst.getString("devicerecord_id"); WQLObject recoudTab = WQLObject.getWQLObject("EM_BI_DeviceRepairReplaceRecord"); // 设备维修单更换记录表 WQLObject spareBOMTab = WQLObject.getWQLObject("EM_BI_EquipmentSpareBOM"); // 设备档案BOM备件表 WQLObject mst_wql = WQLObject.getWQLObject("EM_BI_IOStorInv"); // 出入库主表 WQLObject dtl_wql = WQLObject.getWQLObject("EM_BI_IOStorInvDtl"); // 出入库明细表 WQLObject dis_wql = WQLObject.getWQLObject("EM_BI_IOStorInvDis"); // 出入库分配表 + WQLObject file_wql = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 设备档案表 Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); + JSONObject jsonFile = file_wql.query("devicerecord_id = '" + devicerecord_id + "'").uniqueResult(0); + JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_attachment = '1'").uniqueResult(0); String stor_id = stor.getString("stor_id"); // 出库单主表标识 @@ -769,9 +773,9 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { io_mst.put("dis_optname", nickName); io_mst.put("dis_time", DateUtil.now()); io_mst.put("update_time", now); - io_mst.put("device_id", jsonMst.get("device_id")); - io_mst.put("device_code", jsonMst.get("device_code")); - io_mst.put("device_name", jsonMst.get("device_name")); + io_mst.put("device_id", jsonFile.get("devicerecord_id")); + io_mst.put("device_code", jsonFile.get("device_code")); + io_mst.put("device_name", jsonFile.get("device_name")); io_mst.put("is_delete", "0"); io_mst.put("is_upload", "0"); JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java index 04c1f3ea..bf7c457b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java @@ -188,6 +188,10 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic jsonDtl.put("dtl_remark", json.getString("dtl_remark")); dtlTab.insert(jsonDtl); } + + // 校验 ： 是否有相同设备 相同周期 + JSONArray jsonObject = mstTab.query("devicerecord_id = '" + whereJson.getString("devicerecord_id") + "' and maintenancecycle = '" + whereJson.getString("maintenancecycle") + "' and is_delete = '0'").getResultJSONArray(0); + if (jsonObject.size() > 1) throw new BadRequestException("此设备已经存在此周期的计划"); } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java index 26394a08..508c1b7b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java @@ -192,6 +192,9 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla jsonDtl.put("dtl_remark", json.getString("dtl_remark")); dtlTab.insert(jsonDtl); } + + JSONArray jsonObject = mstTab.query("devicerecord_id = '" + whereJson.getString("devicerecord_id") + "' and maintenancecycle = '" + whereJson.getString("maintenancecycle") + "' and is_delete = '0'").getResultJSONArray(0); + if (jsonObject.size() > 1) throw new BadRequestException("此计划的周期只能存在一个"); } @Override