From d623d8246a9d97e1f44af3ad9f37fd7837a990cf Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 21 Jul 2022 14:41:33 +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 --- .../impl/DevicerepairmstServiceImpl.java | 38 ++++++++++++++++--- .../sb/repair/wql/EM_BI_DEVICEREPAIR001.wql | 5 +++ .../impl/DevicerunrecordServiceImpl.java | 2 +- .../repair/devicerepairpa/AddChangeDialog.vue | 3 +- .../wms/sb/stat/deviceivtquery/index.vue | 10 +++++ 5 files changed, 51 insertions(+), 7 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 2766db39..73ad9e4d 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 @@ -253,6 +253,11 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { @Transactional(rollbackFor = Exception.class) public void submit(JSONObject whereJson) { WQLObject mstTab = WQLObject.getWQLObject("EM_BI_DeviceRepairMst"); + WQLObject dtlTab = WQLObject.getWQLObject("EM_BI_DeviceRepairDtl"); + + JSONArray resultJSONArray = dtlTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(resultJSONArray)) throw new BadRequestException("维修项目为空"); + JSONObject json = mstTab.query("repair_id ='" + whereJson.getString("repair_id") + "'").uniqueResult(0); json.put("invstatus", "02"); mstTab.update(json); @@ -553,30 +558,53 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { public JSONArray getFileBom(JSONObject whereJson) { String repair_item_id = whereJson.getString("repair_item_id"); String material_id = whereJson.getString("material_id"); + String devicerecord_id = whereJson.getString("devicerecord_id"); String device_id = whereJson.getString("device_id"); String device_code = whereJson.getString("device_code"); String repair_dtl_id = whereJson.getString("repair_dtl_id"); int qty = whereJson.getIntValue("qty"); + WQLObject unitTab = WQLObject.getWQLObject("md_pb_measureunit"); + WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); + JSONObject jsonMater = materTab.query("material_id = '" + material_id + "'").uniqueResult(0); + JSONObject jsonUnit = unitTab.query("measure_unit_id = '" + jsonMater.getString("base_unit_id") + "'").uniqueResult(0); + WQLObject itemTab = WQLObject.getWQLObject("EM_BI_DeviceRepairItems"); JSONObject jsonItem = itemTab.query("repair_item_id = '" + repair_item_id + "'").uniqueResult(0); HashMap map = new HashMap<>(); map.put("flag", "4"); map.put("material_id", material_id); + map.put("devicerecord_id", devicerecord_id); JSONArray fileBomArr = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).process().getResultJSONArray(0); JSONArray resultArr = new JSONArray(); if (ObjectUtil.isNotEmpty(fileBomArr)) { - if (qty == fileBomArr.size()) { + if (fileBomArr.size() < qty) { resultArr = fileBomArr; - } else { + } + + int number = qty - fileBomArr.size(); + + for (int i = 0; i < number; i++) { JSONObject json = fileBomArr.getJSONObject(0); - for (int i = 0; i < qty; i++) { - resultArr.add(json); - } + json.put("sparepart_only_id", ""); + resultArr.add(json); + } + } else { + for (int i = 0; i < qty; i++) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("material_id",jsonMater.getString("material_id")); + jsonObject.put("material_code",jsonMater.getString("material_code")); + jsonObject.put("material_name",jsonMater.getString("material_name")); + jsonObject.put("pcsn","999999"); + jsonObject.put("qty","1"); + jsonObject.put("qty_unit_id",jsonUnit.getString("measure_unit_id")); + jsonObject.put("qty_unit_name",jsonUnit.getString("unit_name")); + resultArr.add(jsonObject); } } + for (int j = 0; j < resultArr.size(); j++) { JSONObject jsonObject = resultArr.getJSONObject(j); jsonObject.put("repair_item_id", jsonItem.getString("repair_item_id")); 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 71e66f95..2d8eb02b 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 @@ -26,6 +26,7 @@ 输入.material_id TYPEAS s_string 输入.sparepart_only_id TYPEAS s_string 输入.material_code TYPEAS s_string + 输入.devicerecord_id TYPEAS s_string [临时表] @@ -210,6 +211,10 @@ bom.material_id = 输入.material_id ENDOPTION + OPTION 输入.devicerecord_id <> "" + bom.devicerecord_id = 输入.devicerecord_id + ENDOPTION + ENDSELECT ENDQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java index 4ef06435..cd2ee714 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java @@ -66,7 +66,7 @@ public class DevicerunrecordServiceImpl implements DevicerunrecordService { String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - JSONObject json = WQL.getWO("EM_DEVICERUNRECORD001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "run.create_time DESC"); + JSONObject json = WQL.getWO("EM_DEVICERUNRECORD001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.device_code ASC,run.run_date ASC"); return json; } diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue index 44b81e72..6b18891f 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue @@ -174,7 +174,8 @@ export default { 'repair_item_id': this.form4.repair_item_id, 'repair_dtl_id': this.form4.repair_dtl_id, 'device_id': this.form4.device_id, - 'device_code': this.form4.device_code + 'device_code': this.form4.device_code, + 'devicerecord_id': this.form4.devicerecord_id } crudDevicerepairmst.getFileBom(data).then(res => { this.fileBom = res diff --git a/mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue b/mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue index bbb71220..6c481ebd 100644 --- a/mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue +++ b/mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue @@ -49,6 +49,16 @@ > 导出Excel + + 打印 +