From 80c9c3a29ecc894afb7d1885c1fe696894d4608c Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 1 Jan 2025 13:18:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=90=E5=8D=B7=E5=8C=85=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b_lms/sch/tasks/first_floor_area/ZxDjwTask.java | 13 +++++++------
 .../first_floor_area/auto/AutoSendZxToDjw.java      |  4 +++-
 .../iostorInv/impl/StIvtIostorinvServiceImpl.java   |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
index c41be0580..4a7548935 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
@@ -32,6 +32,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.util.TaskUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,17 +58,17 @@ public class ZxDjwTask extends AbstractAcsTask {
     @Qualifier("threadPoolExecutor")
     private ThreadPoolExecutor pool;
 
-    @Resource
+    @Autowired
     private AutoSendVehicleToDjq autoSendVehicleToDjq;
-    @Resource
+    @Autowired
     private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
-    @Resource
+    @Autowired
     private IpdmBiSubpackagerelationService subpackageRelationService;
-    @Resource
+    @Autowired
     private IschBaseTaskService taskService;
-    @Resource
+    @Autowired
     private IbstIvtPackageinfoivtService packageinfoivtService;
-    @Resource
+    @Autowired
     private IPdmBiSlittingproductionplanService productionPlanService;
 
     private final String THIS_CLASS = ZxDjwTask.class.getName();
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
index 99c2b80c4..66443701b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
@@ -101,7 +101,9 @@ public class AutoSendZxToDjw extends Prun{
             checkBoxParams(boxNo, bstIvtBoxinfo);
             //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务
             List<PdmBiSubpackagerelation> relationList = subpackageRelationService
-                    .list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0"));
+                    .list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>()
+                            .eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo)
+                            .eq(PdmBiSubpackagerelation::getStatus, "0"));
             if (ObjectUtils.isEmpty(relationList)) {
                 log.info("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!");
                 throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!");
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 6ef94399a..e7e13e9d3 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
@@ -554,12 +554,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         StIvtIostorinv mstDao = this.getById(jsonDis.getString("iostorinv_id"));
 
         // 查询木箱对应的绑定关系
-        JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonDis.get("storagevehicle_code") + "'")
-                .uniqueResult(0);
-        if (ObjectUtil.isEmpty(jsonVeExt)) {
+        JSONArray storagevehicleCodes = veExtTab
+                .query("pcsn = '" + jsonDis.get("storagevehicle_code") + "'", "UPDATE_TIME desc").getResultJSONArray(0);
+        if (ObjectUtil.isEmpty(storagevehicleCodes)) {
             throw new BadRequestException("此木箱没有绑定托盘号!"+whereJson.get("vehicle_code"));
         }
-
+        JSONObject jsonVeExt = storagevehicleCodes.getJSONObject(0);
         // 创建任务
         JSONObject jsonTaskParam = new JSONObject();
         jsonTaskParam.put("task_type", "010703");