From b8fbfc4bc15782a5e30cb17d7d948ca9e832acfa Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 13 十月 2022 16:07:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/WcsController.java | 5 ++--- src/main/java/com/zy/common/service/CommonService.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index fef68d3..40639a2 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -284,7 +284,7 @@ } } } - // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� + // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao // if (!locMastService.checkEmptyCount(locMast)) { // locMast = null; // } diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 77a1587..b95348f 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -91,7 +91,7 @@ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode()); break; case 103:// 鎷f枡鍏ュ簱 - break; + case 104:// 骞舵澘鍏ュ簱 case 107:// 鐩樼偣鍏ュ簱 dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto); break; @@ -251,8 +251,7 @@ } // 妫�绱㈠簱浣� List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList()); - StartupDto dto = commonService.getLocNo(1, ioType, devpNo, matnrList, locTypeDto,0); - return dto; // 搴撲綅鍙凤紝 鍫嗗灈鏈� + return commonService.getLocNo(1, ioType, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔� } } -- Gitblit v1.9.1