From c356310bd2a40b8b3742e9097b52d2053e4761a6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 14:51:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 712ef7e..f0c187c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -162,7 +162,7 @@
FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto,
RowLastnoType rowLastnoType) {
int attempt = times;
- while (attempt < crnNumber * 2) {
+ while (attempt < crnNumber * 4) {
int[] params = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = params[1];
int crnNo = params[2];
@@ -1017,24 +1017,25 @@
if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
// 鑾峰彇鐩爣绔�
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- crnNo = 0;
- } else {
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo = 0;
- }
- startupDto.setStaNo(staNo.getDevNo());
- }
+// wrapper = new EntityWrapper<StaDesc>()
+// .eq("type_no", staDescId)
+// .eq("stn_no", sourceStaNo)
+// .eq("crn_no", crnNo);
+// staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+//// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// crnNo = 0;
+// }
+// else {
+// staNo = basDevpService.selectById(staDesc.getCrnStn());
+// if (!staNo.getAutoing().equals("Y")) {
+// log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+//// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// crnNo = 0;
+// }
+// startupDto.setStaNo(staNo.getDevNo());
+// }
}
// 鏇存柊搴撲綅鎺掑彿
@@ -1058,7 +1059,7 @@
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
+ if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
locMast = locMast2;
break;
}
--
Gitblit v1.9.1