From 73e42333948a8143c54218cd26435c2233daf279 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 16 一月 2026 14:13:14 +0800
Subject: [PATCH] agv出入库逻辑
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b3804f3..c4c7790 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -76,8 +76,14 @@
// 鏍规嵁taskId鏌ヨ浠诲姟
Task task = null;
try {
+ // 澶勭悊"T"鍓嶇紑鏍煎紡锛堝"T130"锛夛紝杩欐槸AGV浠诲姟鍒涘缓鏃剁殑鏍煎紡
+ String numericId = taskId;
+ if (taskId.startsWith("T") && taskId.length() > 1) {
+ numericId = taskId.substring(1);
+ log.debug("妫�娴嬪埌T鍓嶇紑鏍煎紡鐨則askId锛屾彁鍙栨暟瀛桰D锛歿}", numericId);
+ }
// 灏濊瘯灏唗askId瑙ｆ瀽涓篖ong绫诲瀷鐨刬d
- Long taskIdLong = Long.parseLong(taskId);
+ Long taskIdLong = Long.parseLong(numericId);
task = taskService.selectById(taskIdLong);
} catch (NumberFormatException e) {
// 濡傛灉涓嶆槸鏁板瓧锛屽皾璇曢�氳繃鍏朵粬瀛楁鏌ヨ锛堝sheetNo绛夛級
@@ -131,8 +137,16 @@
String kind = param.getKind();
if ("璐х墿杞繍".equals(kind)) {
log.info("澶勭悊璐х墿杞繍浠诲姟锛宼askId锛歿}", taskId);
- } else if ("瀹炴墭鍏ュ簱".equals(kind)) {
- log.info("澶勭悊瀹炴墭鍏ュ簱浠诲姟锛宼askId锛歿}", taskId);
+ } else if ("瀹炴墭鍏ュ簱".equals(kind) || "绌烘墭鍏ュ簱".equals(kind)) {
+ log.info("澶勭悊鍏ュ簱浠诲姟锛宼askId锛歿}", taskId);
+ // 鍏ュ簱浠诲姟锛氬鏋滄敹鍒扮‘璁ゅ彇璐у洖璋冿紙loaded=true锛夛紝瀹岀粨AGV鍛煎彨鍗�
+ if (Boolean.TRUE.equals(param.getLoaded())) {
+ // 濡傛灉浠诲姟鐘舵�佹槸8锛堝凡鍛煎彨AGV锛夛紝鏇存柊涓�9锛堜换鍔″畬鎴愶級
+ if (task.getWrkSts() != null && task.getWrkSts() == 8L) {
+ task.setWrkSts(9L);
+ log.info("鍏ュ簱浠诲姟鏀跺埌纭鍙栬揣鍥炶皟锛屽畬缁揂GV鍛煎彨鍗曪紝taskId锛歿}", taskId);
+ }
+ }
} else if ("瀹炴墭鍑哄簱".equals(kind)) {
log.info("澶勭悊瀹炴墭鍑哄簱浠诲姟锛宼askId锛歿}", taskId);
}
--
Gitblit v1.9.1