From d8bd2cfe4260db15d89a36aaa51228ce3b4e7a44 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 1 May 2025 15:49:35 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=88=86=E9=85=8D=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 11 ++++++++---
 .../wms/ext/acs/service/impl/AcsToWmsServiceImpl.java |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index d14e0e636..50f0d5371 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -213,12 +213,17 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货分配").equals(actionType)) {
                     return baseTask.getPoint_code1();
                 }
-                //else if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货分配").equals(actionType)) {
-                //return baseTask.getPoint_code2();
-                //}
             }
         }
+        //校验是否存在行架任务
+        int count = taskService.count(new QueryWrapper<SchBaseTask>()
+                .eq("task_type", "010911")
+                .eq("is_delete", "0")
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
         //检查是否满足二次分配条件
+        if (count>0){
+            throw new BadRequestException("正在执行行架任务");
+        }
         checkTaskInfo(baseTask);
         //空载具缓存位特殊二次分配逻辑：先判断是否有执行中的行架任务或补空载具任务，如未完成，不分配点位
         if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) ||
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 6adeee7eb..5605e7b4f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -1865,13 +1865,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                             .eq(BstIvtPackageinfoivt::getIs_used, PackageInfoIvtEnum.IS_USED.code("启用"))
                             .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("满轴缓存位"))
                             .eq(BstIvtPackageinfoivt::getIvt_status, PackageInfoIvtEnum.IVT_STATUS.code("空"))
-                            .orderByAsc(BstIvtPackageinfoivt::getSort_seq));
+                            .orderByDesc(BstIvtPackageinfoivt::getSort_seq));
             if (CollectionUtils.isEmpty(MzPoints)){
                 result.put("message", "满轴位无可用位置");
                 return result;
             }
             List<BstIvtPackageinfoivt> empPoints = packageinfoivtService
-                    .selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"));
+                    .selectEmpPoints(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"));
             if (CollectionUtils.isEmpty(empPoints)){
                 result.put("message", "空轴位无可用位置");
                 return result;