From 46ba954e2b86a7e5f3f8b6624bc800a0a5cef844 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 04 九月 2025 16:55:03 +0800
Subject: [PATCH] 波次任务功能优化 不同站点类型状态变更优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index 5bda303..aca7d0c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -96,7 +96,7 @@
     public static List<LocItem> getFirstInFirstOutItemList(String matnrCode, String splrBatch, Double anfme) {
         LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
         locItemQueryWrapper.eq(LocItem::getMatnrCode, matnrCode);
-        locItemQueryWrapper.eq(LocItem::getBatch, splrBatch);
+        locItemQueryWrapper.eq(StringUtils.isNotEmpty(splrBatch), LocItem::getBatch, splrBatch);
         locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
         String applySql = String.format(
                 "EXISTS (SELECT 1 FROM man_loc ml " +
@@ -175,7 +175,8 @@
                             orderOutItemDto.setSiteNo(deviceSite.getSite());
                         }
 
-                        orderOutItemDto.setSource(item.getItemId()).setSourceId(item.getWaveId());
+                        orderOutItemDto.setSource(item.getItemId())
+                                .setSourceId(item.getWaveId());
 
                         list.add(orderOutItemDto);
 

--
Gitblit v1.9.1