From 4ce71af1f7bfeecb3a558a86c1b3760d32ec262f Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 1 Dec 2022 14:36: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 --- .../wms/ext/sap/service/impl/SapToLmsServiceImpl.java | 2 +- .../pda/st/service/impl/VirtualOutServiceImpl.java | 8 ++++++++ .../src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql | 4 ++-- .../java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql | 11 +++++++++-- .../src/views/wms/basedata/st/ivt/index.vue | 4 ++-- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index 963e0f515..d4171fe0e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -74,7 +74,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { JSONObject jsonMst = new JSONObject(); //获取SAP的存储地点 - String LGORT = jo.getString("LGORT"); + String LGORT = item.getJSONObject(0).getString("LGORT"); JSONObject stor_jo = WQLObject.getWQLObject("ST_IVT_BSRealStorAttr").query("ext_id = '"+LGORT+"'").uniqueResult(0); if (ObjectUtil.isEmpty(stor_jo)){ result.put("RTYPE", "E"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java index 5d6e1eff7..7652f740b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.pda.st.service.VirtualOutService; import org.nl.wms.st.inbill.service.CheckOutBillService; import org.nl.wms.st.outbill.service.impl.CheckOutBillServiceImpl; @@ -39,6 +40,13 @@ public class VirtualOutServiceImpl implements VirtualOutService { map.put("box_no", whereJson.getString("box_no")); map.put("bill_code", whereJson.getString("bill_code")); map.put("bill_type", whereJson.getString("bill_type")); + + //获取人员对应的仓库 + UserStorServiceImpl userStorService = new UserStorServiceImpl(); + String in_stor_id = userStorService.getInStor(); + if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + + JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParamMap(map).process().getResultJSONArray(0); JSONObject jo = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 6c549db39..838c3bbc5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -112,8 +112,8 @@ LEFT JOIN st_ivt_sectattr se ON se.sect_id =sa.sect_id WHERE se.sect_type_attr = '09' - AND lock_type = '1' - AND stor_id = 输入.stor_id + AND sa.lock_type = '1' + AND sa.stor_id = 输入.stor_id AND sa.is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = '' ORDER BY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql index 7069fb504..f73316c19 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql @@ -18,6 +18,7 @@ 输入.bill_type TYPEAS s_string 输入.material_code TYPEAS s_string 输入.box_no TYPEAS s_string + 输入.in_stor_id TYPEAS f_string [临时表] @@ -64,8 +65,9 @@ FROM ST_IVT_IOStorInv mst LEFT JOIN ST_IVT_IOStorInvDis dis ON dis.iostorinv_id = mst.iostorinv_id + LEFT JOIN st_ivt_sectattr se ON se.sect_id =dis.sect_id WHERE - dis.sect_id = '1586913215886004224' + se.sect_type_attr = '09' AND mst.is_delete = '0' AND mst.io_type = '1' AND mst.bill_status <> '99' @@ -82,6 +84,10 @@ mst.bill_type = 输入.bill_type ENDOPTION + OPTION 输入.in_stor_id <> "" + mst.stor_id in 输入.in_stor_id + ENDOPTION + ENDSELECT ENDQUERY ENDIF @@ -116,8 +122,9 @@ LEFT JOIN ST_IVT_IOStorInv mst ON dis.iostorinv_id = mst.iostorinv_id LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id LEFT JOIN PDM_BI_SubPackageRelation sub ON dis.pcsn = sub.container_name + LEFT JOIN st_ivt_sectattr se ON se.sect_id =dis.sect_id WHERE - dis.sect_id = '1586913215886004224' + se.sect_type_attr = '09' AND mst.is_delete = '0' AND mst.io_type = '1' AND dis.work_status <> '99' diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index c43d5d150..b95e4d71a 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -76,8 +76,8 @@ - - + +