From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 198d92f..a1d9d75 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -237,7 +237,11 @@
String barcode = map.get("barcode").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
if (agvWrkMast == null) {
- R.error("宸ヤ綔妗ｄ笉瀛樺湪");
+ agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode));
+ if (agvWrkMast != null && agvWrkMast.getWrkSts() != 205) {
+ return R.error("宸ヤ綔妗ｇ姸鎬佷笉瀵�,杩樺湪鎼繍涓�");
+ }
+ return R.error("宸ヤ綔妗ｄ笉瀛樺湪");
}
if (agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110) {
throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
@@ -288,7 +292,7 @@
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
String devNo = map.get("devNo").toString();
String barcode = map.get("barcode").toString();
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts", 205L));
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("loc_no", devNo).eq("wrk_sts", 205L));
if (agvWrkMast != null) {
if (agvWrkMast.getIoType() == 101) {
throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
--
Gitblit v1.9.1