From 10aef23d06cf1d12bc48273e7844328ddf0efcc8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 13 一月 2026 12:30:31 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 fe161e4..9dfce08 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -510,10 +510,10 @@
OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);
}
- //TODO 鍒ゆ柇璁惧鍙凤紝鐢熸垚鍏ュ簱浠诲姟銆傛病鏈夋満鍙板彿锛岃鏄庢槸鏅�氬嚭搴撲换鍔�
- if (!Objects.isNull(deviceNo)) {
- genInStock(wrkMast, deviceNo, userId);
- }
+// //TODO 鍒ゆ柇璁惧鍙凤紝鐢熸垚鍏ュ簱浠诲姟銆傛病鏈夋満鍙板彿锛岃鏄庢槸鏅�氬嚭搴撲换鍔�
+// if (!Objects.isNull(deviceNo)) {
+// genInStock(wrkMast, deviceNo, userId);
+// }
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
if (locMast.getLocSts().equals("F")) {
@@ -1304,7 +1304,10 @@
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
- wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ //鍒ゆ柇鏄惁涓洪鏂欏嚭搴�
+ if (Objects.isNull(wrkMast.getWrkCode())) {
+ wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ }
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
@@ -1476,14 +1479,13 @@
}
List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
if (Objects.isNull(binds) || binds.isEmpty()) {
- throw new CoolException("鍙版満鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
+ 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"));
@@ -1494,9 +1496,8 @@
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(),1);
//TODO 1. 鑾峰彇鍏ュ簱绔欑偣锛� 鐩爣搴撲綅 3. 灏嗗嚭搴撴槑缁嗘坊鍔犺嚦鍏ュ簱鏄庣粏
Integer staNo = staNos.stream().findFirst().get();
- WrkMast wrkMast = new WrkMast();
- if (Objects.isNull(wrkMast.getWrkCode())) {
+ if (Objects.isNull(outMast.getWrkCode())) {
throw new CoolException("鏁版嵁閿欒锛屼笂绾т换鍔＄紪鐮佷负绌猴紒锛�");
}
String wrkCode;
@@ -1507,6 +1508,7 @@
} else {
throw new CoolException("鏁版嵁閿欒锛屼笂绾т换鍔＄紪鐮侀敊璇紒锛�");
}
+ WrkMast wrkMast = new WrkMast();
// 鐢熸垚宸ヤ綔妗�
wrkMast.setWrkNo(workNo);
wrkMast.setWrkCode(wrkCode);
@@ -1514,8 +1516,8 @@
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setCrnNo(locMasts.getCrnNo());
- wrkMast.setSourceStaNo(outMast.getSourceStaNo());
- wrkMast.setStaNo(staNo + "");
+ wrkMast.setSourceStaNo(outMast.getStaNo());
+// wrkMast.setStaNo(staNo + "");
wrkMast.setLocNo(locMasts.getLocNo());
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setBarcode(outMast.getBarcode()); // 鎵樼洏鐮�
@@ -1550,7 +1552,7 @@
} else {
throw new CoolException(locMasts.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrkNo", outMast.getWrkNo()));
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", outMast.getWrkNo()));
if (Objects.isNull(wrkDetls) || wrkDetls.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓虹┖锛侊紒");
}
--
Gitblit v1.9.1