From 3aaa2f73d832be9f277e3bad798896d061c85516 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期二, 12 十二月 2023 13:04:12 +0800
Subject: [PATCH] #20231212-1304
---
src/main/java/com/zy/common/web/WcsController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 7566df9..20e4342 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -115,7 +115,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,waitPakins.get(0).getMatTypeIn());
if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
dto.setWorkNo(9999);
dto.setStaNo(1000);
@@ -159,7 +159,7 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
- waitPakin.setBatch("");
+// waitPakin.setBatch("");
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -204,7 +204,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
dto.setWorkNo(9999);
dto.setStaNo(1000);
@@ -273,7 +273,7 @@
}
// 妫�绱㈠簱浣�
List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
- return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+ return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
}
}
--
Gitblit v1.9.1