From a881d98d2eee345af7454fd943fccbcc5c8bcb6f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 八月 2025 15:01:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

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 65b4f1a..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);
         }
@@ -165,11 +168,19 @@
                 if(locMast.getLocType1() == 3){
                     return false;
                 }else {
-                    return true;
+                    //涓旀娴嬭搴撲綅鏄惁鍚病鏈夋枡绠辩爜鐨勭墿鏂欙紝濡傛湁鏈夊垯涓嶅厑璁稿嚭搴�
+//                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+//                            .andNew().eq("supp_code", "").or().isNull("supp_code"));
+
+                    if(Cools.isEmpty(locDetlService.selectByLocWithoutContainer(locNo))){
+                        return true;
+                    }else {
+                        return false;
+                    }
                 }
             }).collect(Collectors.toSet());
 
-            //閲嶆柊鎺掑簭 骞朵笖妫�娴嬭搴撲綅鏄惁鍚病鏈夋枡绠辩爜鐨勭墿鏂欙紝濡傛湁鏈夊垯涓嶅厑璁稿嚭搴�
+            //閲嶆柊鎺掑簭
             Set<String> resort = resort(locNosSearch);
 
             for(String locNo : resort){

--
Gitblit v1.9.1