From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 43ea61c..cdbcfae 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -77,7 +77,7 @@
@RequestMapping("/pick/again/auth")
@ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams) {
- if (pickParams == null || Cools.isEmpty(pickParams.getLocNo()) || Cools.isEmpty(pickParams.getLocNo())) {
+ if (pickParams == null) {
return R.error("缂哄皯鍙傛暟");
}
agvMobileService.pickAgain(pickParams, 1l);
@@ -177,6 +177,9 @@
return R.error("缂哄皯鍙傛暟");
}
for (AgvMobileStartParam.Pda pda : params.getPad()) {
+ if (pda == null || Cools.isEmpty(pda.getContainerCode())) {
+ return R.error("缂哄皯瀹瑰櫒鍙傛暟");
+ }
pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
}
@@ -416,7 +419,7 @@
AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
- if (agvLocMastByLocNo==null){
+ if (agvLocMastByLocNo == null) {
return R.error("搴撲綅涓嶅瓨鍦�");
}
String barcode1 = agvLocMastByLocNo.getBarcode();
@@ -525,6 +528,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
+ @Deprecated //涓嶇敤浜�
public R agvLocMove(@RequestBody HashMap<String, Object> params) {
String fl = String.valueOf(params.get("floor"));
short floor = (short) Integer.parseInt(fl.substring(0, 1));
@@ -553,7 +557,7 @@
// 鏇存柊璁㈠崟
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
if (orderDetl == null) {
- throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ throw new CoolException("璋冩嫧鍗曟槑缁嗕笉瀛樺湪");
}
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
--
Gitblit v1.9.1