From 5701eb6693c654d53f1bba460eb3a417d495b344 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 六月 2025 17:31:53 +0800
Subject: [PATCH] bug修复；下发任务给rcs携带货架码
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 7676b34..4d03ca6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -157,6 +157,20 @@
}
log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params));
// 缁勬墭
+ if (params.getBarcode().startsWith("31")) {
+ //绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉�
+ if (!Cools.isEmpty(params.getCombParams())) {
+ if (params.getCombParams().size() > 1) {
+ return R.error("鍗婃垚鍝佺澹冲叆搴擄紝璐ф灦涓婂彧鑳借涓�绉嶇墿鏂�");
+ } else {
+ List<CombParam.CombMat> combMats = params.getCombParams().get(0).getCombMats();
+ if (!Cools.isEmpty(combMats) && combMats.size() > 1) {
+ return R.error("鍗婃垚鍝佺澹冲叆搴擄紝璐ф灦涓婂彧鑳借涓�绉嶇墿鏂�");
+ }
+ }
+
+ }
+ }
params.getCombParams().forEach(combParam -> {
agvMobileService.comb(combParam, getUserId());
});
@@ -179,6 +193,20 @@
}
log.info("鍚姩鍏ュ簱v2,{}", JSON.toJSONString(params));
// 缁勬墭
+ if (params.getBarcode().startsWith("30")) {
+ //绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉�
+ if (!Cools.isEmpty(params.getCombParams())) {
+ if (params.getCombParams().size() > 1) {
+ return R.error("绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉嶇墿鏂�");
+ } else {
+ List<CombParam.CombMat> combMats = params.getCombParams().get(0).getCombMats();
+ if (!Cools.isEmpty(combMats) && combMats.size() > 1) {
+ return R.error("绠卞３鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉嶇墿鏂�");
+ }
+ }
+
+ }
+ }
params.getCombParams().forEach(combParam -> {
agvMobileService.comb(combParam, getUserId());
});
@@ -630,7 +658,7 @@
String locNo = map.get("locNo");
String barcode = map.get("suppCode");
AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
- if (!Cools.isEmpty(source_loc_no)) {
+ if (!Cools.isEmpty(source_loc_no) && source_loc_no.getWrkSts() < 204) {
throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
}
AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
--
Gitblit v1.9.1