From 09073d8b84d438d57d237d93d6dac4df5f838c57 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 29 十一月 2022 11:33:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ed8a294..e49a7ad 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -49,6 +49,8 @@
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -163,7 +165,17 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- Integer integer = rowLastnoService.selectNextWhsType();
+ int rowCount = rowLastnoService.selectCount(null);
+ Integer integer = 1;
+ 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")){
+ break;
+ }
+ }
+
StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
--
Gitblit v1.9.1