From cd6a0b9d920d4b6f9ec376a114f342de27c94a7e Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Wed, 19 Jun 2024 10:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=8C=96=E5=AE=A4=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BC=98=E5=8C=96&=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1type=E5=8F=96=E6=8C=87=E4=BB=A4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/agv/server/impl/NDCAgvServiceImpl.java    |  9 +++------
 .../nl/wms/board/service/dao/mapper/BoardMapper.xml  |  1 +
 .../sch/task_manage/task/tasks/tbx/TBXMLTask.java    | 12 ++++++++++--
 .../task_manage/task/tasks/tbx/mapper/TBXMapper.java |  2 +-
 .../task_manage/task/tasks/tbx/mapper/TBXMapper.xml  |  1 +
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index b5ad53a..a8f3520 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -82,14 +82,11 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
             DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
             int startAddress = deviceService.queryAddressBydeviceCode(inst.getStart_point_code());
-            int nextAddress = 520;
-            if(!inst.getInstruction_type().equals("3")){
-                deviceService.queryAddressBydeviceCode(inst.getNext_point_code());
-            }
+            int nextAddress=deviceService.queryAddressBydeviceCode(inst.getNext_point_code());
             byte ikeyhigh = (byte) IntToHexHigh(Integer.parseInt(instcode));
             byte ikeylow = (byte) IntToHexLow(Integer.parseInt(instcode));
-            byte typehigh = (byte) IntToHexHigh(1);
-            byte typelow = (byte) IntToHexLow(1);
+            byte typehigh = (byte) IntToHexHigh(Integer.parseInt(inst.getInstruction_type()));
+            byte typelow = (byte) IntToHexLow(Integer.parseInt(inst.getInstruction_type()));
             byte qhdhigh = (byte) IntToHexHigh(startAddress);
             byte qhdlow = (byte) IntToHexLow(startAddress);
             byte fhdhigh = (byte) IntToHexHigh(nextAddress);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
index 4191a6f..031b3b6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
@@ -13,6 +13,7 @@
                 LEFT JOIN md_base_material m ON v.material_id = m.material_id
         WHERE
             p.region_code = 'ZC'
+        ORDER BY p.row_num,p.col_num
     </select>
 
     <select id="detail" resultType="org.nl.wms.board.service.dao.dto.Detail">
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
index 228f992..e0c25ac 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
@@ -206,9 +206,14 @@ public class TBXMLTask extends AbstractTask {
         }
         // 2 没有对应的固化室、没有同工艺号的固化室、没有计划方案对应的固化室，就找新的固化室
         if (points.size() == 0) {
-            points = tbxMapper.getEmptyPoint(nextRegionStr, vehicle_type);
+            points = tbxMapper.getEmptyPoint(nextRegionStr, vehicle_type, workorder.getMaterial_id());
         }
-        return points.size() > 0 ? points.get(0) : null;
+        SchBasePoint schBasePoint =points.size() > 0 ? points.get(0) : null;
+        if (schBasePoint != null) {
+            schBasePoint.setCan_material_type(workorder.getMaterial_id());
+            pointService.updateById(schBasePoint);
+        }
+        return schBasePoint;
     }
 
     @Override
@@ -483,6 +488,9 @@ public class TBXMLTask extends AbstractTask {
         PointUtils.setUpdateByAcs(point);
         point.setIng_task_code(task.getTask_code());
         pointService.updateById(point);
+        //等待点清空物料
+        ghsInPoint.setCan_material_type("");
+        pointService.updateById(ghsInPoint);
         // 任务修改点位
         task.setPoint_code2(point.getPoint_code());
         TaskUtils.setUpdateByAcs(task);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.java
index 9d74607..fdc274d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.java
@@ -33,7 +33,7 @@ public interface TBXMapper {
      * @param vehicleType 载具类型
      * @return 点位数据
      */
-    List<SchBasePoint> getEmptyPoint(List<String> nextRegionStr, String vehicleType);
+    List<SchBasePoint> getEmptyPoint(List<String> nextRegionStr, String vehicleType, String materialId);
 
     /**
      * 获取方案内的点位
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.xml
index 667f848..e60a48c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/mapper/TBXMapper.xml
@@ -90,6 +90,7 @@
                 AND (p3.ing_task_code = '' OR p3.ing_task_code IS NULL)
         WHERE p.point_type = '1'
           AND p.point_status = '3'
+          AND (p3.can_material_type is null or p3.can_material_type ='' or p3.can_material_type = #{materialId})
           AND 0 = (
             SELECT
                 COUNT(*)