From afa31e5be710b1374ae49a5a7286c59454b67b97 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 20 Aug 2024 14:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E6=AF=8D=E6=89=98=E7=9B=98=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=92=8C=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/task_manage/task/tasks/POINTTask.java     | 4 ++--
 .../org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java     | 5 +----
 .../org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java     | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
index 519b3db..12b6a39 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
@@ -144,12 +144,11 @@ public class POINTTask extends AbstractTask {
             if(StringUtils.isNotEmpty(vehicleCode)) {
                  one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
                         .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
+                         .eq(SchBaseVehiclematerialgroup::getPoint_code, startPoint)
                         .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
                                 GroupBindMaterialStatusEnum.BOUND.getValue()));
             }
             if (ObjectUtil.isNotEmpty(one)) {
-//                throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到");
-//            }
                 one.setTask_code(taskObj.getTask_code());
                 one.setPoint_code(endPointObj.getPoint_code()); // 当前位置
                 one.setPoint_name(endPointObj.getPoint_name());
@@ -160,6 +159,7 @@ public class POINTTask extends AbstractTask {
                 one.setUpdate_time(DateUtil.now());
                 vehiclematerialgroupService.updateById(one);
             }
+
             if(StringUtils.isNotEmpty(vehicleCode2)) {
                 one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
                         .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode2)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
index f5f6c8a..d90817b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
@@ -173,11 +173,10 @@ public class YCLCKTask extends AbstractTask {
             String vehicleCode2 = taskObj.getVehicle_code2();
             SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
                     .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
+                    .eq(SchBaseVehiclematerialgroup::getPoint_code, startPoint)
                     .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
                             GroupBindMaterialStatusEnum.BOUND.getValue()));
             if (ObjectUtil.isNotEmpty(one)) {
-//                throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到");
-//            }
                 one.setTask_code(taskObj.getTask_code());
                 one.setPoint_code(endPointObj.getPoint_code()); // 当前位置
                 one.setPoint_name(endPointObj.getPoint_name());
@@ -194,8 +193,6 @@ public class YCLCKTask extends AbstractTask {
                     .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
                             GroupBindMaterialStatusEnum.BOUND.getValue()));
             if (ObjectUtil.isNotEmpty(one)) {
-//                throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到");
-//            }
                 one.setTask_code(taskObj.getTask_code());
                 one.setPoint_code(endPointObj.getPoint_code()); // 当前位置
                 one.setPoint_name(endPointObj.getPoint_name());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
index ff29a89..f08bcee 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
@@ -219,6 +219,7 @@ public class YCLRKTask extends AbstractTask {
                 groupEntity.setMaterial_id(materialList.get(0).getProductName());
             }
             vehiclematerialgroupService.save(groupEntity);
+
             groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
             groupEntity.setVehicle_code(taskObj.getVehicle_code2());
             groupEntity.setVehicle_type("1");