From 7e0d9bcc6d822f3ca959823e45d574d54366689d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 20:31:02 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 7 +++----
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 3ec6244..a1d9d75 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -239,7 +239,7 @@
if (agvWrkMast == null) {
agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode));
if (agvWrkMast != null && agvWrkMast.getWrkSts() != 205) {
- return R.error("宸ヤ綔妗ｇ姸鎬佷笉瀵�");
+ return R.error("宸ヤ綔妗ｇ姸鎬佷笉瀵�,杩樺湪鎼繍涓�");
}
return R.error("宸ヤ綔妗ｄ笉瀛樺湪");
}
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 b660ea0..c9b9325 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -227,7 +227,9 @@
updateAgvLocMast(agvLocMastService.selectById(sourceLocNo), locSts);
//鏇存柊鐩爣绔欑偣鐘舵��
//locSts = ioType == 101 ? "S" : "Q";
- updateAgvBasDevp(agvBasDevpService.selectById(targetLocNo), "S");
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(targetLocNo);
+ agvBasDevp.setBarcode("");
+ updateAgvBasDevp(agvBasDevp, "S");
});
}
@@ -1555,9 +1557,6 @@
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