From 93242dd899ff4a7e40b8304660cb1eac01871db6 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 12:39:45 +0800
Subject: [PATCH] 希日项目问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 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 cc667d6..cfc5abf 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
@@ -8,15 +8,12 @@
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
import com.vincent.rsf.server.manager.controller.params.WaveToLocParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.ContainerType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.enums.WaveRuleType;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
-import javax.swing.*;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -38,24 +35,24 @@
public static String getTargetLoc(Long areaId, Long containerType) {
Long locType = null;
- if (!Objects.isNull(containerType)) {
- LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
- if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
- LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
- .eq(LocType::getCode, "L"));
- if (Objects.isNull(low)) {
- throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
- }
- locType = low.getId();
- } else {
- LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
- .eq(LocType::getCode, "H"));
- if (Objects.isNull(low)) {
- throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
- }
- locType = low.getId();
- }
- }
+// if (!Objects.isNull(containerType)) {
+// LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
+// if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
+// LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
+// .eq(LocType::getCode, "L"));
+// if (Objects.isNull(low)) {
+// throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
+// }
+// locType = low.getId();
+// } else {
+// LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
+// .eq(LocType::getCode, "H"));
+// if (Objects.isNull(low)) {
+// throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
+// }
+// locType = low.getId();
+// }
+// }
//TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
LocService locService = SpringUtils.getBean(LocService.class);
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
@@ -129,7 +126,12 @@
LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
locItemQueryWrapper.eq(LocItem::getMatnrCode, matnrCode);
locItemQueryWrapper.eq(StringUtils.isNotEmpty(splrBatch), LocItem::getBatch, splrBatch);
- locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
+ //濡傛灉鎵规涓嶄负绌猴紝鎸夋壒娆″厛鍚庡嚭搴�
+ if (StringUtils.isNotBlank(splrBatch)) {
+ locItemQueryWrapper.orderByAsc(LocItem::getBatch);
+ } else {
+ locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
+ }
String applySql = String.format(
"EXISTS (SELECT 1 FROM man_loc ml " +
"WHERE ml.use_status = '%s'" +
@@ -224,7 +226,6 @@
orderOutItemDto.setSource(item.getItemId())
.setSourceId(item.getWaveId());
-
list.add(orderOutItemDto);
issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
--
Gitblit v1.9.1