From d843848e44a3d81ab47241d925cf4644bf111984 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 09 一月 2026 17:23:15 +0800
Subject: [PATCH] 新增工作站出库任务优化
---
src/main/java/com/zy/asrs/controller/OutController.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 8690895..0bf3906 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,6 +7,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasDeviceServiceImpl;
import com.zy.asrs.service.impl.LocAroundBindServiceImpl;
@@ -86,23 +87,6 @@
if (issued <= 0.0D) {
continue;
}
- if (Objects.isNull(orderDetl.getStandby1())) {
- throw new CoolException("鍙版満鍙蜂笉鑳戒负绌猴紒锛�");
- }
- BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
- if (Objects.isNull(basDevice)) {
- throw new CoolException("鍙版満淇℃伅涓嶅瓨鍦紒锛�");
- }
-
- List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
- if (Objects.isNull(binds) || binds.isEmpty()) {
- throw new CoolException("鍙版満鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
- }
-
-
-
-
-
List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
for (LocDetl locDetl : locDetls) {
@@ -156,10 +140,32 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
locDto.setFrozen(locDetl.getFrozen());
locDto.setFrozenLoc(locMast.getFrozen());
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ List<Integer> staNos;
+ if (!Objects.isNull(orderDetl.getStandby1())) {
+ BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
+ if (Objects.isNull(basDevice)) {
+ throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
+ if (Objects.isNull(binds) || binds.isEmpty()) {
+ throw new CoolException("鍙版満鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
+ }
+ Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+
+ LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .in("loc_no", locs)
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .eq("dev_no", basDevice.getDevNo())
+ .orderAsc(Arrays.asList("loc_no"))
+ .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+
+ staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ } else {
+ staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ }
+
locDto.setStaNos(staNos);
locDto.setBrand(orderDetl.getBrand());
-
locDto.setStandby1(orderDetl.getStandby1());
locDto.setStandby2(orderDetl.getStandby2());
locDto.setStandby3(orderDetl.getStandby3());
@@ -224,7 +230,7 @@
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto, locDto.getStandby1());
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
assert dto != null;
@@ -236,7 +242,9 @@
// -----------------------------------------------------------------------------------------------
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- workService.stockOut(staNo, taskDto, getUserId());
+ if (!Objects.isNull(taskDto.getDeviceNo())) {
+ workService.stockOut(staNo, taskDto, taskDto.getDeviceNo(), getUserId());
+ }
}
return R.ok();
}
--
Gitblit v1.9.1