From 4a2703db125e67a4a9590b55a2b7fa857e87ef45 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 18 八月 2025 14:16:48 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index e75e9b3..f07fba4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -107,7 +107,7 @@
AgvBasDevp agvBasDevp = JSONArray.parseObject(param,AgvBasDevp.class);
//鑻ュ綋鍓嶇珯鐐硅揣浣嶇姸鎬佷笉涓篎.鍦ㄥ簱鐘舵�侊紝鍒欒繑鍥為敊璇�
- if(!agvBasDevp.getLocSts().equals("F")){
+ if(!agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getLocSts().equals("R")){
return R.error("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙ｉ櫎缁戝畾");
}
agvBasDevp.setLocSts("O");
@@ -281,10 +281,12 @@
}catch (Exception e){
String devNo = map.get("devNo").toString();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
- if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ if (agvWrkMast != null) {
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
+ }
+ agvWrkMastList.add(agvWrkMast);
}
- agvWrkMastList.add(agvWrkMast);
}
// List<String> devNos = (List<String>) map.get("devNo");
--
Gitblit v1.9.1