From 78474bd1c29790ef08919e141acfa12157dbb6cf Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 15:49:53 +0800
Subject: [PATCH] 优化异常信息及版本更新
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index fb407d4..18a266d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -82,25 +82,27 @@
return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
}
int br = 0;
- switch (locMast.getBarcode().substring(0,2)) {
- case "10":
- br = 1;
- break;
- case "20":
- br = 2;
- break;
- case "21":
- br = 4;
- break;
- case "30":
- br = 3;
- break;
- case "40":
- br = 5;
- break;
- }
- if (oldLocMast.getLocType1() != br) {
- return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ if (locMast.getLocSts() == "O" || locMast.getLocSts() == "X"){
+ switch (locMast.getBarcode().substring(0,2)) {
+ case "10":
+ br = 1;
+ break;
+ case "20":
+ br = 2;
+ break;
+ case "21":
+ br = 4;
+ break;
+ case "30":
+ br = 3;
+ break;
+ case "40":
+ br = 5;
+ break;
+ }
+ if (oldLocMast.getLocType1() != br) {
+ return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ }
}
Date now = new Date();
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
@@ -120,11 +122,11 @@
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(getUserId());
if (!adjDetlService.insert(adjDetl)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅淇敼澶辫触");
}
}
if (!agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()))) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅鏄庣粏鍒犻櫎澶辫触");
}
if (locMast.getLocSts().equals("O")) {
locMast.setBarcode("");
@@ -134,7 +136,7 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
if(!agvLockMastService.updateById(locMast)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("涓诲簱浣嶄慨鏀瑰け璐�");
}
return R.ok();
}
--
Gitblit v1.9.1