From a8bb23b90b99f1898c2a0d0335115c69a6db761d Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 24 一月 2026 08:33:19 +0800
Subject: [PATCH] 添加了联结器库特殊站点时调用AGV特殊模板，添加人员入侵系统检测到有人时急停AGV的接口，修复AGV工作档没有任务号的漏洞
---
src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java b/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java
index fb1cba4..684dc50 100644
--- a/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java
@@ -71,19 +71,19 @@
// 淇濆瓨宸ヤ綔妗�
Task task = new Task();
Date date = new Date();
- String TaskNo = wrkMast.getWrkNo() + "aa" + date.getTime();
+ String TaskNo = wrkMast.getUserNo();
String taskType = "AGV";
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkMast.getIoType()!=110){
- if (wrkDetls != null && !Cools.isEmpty(wrkDetls.get(0).getOrderNo())){
- TaskNo = wrkDetls.get(0).getOrderNo();
- taskType = "KB-AGV";
+ if (wrkMast.getIoType()==110){
+ if (wrkMast == null){
+ TaskNo = 55555 + "aa" + date.getTime();
}
-
+ taskType = "ZX-AGV-08-1";
}else{
if (wrkDetls != null && !Cools.isEmpty(wrkDetls.get(0).getOrderNo())){
OrderPakout orderPakout = orderPakoutService.selectByNo(wrkDetls.get(0).getOrderNo());
+ TaskNo = wrkDetls.get(0).getOrderNo();
if (orderPakout.getDocType()==11){
taskType = "PP-AGV";
}else if (orderPakout.getDocType()==12){
@@ -91,7 +91,6 @@
}
}
-
}
task.setWrkNo(wrkMast.getWrkNo())
--
Gitblit v1.9.1