From b187814d7cfa5ace1ed9c203372524c69fe56553 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:11:44 +0800
Subject: [PATCH] 1.完善AGV任务任务下发 2.拣料回库数据更新维护

---
 src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java b/src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java
index 2dd58e0..b9f56da 100644
--- a/src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java
@@ -37,21 +37,48 @@
         }else if(task.getIoType()==5){
             SourceStaNoType = "ZONE";
         }
+        String taskType = "PP";
+        Boolean flag1 = false;
+        Boolean flag2 = false;
+        if(task.getStaNo().equals("401")|| task.getStaNo().equals("402")|| task.getStaNo().equals("307")){
+            taskType = "YLIN";
+            flag1 = true;
+        }
+        if (task.getSourceStaNo().equals("401")|| task.getSourceStaNo().equals("402")|| task.getSourceStaNo().equals("307")){
+            taskType = "YLOUT";
+            flag2 = true;
+        }
+        if(flag1&&flag2){
+            taskType = "YLBOTH";
+        }
+        //AGV鍖哄煙涓棤娉曠敤-
+        String StaNo = task.getStaNo();
+        String SourceStaNo = task.getSourceStaNo();
+        if (task.getStaNo().split("-")[0].equals("Q")) {
+            String[] split = task.getStaNo().split("-");
+            StaNo = split[0]+split[1];
+        }
+        if (task.getSourceStaNo().split("-")[0].equals("Q")) {
+            String[] split = task.getSourceStaNo().split("-");
+            SourceStaNo = split[0]+split[1];
+        }
+
         // 涓嬪彂缁橰CS
         RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
-        rcsTaskSubmit.setRobotTaskCode(task.getTaskNo());
+        rcsTaskSubmit.setTaskType(taskType);
+        rcsTaskSubmit.setRobotTaskCode(task.getTaskNo()+"-"+task.getCtnType());
         rcsTaskSubmit.setInitPriority(10);  //榛樿10
         List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
         RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
         startRoute.setSeq(0);
         startRoute.setType(SourceStaNoType);
-        startRoute.setCode(task.getSourceStaNo());
+        startRoute.setCode(SourceStaNo);
         startRoute.setOperation("COLLECT");
         targetRouteList.add(startRoute);
         RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
         endRoute.setSeq(1);
         endRoute.setType(TargetStaNoType);
-        endRoute.setCode(task.getStaNo());
+        endRoute.setCode(StaNo);
         endRoute.setOperation("DELIVERY");
         targetRouteList.add(endRoute);
         rcsTaskSubmit.setTargetRoute(targetRouteList);

--
Gitblit v1.9.1