From 371462edc6b3ee1de97c235d4a019b544badda0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 14 二月 2026 22:09:37 +0800
Subject: [PATCH] AGV工作档界面和逻辑调整
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 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 9492211..a3d6471 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -207,20 +207,6 @@
throw new CoolException("鏉＄爜缁勬墭妗ｅ凡瀛樺湪锛�" + barcode);
}
- // 妫�鏌ユ槸鍚︽湁浠讳綍宸ヤ綔妗ｏ紙绌烘墭鐩樹笉搴旇鏈変换浣曞伐浣滄。锛屽寘鎷凡瀹屾垚鐨勫伐浣滄。锛�
- int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode));
- if (wrkMastCount != 0) {
- log.warn("鏉＄爜浠诲姟妗ｅ凡瀛樺湪锛屼笉鏄┖鎵樼洏锛歿}", barcode);
- throw new CoolException("鏉＄爜浠诲姟妗ｅ凡瀛樺湪锛�" + barcode);
- }
-
- // 妫�鏌ュ簱浣嶄笂鏄惁鏈夎鏉＄爜
- if (locCache != null && !Cools.isEmpty(locCache.getBarcode()) && locCache.getBarcode().equals(barcode)) {
- log.warn("绌烘墭鐩樺叆搴撴椂锛屽簱浣嶄笂宸叉湁璇ユ潯鐮侊紝涓嶅厑璁稿懠鍙獳GV锛氬簱浣�={}锛屾潯鐮�={}", sourceSite, barcode);
- throw new CoolException("鏉＄爜鍦ㄥ簱锛岃鏇存崲鏉＄爜" + barcode);
- }
-
-
// 閫氳繃鎵�鏈夋鏌ワ紝纭涓虹┖鎵樼洏锛岃缃负绌烘墭鍏ュ簱
ioType = 10;
log.info("纭涓虹┖鎵樼洏锛岃缃负绌烘墭鍏ュ簱锛屾潯鐮侊細{}锛宨oType锛歿}", barcode, ioType);
@@ -228,8 +214,6 @@
default:
throw new CoolException("鍏ュ簱绫诲瀷閿欒,type锛�" + type);
}
-
- // 缁熶竴鏍￠獙锛氬湪鎵�鏈堿GV鍛煎彨鍦烘櫙涓兘闇�瑕佹鏌ヤ互涓嬫潯浠讹紝鏈変换浣曚竴涓弧瓒冲垯涓嶅厑璁稿懠鍙獳GV
// 1. 鏍￠獙搴撲綅涓婄殑鏉＄爜鏄惁鍦ㄥ簱锛氭鏌ocCache琛ㄤ笂鏄惁鏈夎鏉＄爜锛屼笖璇ユ潯鐮佸湪LocDetl搴撳瓨涓�
// 娉ㄦ剰锛氱┖鎵樼洏鍏ュ簱锛坱ype=3锛変笉鏍￠獙搴撳瓨鏄庣粏锛屽彧鍦ㄦ牎楠屽簱浣嶄笂鏄惁鏈夋潯鐮侊紙宸插湪case 3涓鐞嗭級
@@ -243,26 +227,26 @@
throw new CoolException("鏉＄爜鍦ㄥ簱锛岃鏇存崲鏉＄爜" + barcode);
}
}
+ }else {
+ // 妫�鏌ュ簱浣嶄笂鏄惁鏈夎鏉＄爜
+ if (locCache != null && !Cools.isEmpty(locCache.getBarcode()) && locCache.getBarcode().equals(barcode)) {
+ log.warn("绌烘墭鐩樺叆搴撴椂锛屽簱浣嶄笂宸叉湁璇ユ潯鐮侊紝涓嶅厑璁稿懠鍙獳GV锛氬簱浣�={}锛屾潯鐮�={}", sourceSite, barcode);
+ throw new CoolException("鏉＄爜鍦ㄥ簱锛岃鏇存崲鏉＄爜" + barcode);
+ }
}
-
- // 2. 鏍￠獙宸ヤ綔妗ｄ腑杩愯涓殑鎵樼洏鐮侊細妫�鏌ユ槸鍚︽湁鏈畬鎴愮殑宸ヤ綔妗ｏ紙wrk_sts涓嶇瓑浜�4銆�14鍜�15锛�
- // 4=鍏ュ簱瀹屾垚锛�14=宸插嚭搴撴湭纭锛�15=鍑哄簱鏇存柊瀹屾垚
- int runningWrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
- .eq("barcode", barcode)
- .notIn("wrk_sts", Arrays.asList(4L, 14L, 15L))); // 涓嶇瓑浜庡叆搴撳畬鎴�(4)鍜屽嚭搴撳畬鎴�(14,15)
- if (runningWrkMastCount > 0) {
- log.warn("AGV鍛煎彨鏃讹紝鎵樼洏鐮佸湪宸ヤ綔妗ｄ腑杩愯涓紝涓嶅厑璁稿懠鍙獳GV锛歿}", barcode);
+ // 2. 鏍￠獙宸ヤ綔妗ｄ腑杩愯涓殑鎵樼洏鐮�
+ int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (wrkMastCount != 0) {
+ log.warn("鏉＄爜鍦ㄥ伐浣滄。宸插瓨鍦細{}", barcode);
throw new CoolException("鏉＄爜鍦ㄥ伐浣滄。锛岃鏇存崲鏉＄爜锛�" + barcode);
}
-
- // 3. 鏍￠獙AGV浠诲姟鍒楄〃涓湭瀹屾垚鐨勬墭鐩樼爜锛氭鏌ユ槸鍚︽湁鏈畬鎴愮殑AGV浠诲姟锛坕s_deleted=0涓攚rk_sts涓嶇瓑浜�4銆�14鍜�15锛�
- // 4=鍏ュ簱瀹屾垚锛�14=宸插嚭搴撴湭纭锛�15=鍑哄簱鏇存柊瀹屾垚
+
+ // 3. 鏍￠獙AGV浠诲姟鍒楄〃涓湭瀹屾垚鐨勬墭鐩樼爜锛氭鏌ユ槸鍚︽湁鏈畬鎴愮殑AGV浠诲姟锛坕s_deleted=0锛�
int unfinishedTaskCount = taskService.selectCount(new EntityWrapper<Task>()
.eq("barcode", barcode)
- .eq("is_deleted", 0)
- .notIn("wrk_sts", Arrays.asList(4L, 14L, 15L))); // 涓嶇瓑浜庡叆搴撳畬鎴�(4)鍜屽嚭搴撳畬鎴�(14,15)
+ .eq("is_deleted", 0));
if (unfinishedTaskCount > 0) {
- log.warn("AGV鍛煎彨鏃讹紝鎵樼洏鐮佸湪AGV浠诲姟鍒楄〃涓湭瀹屾垚锛屼笉鍏佽鍛煎彨AGV锛歿}", barcode);
+ log.warn("AGV鍛煎彨鏃讹紝鏉＄爜鍦ˋGV浠诲姟妗ｏ紝涓嶅厑璁稿懠鍙獳GV锛歿}", barcode);
throw new CoolException("鏉＄爜鍦ˋGV浠诲姟妗ｏ紝璇锋洿鎹㈡潯鐮侊細" + barcode);
}
--
Gitblit v1.9.1