From 228a587421948515017813a76a3949fcba8ecb79 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Sat, 19 Apr 2025 15:25:29 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=87=BA=E5=BA=93=E5=A0=86=E5=9E=9B?=
 =?UTF-8?q?=E6=9C=BA=E5=AF=B9=E6=8E=A5=E4=BD=8D=E7=BC=93=E5=AD=98=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F2=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storage_manage/ios/enums/IOSEnum.java     |  4 ++-
 .../impl/StIvtIostorinvOutServiceImpl.java    | 34 +++++++++++++++++--
 2 files changed, 35 insertions(+), 3 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 292dc4512..6de79e0a5 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
@@ -102,7 +102,9 @@ public enum IOSEnum {
     // 出库堆垛机点位
     OUT_POINT(MapOf.of("1","CK2038", "2","CK2038", "3","CK2042", "4","CK2042" ,"5","CK2046",
             "6","CK2046", "7","7", "8","8", "9","9", "10","10")),
-
+    // 出库堆垛机点位
+    OUT_POINT2(MapOf.of("1","CK2037", "2","CK2037", "3","CK2041", "4","CK2041" ,"5","CK2045",
+            "6","CK2045", "7","7", "8","8", "9","9", "10","10")),
     // 出库发货等待点
     OUT_FH_POINT(MapOf.of("1","B_FH01_0", "2","B_FH02_0", "3","B_FH03_0", "4","B_FH04_0" ,"5","B_FH05_0",
             "6","B_FH06_0")),
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index bf266eb93..75da9d49b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -1654,6 +1654,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         // 是否自动下发
         String is_auto_issue = IOSEnum.IS_SEND.code("是");
 
+        WQLObject paramTab = WQLObject.getWQLObject("sys_param");
+        JSONObject jsonParam = paramTab.query("code = 'one_or_two_struct'").uniqueResult(0);
+        String flag = "0";
+        if (ObjectUtil.isNotEmpty(jsonParam)) {
+            flag = jsonParam.getString("value");
+        }
         for (int i = 0; i < taskMangeList.size(); i++) {
             JSONObject json = taskMangeList.get(i);
 
@@ -1661,7 +1667,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             start_device_code = json.getString("struct_code");
 
             // 确定终点： 根据仓位所在排确定终点
-            String end_device_code = IsEndCode(json);
+
+            String end_device_code = "";
+            if("1".equals(flag)){
+                IsEndCode2(json);
+            }else{
+                IsEndCode(json);
+            }
 
             // 过滤此仓位的分配明细
             List<StIvtIostorinvdis> disDaoList = disLikeList.stream()
@@ -1784,6 +1796,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         // 是否自动下发
         String is_auto_issue = IOSEnum.IS_SEND.code("是");
 
+        WQLObject paramTab = WQLObject.getWQLObject("sys_param");
+
+        JSONObject jsonParam = paramTab.query("code = 'one_or_two_struct'").uniqueResult(0);
+        String flag = "0";
+        if (ObjectUtil.isNotEmpty(jsonParam)) {
+            flag = jsonParam.getString("value");
+        }
         for (int i = 0; i < taskMangeList.size(); i++) {
             JSONObject json = taskMangeList.get(i);
 
@@ -1793,7 +1812,14 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             start_device_code = json.getString("struct_code");
 
             // 确定终点： 根据仓位所在排确定终点
-            String end_device_code = IsEndCode(json);
+
+            String end_device_code = "";
+            if("1".equals(flag)){
+                IsEndCode2(json);
+            }else{
+                IsEndCode(json);
+            }
+
 
             // 过滤此仓位的分配明细
             List<StIvtIostorinvdis> disDaoList = disLikeList.stream()
@@ -1894,6 +1920,10 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         return IOSEnum.OUT_POINT.code(structDao.getString("row_num"));
     }
 
+    private String IsEndCode2(JSONObject structDao) {
+        return IOSEnum.OUT_POINT2.code(structDao.getString("row_num"));
+    }
+
     /**
      * 更新异常货位
      * @param disDaoList：所有分配明细集合