From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 b9f56da..4628c0f 100644
--- a/src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AGVTaskReportHandler.java
@@ -7,6 +7,7 @@
import com.zy.asrs.service.RcsService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.properties.StationProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +21,9 @@
@Service
@Transactional
public class AGVTaskReportHandler extends AbstractHandler<String> {
+
+ @Resource
+ private StationProperties stationProperties;
@Resource
private RcsService rcsService;
@@ -37,20 +41,37 @@
}else if(task.getIoType()==5){
SourceStaNoType = "ZONE";
}
- String taskType = "PP";
+ String taskType = "NB";
Boolean flag1 = false;
Boolean flag2 = false;
- if(task.getStaNo().equals("401")|| task.getStaNo().equals("402")|| task.getStaNo().equals("307")){
+ if(stationProperties.getStation().contains(task.getStaNo())){
taskType = "YLIN";
flag1 = true;
}
- if (task.getSourceStaNo().equals("401")|| task.getSourceStaNo().equals("402")|| task.getSourceStaNo().equals("307")){
+ if (stationProperties.getStation().contains(task.getSourceStaNo())){
taskType = "YLOUT";
flag2 = true;
}
if(flag1&&flag2){
taskType = "YLBOTH";
}
+
+ if (task.getSourceStaNo().equals("Z-LVL20")||task.getSourceStaNo().equals("Z-LVL21")||task.getSourceStaNo().equals("Z-LVL22")||
+ task.getSourceStaNo().equals("Z-LVL23")||task.getSourceStaNo().equals("Z-LVL24")||task.getSourceStaNo().equals("Z-LVL25")||
+ task.getSourceStaNo().equals("Z-LVL26")||task.getSourceStaNo().equals("Z-LVL27")||task.getSourceStaNo().equals("Z-LVL28")||
+ task.getSourceStaNo().equals("Z-LVL29")||task.getSourceStaNo().equals("Z-LVL30")||task.getSourceStaNo().equals("Z-LVL31")){
+ taskType = "HKCPIN";
+ }
+ if (task.getStaNo().equals("Z-LVL20")||task.getStaNo().equals("Z-LVL21")||task.getStaNo().equals("Z-LVL22")||
+ task.getStaNo().equals("Z-LVL23")||task.getStaNo().equals("Z-LVL24")||task.getStaNo().equals("Z-LVL25")||
+ task.getStaNo().equals("Z-LVL26")||task.getStaNo().equals("Z-LVL27")||task.getStaNo().equals("Z-LVL28")||
+ task.getStaNo().equals("Z-LVL29")||task.getStaNo().equals("Z-LVL30")||task.getStaNo().equals("Z-LVL31")
+ ){
+ taskType = "HKCPOUT";
+ }
+ if (task.getIsPda() !=null && task.getIsPda().equals("Y")){
+ taskType = "NB";
+ }
//AGV鍖哄煙涓棤娉曠敤-
String StaNo = task.getStaNo();
String SourceStaNo = task.getSourceStaNo();
--
Gitblit v1.9.1