From 6fd6fd0b4e90a816989632506934bdfdb431f47f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:38:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java          |   11 +++++++++++
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java          |   13 +++++++++++++
 src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java |    3 +++
 src/main/java/com/zy/common/web/WcsController.java                   |    4 ++++
 4 files changed, 31 insertions(+), 0 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 cbc8bc7..5c2efa6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -151,6 +151,7 @@
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
         if (locMast.getLocSts().equals("O")){
+            log.warn("Flag - 1,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiUser(userId);
             locMast.setModiTime(now);
@@ -448,6 +449,7 @@
             // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
             locMast = locMastService.selectById(dto.getLocNo());
             if (locMast.getLocSts().equals("F")) {
+                log.warn("Flag - 2,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), ioType==101?"R":"P");
                 locMast.setLocSts(ioType==101?"R":"P");
                 locMast.setModiUser(userId);
                 locMast.setModiTime(now);
@@ -634,6 +636,7 @@
         // 淇敼搴撲綅鐘舵��:   F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷f枡/鐩樼偣/骞舵澘鍑哄簱涓�
         locMast = locMastService.selectById(taskDto.getLocNo());
         if (locMast.getLocSts().equals("F")) {
+            log.warn("Flag - 3,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), ioType==101?"R":"P");
             locMast.setLocSts(ioType==101?"R":"P");
             locMast.setModiUser(userId);
             locMast.setModiTime(now);
@@ -692,6 +695,7 @@
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
         if (locMast.getLocSts().equals("O")){
+            log.warn("Flag - 4,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiUser(userId);
             locMast.setModiTime(new Date());
@@ -795,6 +799,7 @@
             }
             // 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
             if (locMast.getLocSts().equals("D")){
+                log.warn("Flag - 5,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "R");
                 locMast.setLocSts("R");
                 locMast.setModiUser(userId);
                 locMast.setModiTime(new Date());
@@ -886,6 +891,7 @@
         }
         // 淇敼婧愬簱浣嶇姸鎬�
         if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
+            log.warn("Flag - 6,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", sourceLoc.getLocNo(), sourceLoc.getLocSts(), "R");
             sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
             sourceLoc.setModiUser(userId);
             sourceLoc.setModiTime(now);
@@ -897,6 +903,7 @@
         }
         // 淇敼鐩爣搴撲綅鐘舵��
         if (loc.getLocSts().equals("O")) {
+            log.warn("Flag - 7,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", loc.getLocNo(), loc.getLocSts(), "S");
             loc.setLocSts("S"); // S.鍏ュ簱棰勭害
             loc.setModiTime(now);
             loc.setModiUser(userId);
@@ -1061,11 +1068,13 @@
         int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
         if (locMast.getLocSts().equals("F")) {
             if (count == 0) {
+                log.warn("Flag - 8,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "D");
                 locMast.setLocSts("D");
             }
         }
         if (locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O")) {
             if (count > 0) {
+                log.warn("Flag - 9,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                 locMast.setLocSts("F");
             }
         }
@@ -1105,6 +1114,7 @@
                 if (Cools.isEmpty(locMast)) {
                     throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:" + wrkMast.getSourceLocNo());
                 }
+                log.warn("Flag - 9,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                 locMast.setLocSts("F");
                 locMast.setModiTime(new Date());
                 locMast.setModiUser(userId);
@@ -1127,6 +1137,7 @@
                 if (Cools.isEmpty(locMast)) {
                     throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:" + wrkMast.getSourceLocNo());
                 }
+                log.warn("Flag - 10,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                 locMast.setLocSts("O");
                 locMast.setModiTime(new Date());
                 locMast.setModiUser(userId);
@@ -1196,6 +1207,7 @@
         if (Cools.isEmpty(locMast)) {
             throw new CoolException("鍙栨秷宸ヤ綔妗eけ璐ワ紝搴撲綅涓嶅瓨鍦�:"+ locNo);
         }
+        log.warn("Flag - 11,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), locSts);
         locMast.setLocSts(locSts);
         locMast.setModiTime(new Date());
         locMast.setModiUser(userId);
@@ -1253,6 +1265,7 @@
         }
         // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
         LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+        log.warn("Flag - 12,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "Q");
         locMast.setLocSts("Q");
         locMast.setModiTime(new Date());
         locMast.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
index c946ef9..971c519 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
@@ -12,6 +12,7 @@
 import com.zy.asrs.utils.Utils;
 import com.zy.common.model.enums.WorkNoType;
 import com.zy.common.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +21,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class AutoReplenishmentHandler extends AbstractHandler<String> {
 
@@ -75,6 +77,7 @@
             List<LocDetl> locDetls = locDetlService.selectByLocNo(locNo);
             createWrkDetl(locDetls, wrkMast,order.getOrderNo(),now);
             //淇敼搴撲綅鐘舵��
+            log.warn("Flag - 24,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "R");
             locMast.setLocSts("R");
             locMastService.updateByLocNo(locMast);
         }
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 0ab3f5a..c14cb4f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -67,6 +67,7 @@
                         if (!Cools.isEmpty(wrkMast.getBarcode())) {
                             locMast.setBarcode(wrkMast.getBarcode());
                         }
+                        log.warn("Flag - 13,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "D");
                         locMast.setLocSts("D");
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
@@ -123,6 +124,7 @@
                     }
                     // 淇敼搴撲綅鐘舵�� S ====>> F
                     if (locMast.getLocSts().equals("S")) {
+                        log.warn("Flag - 14,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                         locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
@@ -221,6 +223,7 @@
 
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
                     if (locMast.getLocSts().equals("Q")) {
+                        log.warn("Flag - 15,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                         locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
@@ -236,6 +239,7 @@
                     //娓呯┖婧愬簱浣嶆暟鎹� P ====>> O
                     LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
                     if (locMast1.getLocSts().equals("P")) {
+                        log.warn("Flag - 16,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                         locMast1.setLocSts("O"); // 娓呯┖搴撲綅
                         locMast1.setModiTime(new Date());
                         if (!locMastService.updateById(locMast1)) {
@@ -277,6 +281,7 @@
                     }
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
                     if (locMast.getLocSts().equals("Q")) {
+                        log.warn("Flag - 17,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                         locMast.setLocSts("F");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
@@ -310,6 +315,7 @@
                     }
                     // 淇敼搴撲綅鐘舵�� S ====>> F
                     if (locMast.getLocSts().equals("S")) {
+                        log.warn("Flag - 18,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), wrkMast.getFullPlt().equals("Y")?"F":"D");
                         locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
                         locMast.setBarcode(wrkMast.getBarcode());
                         locMast.setIoTime(now);
@@ -334,6 +340,7 @@
                     // 淇敼婧愬簱浣嶇姸鎬� ==> O
                     LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                     if (null != sourceLoc) {
+                        log.warn("Flag - 19,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", sourceLoc.getLocNo(), sourceLoc.getLocSts(), "O");
                         sourceLoc.setBarcode("");
                         sourceLoc.setLocSts("O");
                         sourceLoc.setModiTime(now);
@@ -344,6 +351,7 @@
                         locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                     }
                     // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+                    log.warn("Flag - 20,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), locSts);
                     locMast.setLocSts(locSts);
                     locMast.setBarcode(wrkMast.getBarcode());
                     locMast.setIoTime(now);
@@ -399,6 +407,7 @@
                     }
                     // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
+                        log.warn("Flag - 21,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                         locMast.setLocSts("O");
                         locMast.setBarcode("");
                         locMast.setModiTime(now);
@@ -412,6 +421,7 @@
                 case 107:
                     // 淇敼搴撲綅鐘舵�� R ===>> O
                     if (locMast.getLocSts().equals("P")) {
+                        log.warn("Flag - 22,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                         locMast.setLocSts("O");
                         locMast.setBarcode("");
                         locMast.setModiTime(now);
@@ -426,6 +436,7 @@
                 case 110:
                     // 淇敼搴撲綅鐘舵�� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
+                        log.warn("Flag - 23,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                         locMast.setLocSts("O");
                         locMast.setBarcode("");
                         locMast.setModiTime(now);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 770a948..55b590e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -334,6 +334,7 @@
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
         if (locMast.getLocSts().equals("O")) {
+            log.warn("Flag - 25,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiTime(now);
             if (!locMastService.updateById(locMast)) {
@@ -400,6 +401,7 @@
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
         if (locMast.getLocSts().equals("O")) {
+            log.warn("Flag - 26,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiTime(new Date());
             if (!locMastService.updateById(locMast)) {
@@ -443,6 +445,7 @@
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
         if (locMast.getLocSts().equals("O")) {
+            log.warn("Flag - 27,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "S");
             locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
             locMast.setModiTime(new Date());
             if (!locMastService.updateById(locMast)) {
@@ -498,6 +501,7 @@
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
         if (locMast.getLocSts().equals("O")) {
+            log.warn("Flag - 28,{}搴撲綅鐘舵�佸彉鏇�,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "Q");
             locMast.setLocSts("Q"); // Q.鎷f枡鍐嶅叆搴�
             locMast.setModiTime(new Date());
             if (!locMastService.updateById(locMast)) {

--
Gitblit v1.9.1