From c664c49f8e211b7b791a5ff1e63cda53c1b1264e Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期日, 05 四月 2026 01:04:47 +0800
Subject: [PATCH] # 明细历史优化+打印
---
src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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..06b6a5d 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){
@@ -280,7 +291,7 @@
WrkDetl wrkDetl = new WrkDetl();
BeanUtils.copyProperties(locDetl,wrkDetl);
wrkDetl.setZpallet(wrkMast.getBarcode());
- wrkDetl.setIoTime(now);
+ wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
//wrkDetl.setBatch(locDetl.getBatch());
wrkDetl.setOrderNo(orderNo);
--
Gitblit v1.9.1