From 6ee2dcc5a9003cc62db386fe9c3f90e090f1873b Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 19 Jul 2024 13:56:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?rev=EF=BC=9A=E4=BA=8C=E6=9C=9F=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=88=9B=E5=BB=BA=E4=BA=BA=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=AE=8C=E6=88=90=E8=87=AA=E5=8A=A8=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage_manage/ios/enums/IOSEnum.java | 3 +++ .../impl/StIvtIostorinvServiceImpl.java | 21 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java index f8527b61e..e0a06f97b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java @@ -112,6 +112,9 @@ public enum IOSEnum { //acs申请任务 ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")), + + // acs外部系统用户 + EXT_ACS(MapOf.of("acs", "2","kc","康成")), ; private Map code; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index 0bb44ced0..fa16650ee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -41,6 +41,7 @@ import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.ISysParamService; +import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.StorattrService; import org.nl.wms.basedata.st.service.dto.StorattrDto; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; @@ -668,6 +669,14 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl Date: Fri, 19 Jul 2024 16:15:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?rev:=20=E4=BA=8C=E6=9C=9F=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/OutBussManageServiceImpl.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java index 6c0c704dd..96fd32683 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java @@ -247,18 +247,6 @@ public class OutBussManageServiceImpl implements OutBussManageService { List resultDisList = new ArrayList<>(); - // 查询库区 - JSONObject jsonSect = WQLObject.getWQLObject("st_ivt_sectattr") - .query("sect_id = '" + likeBoxList.get(0).getString("sect_id") + "'") - .uniqueResult(0); - - String work_status; - if (jsonSect.getString("sect_type_attr").equals(IOSEnum.SECT_TYPE.code("虚拟区"))) { - work_status = IOSEnum.WORK_STATUS.code("生成"); - } else { - work_status = IOSEnum.WORK_STATUS.code("未生成"); - } - // 查询计量单位 JSONObject jsonUnit = WQLObject.getWQLObject("md_pb_measureunit") .query("measure_unit_id = '" + likeBoxList.get(0).getString("qty_unit_id") + "'") @@ -273,10 +261,21 @@ public class OutBussManageServiceImpl implements OutBussManageService { .query("container_name in ('" + pcsn_in + "')") .getResultJSONArray(0).toJavaList(JSONObject.class); - for (int i = 0; i < likeBoxList.size(); i++) { JSONObject jsonIvt = likeBoxList.get(i); + // 查询库区 + JSONObject jsonSect = WQLObject.getWQLObject("st_ivt_sectattr") + .query("sect_id = '" + jsonIvt.getString("sect_id") + "'") + .uniqueResult(0); + + String work_status; + if (jsonSect.getString("sect_type_attr").equals(IOSEnum.SECT_TYPE.code("虚拟区"))) { + work_status = IOSEnum.WORK_STATUS.code("生成"); + } else { + work_status = IOSEnum.WORK_STATUS.code("未生成"); + } + JSONObject jsonSub = subList.stream() .filter(row -> row.getString("container_name").equals(jsonIvt.getString("pcsn"))) .collect(Collectors.toList()).get(0); From 470eeeb89a0345963e4ca455a6e7ae10799392a0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 19 Jul 2024 17:55:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?rev:=20=E4=BA=8C=E6=9C=9F=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index fa16650ee..d18124dd3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -980,7 +980,6 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl