From e43b29a03ba1d6a5d022075daa8fc54c6f3b30c7 Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期三, 26 六月 2024 17:00:36 +0800
Subject: [PATCH] 入库修改
---
src/main/java/com/zy/common/web/WcsController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 78f3121..022fc94 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -50,6 +50,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public R getLocNo(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
@@ -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,19 @@
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);
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -177,7 +196,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