From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志

---
 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index da5bdc5..1a5e60b 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -50,18 +50,21 @@
 //        return SUCCESS;
 //    }
 
+    @Transactional
     public ReturnT<String> start2(AgvWrkMast agvWrkMast) {
         // locType 1. 鑷姩锛� 2. 鎵嬪姩
         doAutoMove2(agvWrkMast);
         return SUCCESS;
     }
 
+    @Transactional
     public ReturnT<String> start3(AgvWrkMast agvWrkMast) {
         // locType 1. 鑷姩锛� 2. 鎵嬪姩
         doHandMove2(agvWrkMast);
         return SUCCESS;
     }
 
+    @Transactional
     public ReturnT<String> start4(AgvWrkMast agvWrkMast) {
         // locType 1. 鑷姩锛� 2. 鎵嬪姩
         doAutoMove3(agvWrkMast);
@@ -193,8 +196,8 @@
         return SUCCESS;
     }
 
-
-    private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
+    @Transactional
+    public ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         String barcode = agvWrkMast.getBarcode();
         AgvLocMast locMast;
@@ -230,7 +233,8 @@
         return SUCCESS;
     }
 
-    private ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
+    @Transactional
+    public ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
         AgvLocMast locMast = agvCommonService.getLocNo(3, agvWrkMast.getCrnNo(), false, false);
@@ -250,7 +254,8 @@
         return SUCCESS;
     }
 
-    private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
+    @Transactional
+    public ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         String lev1 = agvWrkMast.getSourceLocNo().substring(agvWrkMast.getSourceLocNo().length() - 4).substring(0, 2);
         AgvBasDevp devpNo = new AgvBasDevp();
@@ -278,7 +283,7 @@
     /*
     鏇存柊鐩爣搴撲綅淇℃伅
      */
-    private void updateAgvLocMast(AgvLocMast locMast, String locSts) {
+    public void updateAgvLocMast(AgvLocMast locMast, String locSts) {
         locMast.setLocSts(locSts);
         agvLocMastService.updateById(locMast);
     }
@@ -286,14 +291,14 @@
     /*
     鏇存柊婧愮珯鐐逛俊鎭�
      */
-    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
+    public void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts) {
         if (!Cools.isEmpty(agvBasDevp)) {
             agvBasDevp.setLocSts(locSts);
             agvBasDevpService.updateById(agvBasDevp);
         }
     }
 
-    private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode) {
+    public void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode) {
         if (!Cools.isEmpty(agvBasDevp)) {
             agvBasDevp.setLocSts(locSts);
             agvBasDevp.setBarcode(containerCode);
@@ -344,6 +349,7 @@
         return SUCCESS;
     }
 
+    @Transactional
     public ReturnT<String> autoEmptyBack3(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
@@ -409,6 +415,8 @@
 //        return SUCCESS;
 //    }
 
+
+    @Transactional
     public ReturnT<String> autoEmptyBack4(AgvLocMast agvLocMast) {
         Date now = new Date();
         //鏌ヨ宸ヤ綔妗�
@@ -502,7 +510,7 @@
         return SUCCESS;
     }
 
-
+    @Transactional
     public ReturnT<String> autoEmptyBackSiqi(AgvLocMast agvLocMast) {
         Date now = new Date();
         //鏌ヨ宸ヤ綔妗�
@@ -588,6 +596,7 @@
     }
 
 
+    @Transactional
     public ReturnT<String> autoEmptyBack5(AgvBasDevp agvBasDevp) {
         //鏌ヨ宸ヤ綔妗�
         AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvBasDevp.getBarcode());
@@ -640,6 +649,8 @@
         return SUCCESS;
     }
 
+
+    @Transactional
     public ReturnT<String> autoEmptyBack6(AgvBasDevp agvBasDevp) {
         //鏌ヨ宸ヤ綔妗�
         AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvBasDevp.getBarcode());
@@ -680,6 +691,7 @@
         return SUCCESS;
     }
 
+    @Transactional
     public ReturnT<String> autoTransfers(AgvLocMast agvLocMast, Integer maxTansk) {
         Date now = new Date();
         List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
@@ -762,6 +774,7 @@
      * @param maxTansk
      * @return
      */
+    @Transactional
     public ReturnT<String> autoTransfersV2(AgvLocMast agvLocMast, Integer maxTansk) {
         Date now = new Date();
         List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));

--
Gitblit v1.9.1