From 8ce4dcbd701b40165b0dbf365f667932cf2a8916 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 06 三月 2026 08:21:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 67 ---------------------------------
1 files changed, 1 insertions(+), 66 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 6298d71..bdba3fd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -443,67 +443,7 @@
* @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("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
- }
- LocAroundBind binds = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
- .eq("loc_type", LocStsType.LOC_STS_TYPE_O.type)
- .eq("dev_no", basDevice.getType()).orderBy("order_no"));
-
- if (Objects.isNull(binds)) {
- 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")));
-
-// 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")));
-// if (Objects.isNull(locMasts)) {
-// throw new CoolException("鏆傛棤鍙敤宸ヤ綔浣嶏紒锛�");
-// }
-// }
-
- LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", binds.getBlocNo()));
- bLocNo.setLocType(LocStsType.LOC_STS_TYPE_S.type);
-
- if (!locAroundBindService.updateById(bLocNo)) {
- throw new CoolException("宸ヤ綅棰勭害澶辫触锛侊紒");
- }
-
- LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", bLocNo.getBlocNo()));
-
- locMasts.setLocSts(LocStsType.LOC_STS_TYPE_S.type);
- locMasts.setModiUser(userId);
- locMasts.setModiTime(now);
- if (!locMastService.updateById(locMasts)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + locMasts.getLocNo());
- }
-
-
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(), 1);
- //TODO 1. 鑾峰彇鍏ュ簱绔欑偣锛� 鐩爣搴撲綅 3. 灏嗗嚭搴撴槑缁嗘坊鍔犺嚦鍏ュ簱鏄庣粏
- Integer staNo = staNos.stream().findFirst().get();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -514,12 +454,7 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
-// wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
- if(!Objects.equals(locMasts.getCrnNo(), locMast.getCrnNo())){
- wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
- wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
- }
- wrkMast.setLocNo(locMasts.getLocNo());
+ wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
--
Gitblit v1.9.1