From 9d9206ceb0c9fa20b272adcc11c2ce5fc9293eb7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:33:52 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index e779972..82ab630 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -344,6 +344,13 @@
assert ioType != null;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
+
+ String barcode = locMast.getBarcode();
+ int count = wrkMastService.count(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getBarcode, barcode));
+ if (count > 0) {
+ throw new CoolException("宸ヤ綔妗ｅ凡鐢熸垚");
+ }
+
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getStnNo, staNo).eq(StaDesc::getHostId, hostId));
// 鐢熸垚宸ヤ綔鍙�
@@ -355,14 +362,14 @@
wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(Cools.isEmpty(staDesc.getDeviceStn())? 0 : staDesc.getDeviceStn()); // 婧愮珯
+ wrkMast.setStaNo(Cools.isEmpty(staDesc.getStnNo()) ? 0:staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setBarcode(barcode);
wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiUser(String.valueOf(userId));
@@ -426,7 +433,7 @@
// 鑾峰彇璺緞
int ioType = taskDto.isAll() ? 101 : 103;
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getDeviceStn, staNo).eq(StaDesc::getHostId, hostId));
+ StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getStnNo, staNo).eq(StaDesc::getHostId, hostId));
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -443,6 +450,7 @@
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
@@ -484,7 +492,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increase(orderDetl.getOrderId(), hostId, orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(), hostId)) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId, hostId);
--
Gitblit v1.9.1