From e02421418ccacd361411236d5788af30b978a827 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 27 Jul 2023 20:35:36 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E8=AE=BE=E7=BD=AE=E7=AB=99=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvCpOutServiceImpl.java  | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
index 2bbe7221..4d5fd2ec 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
@@ -412,27 +412,31 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
                         .ne(StIvtIostorinvdisCp::getWork_status, IOSEnum.WORK_STATUS.code("未生成"))
                 , false
         );
-
-        if (ObjectUtil.isNotEmpty(disIsnull)) throw new BadRequestException("此货位已生成任务!");
-
-        // 2.下发任务
-        SchBasePoint pointDao = iSchBasePointService.getOne(
-                new QueryWrapper<SchBasePoint>().lambda()
-                        .eq(SchBasePoint::getPoint_code, whereJson.getString("point_code"))
-        );
-
-        PointEvent event = PointEvent.builder()
-                .type(AcsTaskEnum.TASK_STRUCT_CP_OUT)
-                .acs_task_type("8")
-                .task_group_id(IdUtil.getStringId())
-                .point_code1(disDao.getStruct_code())
-                .point_code3(pointDao.getPoint_code())
-                .vehicle_code(disDao.getStoragevehicle_code())
-                .product_area("A1") // 暂时写死
-                .callback((Consumer<String>) disDao::setTask_id)
-                .build();
-        BussEventMulticaster.Publish(event);
-
+        SchBasePoint pointDao;
+        if (ObjectUtil.isNotEmpty(disIsnull)) {
+            disDao.setTask_id(disIsnull.getTask_id());
+            pointDao = new SchBasePoint();
+            pointDao.setPoint_id(disDao.getPoint_id());
+            pointDao.setPoint_code(disDao.getPoint_code());
+            pointDao.setPoint_name(disDao.getPoint_name());
+        }else {
+            // 2.下发任务
+            pointDao = iSchBasePointService.getOne(
+                    new QueryWrapper<SchBasePoint>().lambda()
+                            .eq(SchBasePoint::getPoint_code, whereJson.getString("point_code"))
+            );
+            PointEvent event = PointEvent.builder()
+                    .type(AcsTaskEnum.TASK_STRUCT_CP_OUT)
+                    .acs_task_type("8")
+                    .task_group_id(IdUtil.getStringId())
+                    .point_code1(disDao.getStruct_code())
+                    .point_code3(pointDao.getPoint_code())
+                    .vehicle_code(disDao.getStoragevehicle_code())
+                    .product_area("A1") // 暂时写死
+                    .callback((Consumer<String>) disDao::setTask_id)
+                    .build();
+            BussEventMulticaster.Publish(event);
+        }
         // 3.更新分配表
         iostorinvdisCpService.update(
                 new UpdateWrapper<StIvtIostorinvdisCp>().lambda()