From f5f7f213ad99c626d19e16af44ae965e5ead938e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 六月 2024 10:46:07 +0800
Subject: [PATCH] WCS入库接口返参日志
---
src/main/java/com/zy/common/web/WcsController.java | 22 +++++++++++++++++++---
1 files changed, 19 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..0fd99f2 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -85,6 +85,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 +102,7 @@
default:
break;
}
-
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
@@ -109,7 +115,12 @@
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);
+ StartupDto dto;
+ if (devpNo == 304) {
+ dto = commonService.getLocNoBy304(barcode);
+ } else {
+ dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -177,7 +188,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