From 74951023b54f1789d1244fe923219d467487d771 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期一, 26 一月 2026 09:03:42 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 4e573e0..f78d13f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -25,6 +25,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.properties.AgvProperties;
import com.zy.common.service.CommonService;
+import com.zy.common.utils.AgvUtils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
@@ -253,10 +254,13 @@
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 鐢熸垚AGV宸ヤ綔鍙�
+ String agvWrkNo = AgvUtils.generateAgvWrkNo(workNo);
// 淇濆瓨宸ヤ綔妗�
Task task = new Task();
Date now = new Date();
task.setWrkNo(workNo)
+ .setAgvWrkNo(agvWrkNo) // 璁剧疆AGV宸ヤ綔鍙�
.setIoTime(now)
.setWrkSts(7L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
.setIoType(ioType) // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
@@ -1441,9 +1445,12 @@
public void generateOutTask(BasStation station, LocCache loc, Long userId) {
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 鐢熸垚AGV宸ヤ綔鍙�
+ String agvWrkNo = AgvUtils.generateAgvWrkNo(workNo);
// 淇濆瓨宸ヤ綔妗�
Task task = new Task();
task.setWrkNo(workNo)
+ .setAgvWrkNo(agvWrkNo)
.setIoTime(new Date())
.setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
.setIoType(101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
@@ -1528,10 +1535,14 @@
}
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 鐢熸垚AGV宸ヤ綔鍙�
+ String agvWrkNo = AgvUtils.generateAgvWrkNo(workNo);
// 淇濆瓨宸ヤ綔妗�
Task task = new Task();
+ Date now = new Date();
task.setWrkNo(workNo)
- .setIoTime(new Date())
+ .setAgvWrkNo(agvWrkNo) // 璁剧疆AGV宸ヤ綔鍙�
+ .setIoTime(now)
.setWrkSts(1L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
.setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
@@ -1545,9 +1556,9 @@
.setBarcode(barcode)// 鎵樼洏鐮�
.setLinkMis("N")
.setAppeUser(userId)
- .setAppeTime(new Date())
+ .setAppeTime(now)
.setModiUser(userId)
- .setModiTime(new Date());
+ .setModiTime(now);
if (!taskService.insert(task)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
--
Gitblit v1.9.1