From f362699d28d98b9537448874ce2509a61f7688b5 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 10 Jul 2024 11:05:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E6=BB=A1=E8=BD=B4=E7=82=B9=E4=BD=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BstIvtPackageinfoivtServiceImpl.java | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 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 fecb90e54..57a2cad3a 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
@@ -188,6 +188,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             }
             newPoint = checkIvtSBlock(baseTask);
         } else {
+            if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区"))) {
+                //放满轴任务不判断终点是否有任务
+                taskPointType = PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务放货");
+            }
             newPoint = getBstIvtPackageinfoivt(actionType, taskPointType, baseTask);
         }
         if (StringUtils.isNotBlank(newPoint.getPoint_code())) {
@@ -239,17 +243,22 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             taskList = bstIvtPackageinfoivtMapper.getTaskList(pointIds, pointIds, pointIds, null);
         } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货分配"))) {
             taskList = bstIvtPackageinfoivtMapper.getTaskList(pointIds, pointIds, null, pointIds);
-        }
-        else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务放货"))) {
+        } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务放货"))) {
             taskList = bstIvtPackageinfoivtMapper.getTaskList(pointIds, null, pointIds, null);
-        }
-        else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务取货分配"))) {
+        } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务取货分配"))) {
             taskList = bstIvtPackageinfoivtMapper.getTaskList(pointIds, pointIds, pointIds, pointIds);
         } else {
             return packageinfoivtList;
         }
         // 过滤未完成任务的任务
-        if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务")) || pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"))) {
+        if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务放货"))) {
+            pointSets = taskList.stream()
+                    .flatMap(task -> Stream.of(
+                            task.getPoint_code1()
+                    ))
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+        } else if (pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务")) || pointCode.equals(PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"))) {
             pointSets = taskList.stream()
                     .flatMap(task -> Stream.of(
                             task.getPoint_code1(),
@@ -453,22 +462,23 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
      */
     private BstIvtPackageinfoivt getBstIvtPackageinfoivt(String actionType, String taskPointType, SchBaseTask baseTask) {
         BstIvtPackageinfoivt newPoint;
+        String targetPoint ="";
         //1取货任务2放货任务
         LambdaQueryWrapper<BstIvtPackageinfoivt> queryWrapper = new LambdaQueryWrapper<>();
         if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货分配").equals(actionType)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getPoint_code, baseTask.getPoint_code3());
-            taskPointType = PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务");
+            targetPoint = PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务");
         } else if (PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货分配").equals(actionType)) {
             queryWrapper.eq(BstIvtPackageinfoivt::getPoint_code, baseTask.getPoint_code4());
-            taskPointType = PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务");
-        } else if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务")) || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))) {
-            //放满轴任务不判断终点是否有任务
-            taskPointType = PackageInfoIvtEnum.TASK_POINT_TYPE.code("四个点任务放货");
+            targetPoint = PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务");
+        }
+        if (StringUtils.isNotBlank(taskPointType)) {
+            targetPoint = taskPointType;
         }
         BstIvtPackageinfoivt bstIvtPackageinfoivt = bstIvtPackageinfoivtMapper.selectOne(queryWrapper);
         //根据任务类型返回点位分配规则
         BstIvtPackageinfoivt ivtInfo = getIvtInfoFromRegion(baseTask.getTask_type(), actionType);
-        List<BstIvtPackageinfoivt> newPointList = packageinfoivtService.checkEndPointTask(bstIvtPackageinfoivt.getPoint_status(), ivtInfo.getIvt_status(), taskPointType, ivtInfo.getSort_seq().toString(), "");
+        List<BstIvtPackageinfoivt> newPointList = packageinfoivtService.checkEndPointTask(bstIvtPackageinfoivt.getPoint_status(), ivtInfo.getIvt_status(), targetPoint, ivtInfo.getSort_seq().toString(), "");
         if (CollectionUtils.isEmpty(newPointList)) {
             throw new BadRequestException("暂无点位资源！");
         }