From 1d29de4f59c048aafdc84818fc5fb23001b8e589 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 三月 2026 17:30:28 +0800
Subject: [PATCH] ctu入库到指定列,指定小车来接

---
 src/main/java/com/zy/asrs/task/handler/JlerHandler.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
index e5607b1..056412c 100644
--- a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
@@ -9,8 +9,10 @@
 import com.zy.asrs.entity.rcs.RcsReturn;
 import com.zy.asrs.entity.rcs.RcsTaskSubmit;
 import com.zy.asrs.entity.rcs.RcsTaskTargetRoute;
+import com.zy.asrs.entity.rcs.SiteBind;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.model.LocDto;
 import com.zy.common.model.TaskDto;
 import com.zy.common.model.enums.WorkNoType;
@@ -65,6 +67,14 @@
     @Transactional
     public void callAgvToWarehouse(WrkMast wrkMast) {
 
+        // 鍏堢粦瀹氳浇鍏�
+        SiteBind siteBind = new SiteBind("BIN","RS00002A01011","BOX",wrkMast.getBarcode(),"BIND");
+        RcsReturn carrierBindReturn = rcsService.siteBind(siteBind);
+        if(!carrierBindReturn.getCode().equals("SUCCESS")) {
+            log.error("鍏ュ簱缁戝畾杞藉叿澶辫触锛歿}",JSONObject.toJSONString(carrierBindReturn));
+            return;
+        }
+
         // 涓嬪彂缁橰CS
         RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
         // 妯℃澘鍚�
@@ -77,6 +87,16 @@
         startRoute.setCode(wrkMast.getStaNo());
         startRoute.setOperation("COLLECT");
         startRoute.setType("SITE");
+        // 鍏ュ簱鍒板浐瀹氬垪锛屾寚瀹氳溅鏉ユ帴
+        String locNo = wrkMast.getLocNo();
+        int bay = Utils.getBay(locNo);
+        if (locNo.startsWith("01") && bay == 21) {
+            startRoute.setRobotType("ROBOTS");
+            startRoute.setRobotCode(Collections.singletonList("15"));
+        } else if (!locNo.startsWith("01") && bay >= 25 && bay <= 28) {
+            startRoute.setRobotType("ROBOTS");
+            startRoute.setRobotCode(Collections.singletonList("14"));
+        }
         targetRouteList.add(startRoute);
         RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
         endRoute.setSeq(1);
@@ -95,9 +115,9 @@
             wrkMast.setCrnStrTime(now);
             wrkMast.setTaskNo(rcsTaskSubmit.getRobotTaskCode());
             wrkMastService.updateById(wrkMast);
-            log.info("鍑哄簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゆ垚鍔燂紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
+            log.info("鍏ュ簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゆ垚鍔燂紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
         } else {
-            log.error("鍑哄簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゅけ璐ワ紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
+            log.error("鍏ュ簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゅけ璐ワ紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
         }
     }
 
@@ -271,7 +291,7 @@
         // 涓嬪彂缁橰CS
         RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
         // 妯℃澘鍚�
-        rcsTaskSubmit.setTaskType("CTU2");
+        rcsTaskSubmit.setTaskType("CTU4");
         rcsTaskSubmit.setRobotTaskCode(String.valueOf(new Date().getTime()));
         rcsTaskSubmit.setInitPriority(10);  //榛樿10
         List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();

--
Gitblit v1.9.1