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/common/model/OutLocDto.java | 2 +-
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 6 +++---
src/main/java/com/zy/asrs/controller/LocMastController.java | 6 +++---
src/main/java/com/zy/common/model/TaskDto.java | 2 +-
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 3 +--
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java | 2 +-
pom.xml | 2 +-
src/main/java/com/zy/asrs/controller/PackController.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 ++++++++--------
10 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1032a20..ee14764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
- <cool.version>3.4.0</cool.version>
+ <cool.version>3.4.1</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 8b9dfd1..18a266d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -122,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("");
@@ -136,7 +136,7 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
if(!agvLockMastService.updateById(locMast)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("涓诲簱浣嶄慨鏀瑰け璐�");
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 3f1bc78..8e21d10 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -136,18 +136,18 @@
adjDetl.setAppeTime(now);
adjDetl.setAppeUser(getUserId());
if (!adjDetlService.insert(adjDetl)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璋冩暣璁板綍淇敼澶辫触");
}
}
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅鏄庣粏淇敼澶辫触");
}
}
}
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
if(!locMastService.updateById(locMast)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐�");
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 542d0a8..bcf5865 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -79,7 +79,7 @@
pack.setCreateBy(getUserId());
pack.setCreateTime(now);
if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鏁版嵁娣诲姞澶辫触");
}
Mat mat = new Mat();
mat.setTagId(tagService.getTop().getId());
@@ -90,7 +90,7 @@
mat.setUpdateTime(now);
mat.setMemo("鎵撳寘涓婄嚎");
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鎵撳寘涓婄嚎澶辫触");
}
return R.ok();
}
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 31755af..c5ff91e 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -640,8 +640,7 @@
}
if (Cools.isEmpty(agvLocMast)) {
- log.info("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
- return;
+ throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
}
//鐢熸垚宸ヤ綔妗�
createWrkMast(110, 21L, agvLocMast.getLocNo(), agvBasDevp.getDevNo(), agvLocMast.getBarcode(), now, userId, containerType, agvLocMast.getPltType());
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index c3411f3..ceff2a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -55,7 +55,7 @@
top.setUpdateTime(new Date());
Integer insert = this.baseMapper.insert(top);
if (insert == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ throw new CoolException("鑾峰彇鍒嗙被澶辫触");
}
}
return top;
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index daac737..52244bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -251,7 +251,7 @@
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -270,7 +270,7 @@
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -460,7 +460,7 @@
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -479,7 +479,7 @@
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -516,7 +516,7 @@
null // 澶囨敞
);
if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鎵撳寘澶辫触");
}
Mat mat = matService.selectByMatnr(analyse.getMatnr());
@@ -552,7 +552,7 @@
null // 澶囨敞
);
if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鍒嗙被娣诲姞澶辫触");
}
}
// 浜岀骇鍒嗙被
@@ -581,7 +581,7 @@
null // 澶囨敞
);
if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鍒嗙被娣诲姞澶辫触");
}
}
tagId = secTag.getId();
@@ -597,7 +597,7 @@
mat.setCreateTime(now);
mat.setUpdateTime(now);
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鐗╂枡娣诲姞澶辫触");
} else {
log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鐗╂枡鍙凤細{}]", mat.getMatnr());
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
index e8255ae..596ec4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
@@ -23,7 +23,7 @@
top.setSort(0);
Integer insert = this.baseMapper.insert(top);
if (insert == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ throw new CoolException("绫诲埆娣诲姞澶辫触");
}
}
return top;
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index e75f276..3aea2f4 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -57,7 +57,7 @@
continue;
}
if (next.getCount() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("鏁伴噺瓒呰繃搴撳瓨鏁伴噺");
}
if (next.getCount().equals(locDetl.getAnfme())) {
sameNumber++;
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 494c703..7ded416 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -139,7 +139,7 @@
// }
// }
if (dto.getAnfme() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("鏁伴噺瓒呰繃锛岃妫�鏌ュ簱瀛�");
}
if (dto.getAnfme().equals(locDetl.getAnfme())) {
sameNumber++;
--
Gitblit v1.9.1