From 07c572bea979dbd3ee46ec24083cb1bdcc014e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 七月 2024 13:56:50 +0800
Subject: [PATCH] 一期找库位方法修改
---
src/main/java/com/zy/common/web/WcsController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 9df5d19..c99bb49 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -49,7 +49,8 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
- public R getLocNo(@RequestBody SearchLocParam param) {
+ public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
@@ -63,7 +64,7 @@
}
pltBarcodes = pltBarcodeService.selectList(new EntityWrapper<PltBarcode>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(pltBarcodes)) {
- return R.error("鏉＄爜鏁版嵁閿欒");
+ return R.error("鏉＄爜鏈粍鎵橈細" + param.getBarcode());
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
@@ -85,6 +86,12 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
locTypeDto.setLocType1(param.getLocType1());
+ // 闄愬埗鍙兘鏈変竴涓湪璁惧涓婅蛋鐘舵��
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("wrk_sts", 2).eq("source_sta_no", param.getSourceStaNo()));
+ if (count > 0) {
+ return R.error("宸叉湁鍦ㄨ澶囦笂璧板伐浣滄。");
+ }
+
StartupDto dto = null;
switch (param.getIoType()) {
case 1:
@@ -96,7 +103,7 @@
default:
break;
}
-
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto.toString(), param.getBarcode());
return R.ok().add(dto);
}
@@ -109,7 +116,20 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = pltBarcodes.stream().map(PltBarcode::getMatNo).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+
+ // 鑾峰彇绫诲埆鏍囪瘑(1鍘熸潗鏂欙紝2鎴愬搧)
+ List<String> str5 = pltBarcodes.stream().map(PltBarcode::getStr5).distinct().collect(Collectors.toList());
+ if (str5.isEmpty() || str5.get(0) == null) {
+ throw new CoolException("鐗╂枡绫诲埆鑾峰彇澶辫触");
+ }
+
+ StartupDto dto;
+ if (devpNo == 304) {
+ dto = commonService.getLocNoBy304(str5.get(0));
+ } else {
+// dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+ dto = commonService.getLocNoNew(1, devpNo,barcode);
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -140,7 +160,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
pltBarcodes.forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getQty()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor(),elem.getMemo()));
//鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱涓�
Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())
@@ -177,7 +197,12 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto,0);
+ StartupDto dto;
+// if (devpNo >= 300) {
+ dto = commonService.emptyIngetLocNo(devpNo);
+// } else {
+// dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
+// }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1