From d8af9d1b65359de7f3b65a345702dd49dc9788ca Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Wed, 5 Nov 2025 11:03:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=87=BA=E7=A9=BA=E6=9C=A8=E7=AE=B1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../first_floor_area/auto/AutoIssueOutEmptyTask.java     | 8 --------
 .../iostorInv/util/impl/OutBoxManageServiceImpl.java     | 1 -
 .../src/main/java/org/nl/wms/sch/ComPareUtil.java        | 9 +++++----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoIssueOutEmptyTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoIssueOutEmptyTask.java
index 085e02f4d..95e394541 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoIssueOutEmptyTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoIssueOutEmptyTask.java
@@ -4,13 +4,9 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.nl.b_lms.sch.task.dao.SchBaseTask;
-import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.TwoOutBoxTask;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService;
@@ -22,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
 
@@ -37,9 +32,6 @@ public class AutoIssueOutEmptyTask {
     @Autowired
     private OutBoxManageService outBoxManageService;
 
-    @Autowired
-    private IschBaseTaskService ischBaseTaskService;
-
     //自动执行等待的桁架任务
     public void run() {
         try {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
index 3409bdf8d..712a50441 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
@@ -128,7 +128,6 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         request_param.put("containerType", jsonAttr.getString("storagevehicle_type"));
         jsonTaskParam.put("request_param", request_param.toString());
         twoOutBoxTask.createTask(jsonTaskParam);
-        twoOutBoxTask.immediateNotifyAcs(null);
         // 锁定起点
         jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
         attrTab.update(jsonAttr);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
index 0f5516224..ce6d283e5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java
@@ -61,15 +61,16 @@ public class ComPareUtil {
         }
         //查询子卷入库配置
         IPdmBiContainerinboundService iPdmBiContainerinboundService = SpringContextHolder.getBean(IPdmBiContainerinboundService.class);
-        PdmBiContainerinbound pdmBiContainerinbound = iPdmBiContainerinboundService.getOne(new QueryWrapper<PdmBiContainerinbound>()
-                .eq("box", sub.getPackage_box_sn()));
+        PdmBiContainerinbound pdmBiContainerinbound = iPdmBiContainerinboundService.list(new QueryWrapper<PdmBiContainerinbound>()
+                .eq("box", sub.getPackage_box_sn())
+                .orderByDesc("id")).get(0);
         JSONObject json = new JSONObject();
         json.put("compaer_result", compaer_result);
         json.put("box_no", sub.getPackage_box_sn());
         json.put("box_weight", sub.getBox_weight().intValue());
         json.put("current_weight", new BigDecimal(current_weight).intValue());
-        json.put("containers", list.stream().map(a->a.getContainer_name()).collect(Collectors.toList()));
-        json.put("inbound", (pdmBiContainerinbound != null ? pdmBiContainerinbound.getInbound():false));
+        json.put("containers", list.stream().map(a -> a.getContainer_name()).collect(Collectors.toList()));
+        json.put("inbound", (pdmBiContainerinbound != null ? pdmBiContainerinbound.getInbound() : false));
         return json;
     }
 }