From f02c773b5871178bba5370454408882416ae2b14 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 20:27:52 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 3 +++
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 6 +++++-
2 files changed, 8 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 6f6c36f..3ec6244 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.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index b74d34b..b660ea0 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -1555,6 +1555,9 @@
private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
if (!Cools.isEmpty(agvBasDevp)) {
agvBasDevp.setLocSts(locSts);
+ if (locSts.equals("S")) {
+ agvBasDevp.setBarcode("");
+ }
agvBasDevpService.updateById(agvBasDevp);
}
}
--
Gitblit v1.9.1