From 4b24db42be9c3100783b8de055e72f93fd573ec8 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 16 二月 2023 16:27:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 19 +++++++++++++++----
1 files changed, 15 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 e49a7ad..46005e3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -166,12 +166,12 @@
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
int rowCount = rowLastnoService.selectCount(null);
- Integer integer = 1;
+ Integer integer = 2;
for (int i = 1; i <= rowCount; i++) {
integer = rowLastnoService.selectNextWhsType();
BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
- .eq("crn_no", i));
- if (crn_no.getInEnable().equals("Y")){
+ .eq("crn_no", integer));
+ if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 3){
break;
}
}
@@ -250,8 +250,19 @@
public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ int rowCount = rowLastnoService.selectCount(null);
+ Integer integer = 2;
+ for (int i = 1; i <= rowCount; i++) {
+ integer = rowLastnoService.selectNextWhsType();
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ .eq("crn_no", integer));
+ if (crn_no.getInEnable().equals("Y")
+ && crn_no.getCrnSts() == 3){
+ break;
+ }
+ }
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1