From 000a710a02415542586adf2c5f5ecbe829f3d017 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期四, 07 五月 2026 15:12:05 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
index dd9db0e..b14c6f8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -50,7 +50,7 @@
changed = staMapper.tryReserveInCommon(sta.getId(), qty);
}
if (changed < qty) {
- throw new BusinessException("Sta[" + sta.getStaNo() + "] can't reserve IN");
+ throw new BusinessException("绔欑偣銆�" + sta.getStaNo() + "銆戝彲鍏ュ簱鏁伴噺涓嶈冻");
}
Date now = new Date();
@@ -71,7 +71,7 @@
if (!this.save(reserve)) {
staMapper.releaseReserveIn(sta.getId(), qty);
- throw new BusinessException("reserve record insert failed");
+ throw new BusinessException("绔欑偣銆�" + sta.getStaNo() + "銆戝叆搴撻绾︿繚瀛樺け璐�");
}
return reserve;
@@ -91,7 +91,7 @@
changed = staMapper.tryReserveOutCommon(sta.getId(), qty);
}
if (changed < qty) {
- throw new BusinessException("Sta[" + sta.getStaNo() + "] can't reserve OUT");
+ throw new BusinessException("绔欑偣銆�" + sta.getStaNo() + "銆戝彲鍑哄簱鏁伴噺涓嶈冻");
}
Date now = new Date();
@@ -113,7 +113,7 @@
if (!this.save(reserve)) {
staMapper.releaseReserveOut(sta.getId(), qty);
- throw new BusinessException("reserve record insert failed");
+ throw new BusinessException("绔欑偣銆�" + sta.getStaNo() + "銆戝嚭搴撻绾︿繚瀛樺け璐�");
}
return reserve;
@@ -175,10 +175,11 @@
@Transactional(rollbackFor = Exception.class)
public void confirmStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
+ String reserveType = StaReserveType.IN.equals(type) ? "鍏ュ簱" : "鍑哄簱";
// update reserve state to be confirmed
if (0 == this.baseMapper.updateState(task.getId(), sta.getId(), type.toString(), StaReserveStateType.CONFIRMED.toString())) {
- log.error("failed to confirm sta reserve");
+ log.error("纭绔欑偣棰勭害澶辫触锛氭湭鎵惧埌鍙‘璁ょ殑棰勭害璁板綍锛岀珯鐐广��" + sta.getStaNo() + "銆戯紝浠诲姟銆�" + task.getSeqNum() + "銆戯紝棰勭害鏂瑰悜銆�" + reserveType + "銆�");
return;
}
@@ -199,17 +200,18 @@
break;
}
if (cntOfDealWithReserve == 0) {
- throw new BusinessException("Sta[" + sta.getStaNo() + "] confirm failed, type=" + type.toString());
+ throw new BusinessException("绔欑偣銆�" + sta.getStaNo() + "銆�" + reserveType + "棰勭害纭澶辫触");
}
}
@Override
public void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
+ String reserveType = StaReserveType.IN.equals(type) ? "鍏ュ簱" : "鍑哄簱";
// update reserve state to be canceled
if (0 == this.baseMapper.updateState(task.getId(), sta.getId(), type.toString(), StaReserveStateType.CANCELLED.toString())) {
- log.error("failed to cancel sta reserve");
+ log.error("鍙栨秷绔欑偣棰勭害澶辫触锛氭湭鎵惧埌鍙彇娑堢殑棰勭害璁板綍锛岀珯鐐广��" + sta.getStaNo() + "銆戯紝浠诲姟銆�" + task.getSeqNum() + "銆戯紝棰勭害鏂瑰悜銆�" + reserveType + "銆�");
return;
}
@@ -225,7 +227,7 @@
break;
}
if (cntOfDealWithReserve == 0) {
- throw new BusinessException("Sta[" + sta.getStaNo() + "] cancel failed, type=" + type.toString());
+ throw new BusinessException("绔欑偣銆�" + sta.getStaNo() + "銆�" + reserveType + "棰勭害鍙栨秷澶辫触");
}
}
@@ -251,7 +253,7 @@
// .gt(StaReserve::getExpireTime, now)
);
if (null == inStaReserve) {
- throw new CoolException("failed to find out sta reserve");
+ throw new CoolException("鏈壘鍒扮洰鏍囩珯鐐瑰叆搴撻绾�");
}
break;
case STA_TO_LOC:
@@ -263,7 +265,7 @@
// .gt(StaReserve::getExpireTime, now)
);
if (null == outStaReserve) {
- throw new CoolException("failed to find out sta reserve");
+ throw new CoolException("鏈壘鍒拌捣濮嬬珯鐐瑰嚭搴撻绾�");
}
break;
case STA_TO_STA:
@@ -282,10 +284,10 @@
// .gt(StaReserve::getExpireTime, now)
);
if (null == inStaReserve) {
- throw new CoolException("failed to find out sta reserve");
+ throw new CoolException("鏈壘鍒扮洰鏍囩珯鐐瑰叆搴撻绾�");
}
if (null == outStaReserve) {
- throw new CoolException("failed to find out sta reserve");
+ throw new CoolException("鏈壘鍒拌捣濮嬬珯鐐瑰嚭搴撻绾�");
}
break;
default:
@@ -295,14 +297,14 @@
inStaReserve.setAgvId(agvId);
inStaReserve.setUpdateTime(now);
if (!this.updateById(inStaReserve)) {
- throw new CoolException("failed to update sta reserve");
+ throw new CoolException("鍏ュ簱棰勭害缁戝畾杞﹁締澶辫触");
}
}
if (null != outStaReserve) {
outStaReserve.setAgvId(agvId);
outStaReserve.setUpdateTime(now);
if (!this.updateById(outStaReserve)) {
- throw new CoolException("failed to update sta reserve");
+ throw new CoolException("鍑哄簱棰勭害缁戝畾杞﹁締澶辫触");
}
}
}
--
Gitblit v1.9.1