From 51ee242a62364a98af86b9bd3b9d191cd75c2f18 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 13 一月 2026 17:29:06 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 9dfce08..8e80ad0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -443,6 +443,54 @@
* @date 2026/1/9 20:16
*/
private void generateOutStock(TaskDto taskDto, Long userId, int workNo, String wrkCode, Date now, int ioType, LocMast locMast, StaDesc staDesc, String deviceNo) {
+ if (Objects.isNull(deviceNo)) {
+ throw new CoolException("鏈哄彴鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
+ .eq("status", 1)
+ .eq("dev_no", deviceNo));
+ if (Objects.isNull(basDevice)) {
+ throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
+ }
+
+ List<LocAroundBind> binds = locAroundBindService.selectList( new EntityWrapper<LocAroundBind>()
+ .eq("dev_no", basDevice.getDevNo())
+ .eq("is_default", 1));
+
+ 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)
+ .orderAsc(Arrays.asList("loc_no"))
+ .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+
+ if (Objects.isNull(locMasts)) {
+ binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
+ .eq("dev_no", basDevice.getDevNo()));
+
+ Set<String> nlocs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
+
+ locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .in("loc_no", nlocs)
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .orderAsc(Arrays.asList("loc_no"))
+ .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+ if (Objects.isNull(locMasts)) {
+ throw new CoolException("鏆傛棤鍙敤宸ヤ綔浣嶏紒锛�");
+ }
+ }
+
+
+
+
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(), 1);
+ //TODO 1. 鑾峰彇鍏ュ簱绔欑偣锛� 鐩爣搴撲綅 3. 灏嗗嚭搴撴槑缁嗘坊鍔犺嚦鍏ュ簱鏄庣粏
+ Integer staNo = staNos.stream().findFirst().get();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -454,7 +502,9 @@
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+// wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+ wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
+ wrkMast.setLocNo(locMasts.getLocNo());
wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -1493,7 +1543,7 @@
throw new CoolException("褰撳墠鏈哄彴锛屾棤鍙敤宸ヤ綔鍙帮紒锛�");
}
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(1));
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(),1);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(), 1);
//TODO 1. 鑾峰彇鍏ュ簱绔欑偣锛� 鐩爣搴撲綅 3. 灏嗗嚭搴撴槑缁嗘坊鍔犺嚦鍏ュ簱鏄庣粏
Integer staNo = staNos.stream().findFirst().get();
--
Gitblit v1.9.1