From 283e991f280136bc00e87ac688eb4b313e9b828f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 02 九月 2025 14:56:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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..ede0afd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -615,14 +615,14 @@
         }
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void moveLocForDeepLoc(LocMast shallowLoc) {
 
         try {
             LocTypeDto locTypeDto = new LocTypeDto();
             locTypeDto.setLocType1(shallowLoc.getLocType1());
             locTypeDto.setLev1(shallowLoc.getLev1());
-            StartupDto dto = commonService.getLocNo( 1, 31002, null,null,null, locTypeDto, false);
+            StartupDto dto = commonService.getLocNo( 11, 31002, null,null,null, locTypeDto, false);
             if (Cools.isEmpty(dto)){
                 throw new CoolException("绉诲簱鏈壘鍒板簱浣�");
             }
@@ -690,8 +690,7 @@
                 throw new CoolException("绉昏浆澶辫触");
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new CoolException(e);
         }
     }
 
@@ -1713,7 +1712,7 @@
 
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void stockOutSXK(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
         Date now = new Date();
         // 鍚堝苟鍚岀被椤�
@@ -1762,6 +1761,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