From b01d865f9f8d1ab68a4703a852c640236349885c Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 13 Jul 2022 18:16:55 +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 | 14 +++++++----- .../sb/repair/wql/EM_BI_DEVICEREPAIR001.wql | 22 ++++++++++++------- .../wms/basedata/em/devicebom/AddDialog.vue | 4 ++++ .../sb/repair/devicerepairpa/BomDialog.vue | 4 ++-- .../repair/devicerepairpa/ReceiveDialog.vue | 1 + 5 files changed, 29 insertions(+), 16 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 4945f886..d5915721 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 @@ -12,7 +12,9 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.wms.basedata.master.service.ClassstandardService; import org.nl.wms.basedata.st.service.StorattrService; import org.nl.wms.basedata.st.service.dto.StorattrDto; +import org.nl.wms.sb.core.service.SparePartOutService; import org.nl.wms.sb.core.service.impl.SparePartInServiceImpl; +import org.nl.wms.sb.core.service.impl.SparePartOutServiceImpl; import org.nl.wms.sb.repair.service.DevicerepairmstService; import org.nl.wms.sb.repair.service.dto.DevicerepairmstDto; import org.nl.wql.WQL; @@ -48,7 +50,7 @@ import cn.hutool.core.util.ObjectUtil; public class DevicerepairmstServiceImpl implements DevicerepairmstService { private final ClassstandardService classstandardService; private final StorattrService storattrService; - private final SparePartInServiceImpl sparePartInService; + private final SparePartOutServiceImpl sparePartOutService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -660,7 +662,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { dis_jo.put("work_status", "99"); dis_jo.put("qty_unit_id", dtl.getString("qty_unit_id")); dis_jo.put("qty_unit_name", dtl.getString("qty_unit_name")); - JSONObject jsonIvt = WQLObject.getWQLObject("ST_IVT_StructIvt").query("stor_id = '"+stor.getString("stor_id")+"' and material_id = '"+json.getString("material_id")+"' and pcsn = '"+json.getString("pcsn")+"'").uniqueResult(0); + JSONObject jsonIvt = WQLObject.getWQLObject("EM_BI_DeviceSparePartIvt").query("stor_id = '"+stor.getString("stor_id")+"' and material_id = '"+json.getString("material_id")+"' and pcsn = '"+json.getString("pcsn")+"'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不足"); JSONObject struct = WQLObject.getWQLObject("st_ivt_structattr").query("struct_id = '"+jsonIvt.getString("struct_id")+"'").uniqueResult(0); dis_jo.put("sect_id", struct.getString("sect_id")); @@ -715,18 +717,18 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { io_mst.put("bizdeptid", deptId + ""); mst_wql.insert(io_mst); - sparePartInService.confirmMst(iostorinv_id); + sparePartOutService.confirmMst(iostorinv_id); } @Override public Map queryBom(Map whereJson, Pageable page) { - String sparepart_only_id = MapUtil.getStr(whereJson, "sparepart_only_id"); + String material_code = MapUtil.getStr(whereJson, "material_code"); HashMap map = new HashMap<>(); map.put("flag", "5"); - if (ObjectUtil.isNotEmpty(sparepart_only_id)) map.put("sparepart_only_id", "%"+sparepart_only_id+"'%"); + if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%"); - JSONObject jsonObject = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), ""); + JSONObject jsonObject = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.sparepart_only_id ASC"); return jsonObject; } 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 9365e9b0..f4818cb9 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 @@ -25,6 +25,7 @@ 输入.device_bom_id TYPEAS s_string 输入.material_id TYPEAS s_string 输入.sparepart_only_id TYPEAS s_string + 输入.material_code TYPEAS s_string [临时表] @@ -166,22 +167,27 @@ IF 输入.flag = "5" PAGEQUERY SELECT - mst.*, - file.device_code, - file.device_name, + SUM(mst.ivt_qty) AS qty, + MAX(mst.qty_unit_name) AS qty_unit_name, + mst.pcsn, + mst.sparepart_only_id, mater.material_code, - mater.material_name + mater.material_name, + mater.material_model, + mater.material_spec FROM - EM_BI_EquipmentSpareBOM mst - LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id + EM_BI_DeviceSparePartIvt mst LEFT JOIN md_me_materialbase mater ON mater.material_id = mst.material_id WHERE 1=1 - OPTION 输入.sparepart_only_id <> "" - mst.sparepart_only_id like 输入.sparepart_only_id + OPTION 输入.material_code <> "" + (mater.material_code like 输入.material_code or + mater.material_name like 输入.material_code) ENDOPTION + group by mst.material_id,mst.pcsn,mst.sparepart_only_id + ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue index 5ccb8fc0..8b339fc6 100644 --- a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue @@ -132,6 +132,10 @@