From 5a47d7fe94ea28a7010015828e8d29c14b95d547 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Mon, 20 May 2024 09:24:33 +0800
Subject: [PATCH] fix

---
 .../org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java     | 1 +
 .../java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
index 36b8886..f631084 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
@@ -217,6 +217,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     schBasePoint.setVehicle_code("");
                     schBasePoint.setVehicle_qty(0);
                     schBasePoint.setUpdate_time(DateUtil.now());
+                    schBasePoint.setExt_point_code("");
                     pointService.update(schBasePoint);
                 }
                 break;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java
index 71b17a7..654800f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java
@@ -121,6 +121,7 @@ public class MJXLTask extends AbstractTask {
     private SchBasePoint findNextPoint(SchBasePoint startPoint, JSONObject extGroupData,SchBaseTask task) {
         String regionCode = null;
         String materialType = extGroupData.getString("material_type");
+        String device_code = extGroupData.getString("device_code");
         if ("TBX1".equals(startPoint.getRegion_code())) {
             //TBX1找A区
             regionCode = "GHS1";
@@ -143,7 +144,8 @@ public class MJXLTask extends AbstractTask {
             if ((ObjectUtil.isEmpty(schBasePoint.getVehicle_type()) ||
                     materialType.equals(schBasePoint.getVehicle_type()))
                     && "2".equals(schBasePoint.getPoint_status())
-                    && schBasePoint.getVehicle_qty() < 3) {
+                    && schBasePoint.getVehicle_qty() < 3
+                    && (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) {
                 //新增逻辑，同一列只能放相同物料
                 boolean flag=true;
                 List<String> list=new ArrayList<>();
@@ -226,6 +228,7 @@ public class MJXLTask extends AbstractTask {
             endPointObj.setIng_task_code("");
             endPointObj.setVehicle_code(ObjectUtil.isEmpty(endPointObj.getVehicle_code()) ? vehicle_code + "," : endPointObj.getVehicle_code() + vehicle_code + ",");
             endPointObj.setVehicle_qty(endPointObj.getVehicle_qty() + 1);
+            endPointObj.setExt_point_code(extGroupData.getString("device_code"));
             pointService.update(endPointObj);
             // 要把数据存到组盘表 -> 改造公共方法，返回id
             SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();