From 985c427122c8aa1e421bdec8c13e8947117f967d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 二月 2025 14:29:29 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 2 +-
1 files changed, 1 insertions(+), 1 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..6f6c36f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -288,7 +288,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