From 35173cda98e2be25cf30a028697e6d363f8c4f77 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 13 十一月 2025 14:54:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index aff9cec..c2d19b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -528,8 +528,12 @@
// wrkMastLogEntityWrapper.isNotNull("sheet_no");
wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
- .eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
+ EntityWrapper<WrkDetlLog> wrkDetlLogEntityWrapper = new EntityWrapper<>();
+ wrkDetlLogEntityWrapper.eq("wrk_no", wrkMastLog.getWrkNo());
+ if (wrkMastLog.getIoType() != 300 && wrkMastLog.getIoType() != 301){
+ wrkDetlLogEntityWrapper.eq("zpallet", wrkMastLog.getBarcode());
+ }
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(wrkDetlLogEntityWrapper);
wrkDetlLogs.forEach(wrkDetlLog -> {
if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
--
Gitblit v1.9.1