From a57bb4b5cc57421fd96b89ca49ed2e8ad0dd9d59 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Mon, 21 Apr 2025 15:47:32 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93?=
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    | 32 ++++++++++++++++---
 2 files changed, 31 insertions(+), 5 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 7dba79b7d..f8f2de935 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 19532900c..62b6530d9 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
@@ -1614,7 +1614,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         String start_device_code = "";
         // 是否自动下发
         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);
 
@@ -1622,7 +1627,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)){
+                end_device_code = IsEndCode2(json);
+            }else{
+                end_device_code = IsEndCode(json);
+            }
 
             // 过滤此仓位的分配明细
             List<StIvtIostorinvdis> disDaoList = disLikeList.stream()
@@ -1744,7 +1755,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         String start_device_code = "";
         // 是否自动下发
         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);
 
@@ -1754,7 +1771,12 @@ 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)){
+                end_device_code = IsEndCode2(json);
+            }else{
+                end_device_code = IsEndCode(json);
+            }
 
             // 过滤此仓位的分配明细
             List<StIvtIostorinvdis> disDaoList = disLikeList.stream()
@@ -1854,7 +1876,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     private String IsEndCode(JSONObject structDao) {
         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：所有分配明细集合