From e4a2bc817e830611f7187ba8cb62875842b79d3f Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 28 十月 2025 13:40:12 +0800
Subject: [PATCH] 波次下髮優化 堆垛機移庫任務優化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index e5294ef..7a9e21e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -49,6 +49,8 @@
private OutStockService outStockService;
@Autowired
private WaveService waveService;
+ @Autowired
+ private BasStationService basStationService;
/**
@@ -70,7 +72,6 @@
if (Objects.isNull(map.getItems()) || map.getItems().isEmpty()) {
throw new CoolException("鏄庣粏涓嶈兘涓虹┖锛�");
}
-
String siteNo = map.getSiteNo();
List<LocItem> items = map.getItems();
Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
@@ -136,7 +137,7 @@
//鎷ｆ枡鍑哄簱 -- 鐩樼偣鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getSite, siteNo)
- .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(!Objects.isNull(loc.getChannel()),DeviceSite::getChannel, loc.getChannel())
.eq(DeviceSite::getType, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type));
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣涓嶆敮鎸佹嫞鏂欏嚭搴擄紒锛�");
@@ -145,7 +146,7 @@
} else {
//鍏ㄦ澘鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
.eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_OUT.type));
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
@@ -156,7 +157,7 @@
} else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
//鐩樼偣鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
.eq(DeviceSite::getSite, siteNo)
.eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type));
if (Objects.isNull(deviceSite)) {
@@ -169,27 +170,27 @@
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
- if (!LocUtils.isShallowLoc(loc.getCode())) {
- //鑾峰彇娣卞簱浣嶅搴旀祬搴撲綅
- String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
- Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
- if (Objects.isNull(one)) {
- throw new CoolException("瀵瑰簲搴撲綅涓嶅瓨鍦紒锛�");
- }
- Task workTask = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, one.getBarcode()));
- if (Objects.isNull(workTask)) {
- map.setOrgLoc(one.getCode());
- //浼樺厛鐢熸垚绉诲簱浠诲姟
- if (one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
- moveTask = genMoveTask(map, loginUserId);
- }
- } else {
- workTask.setSort(task.getSort() + 1).setParentId(task.getId());
- if (!taskService.updateById(workTask)) {
- throw new CoolException("浼樺厛绾т慨鏀瑰け璐ワ紒锛�");
- }
- }
- }
+// if (!LocUtils.isShallowLoc(loc.getCode())) {
+// //鑾峰彇娣卞簱浣嶅搴旀祬搴撲綅
+// String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+// Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+// if (Objects.isNull(one)) {
+// throw new CoolException("瀵瑰簲搴撲綅涓嶅瓨鍦紒锛�");
+// }
+// Task workTask = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, one.getBarcode()));
+// if (Objects.isNull(workTask)) {
+// map.setOrgLoc(one.getCode());
+// //浼樺厛鐢熸垚绉诲簱浠诲姟
+// if (one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+// moveTask = genMoveTask(map, loginUserId);
+// }
+// } else {
+// workTask.setSort(task.getSort() + 1).setParentId(task.getId());
+// if (!taskService.updateById(workTask)) {
+// throw new CoolException("浼樺厛绾т慨鏀瑰け璐ワ紒锛�");
+// }
+// }
+// }
if (!Objects.isNull(moveTask.getId())) {
moveTask.setParentId(task.getId()).setSort(moveTask.getSort() + 1);
@@ -293,14 +294,14 @@
//鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)
- .eq(DeviceSite::getChannel, orgLoc.getChannel()), false);
+ .eq(!Objects.isNull(orgLoc.getChannel()), DeviceSite::getChannel, orgLoc.getChannel()), false);
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
}
TaskInParam param = new TaskInParam();
param.setIoType(TaskType.TASK_TYPE_OUT.type)
.setOrgLoc(map.getOrgLoc())
- .setSourceStaNo(Integer.parseInt(deviceSite.getSite()))
+ .setSourceStaNo(deviceSite.getSite())
.setLocType1(Integer.parseInt(orgLoc.getType())
);
InTaskMsgDto locNo;
--
Gitblit v1.9.1