From 3fa423ef9c04a4d0c2adbda721cde7589371d559 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 01 八月 2025 17:11:02 +0800
Subject: [PATCH] 库位明细修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 ed0b31d..5bda303 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
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.manager.enums.WaveRuleType;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
+import org.apache.commons.lang3.StringUtils;
import javax.swing.*;
import java.math.BigDecimal;
@@ -29,7 +30,6 @@
public static String getTargetLoc(Long areaId) {
//TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
LocService locService = SpringUtils.getBean(LocService.class);
-
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getAreaId, areaId)
.orderByAsc(Loc::getLev)
@@ -66,7 +66,7 @@
public static List<LocItem> getEfficiencyFirstItemList(String matnrCode, String splrBatch, Double anfme) {
LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
locItemQueryWrapper.eq(LocItem::getMatnrCode, matnrCode);
- locItemQueryWrapper.eq(LocItem::getBatch, splrBatch);
+ locItemQueryWrapper.eq(StringUtils.isNotBlank(splrBatch), LocItem::getBatch, splrBatch);
String applySql = String.format(
"EXISTS (SELECT 1 FROM man_loc ml " +
"WHERE ml.use_status = '%s'" +
@@ -175,7 +175,7 @@
orderOutItemDto.setSiteNo(deviceSite.getSite());
}
- orderOutItemDto.setSource(item.getItemId()).setSource(item.getWaveId());
+ orderOutItemDto.setSource(item.getItemId()).setSourceId(item.getWaveId());
list.add(orderOutItemDto);
--
Gitblit v1.9.1