From d029518fd1ce9170fcf276b28d76d8d7b4f3a948 Mon Sep 17 00:00:00 2001
From: gtctu <3272660260@qq.com>
Date: 星期六, 10 一月 2026 09:36:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 887fefd..4610cb7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -615,7 +615,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void moveLocForDeepLoc(LocMast shallowLoc) {
try {
@@ -690,8 +690,7 @@
throw new CoolException("绉昏浆澶辫触");
}
} catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new CoolException(e);
}
}
@@ -1186,6 +1185,8 @@
// 鍑哄簱
} else if (wrkMast.getIoType() >100 && wrkMast.getWrkSts() > 10) {
wrkMast.setWrkSts(14L);
+ }else if (wrkMast.getIoType() == 200) {
+ wrkMast.setWrkSts(5L);
}
Date now = new Date();
wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
@@ -1713,7 +1714,7 @@
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void stockOutSXK(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
Date now = new Date();
// 鍚堝苟鍚岀被椤�
@@ -1762,6 +1763,9 @@
.eq("loc_type1",locMast.getLocType1())
.orderBy("bay1", true));
}
+ if (locMasts.isEmpty()){
+ throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌搴撲綅缁�");
+ }
for (LocMast locMast1 : locMasts) {
if (locMast1.getLocNo().equals(dto.getLocNo())){
break;
--
Gitblit v1.9.1