From d5eb955933d4c7dc1f102d8a688f7447b5a674fd Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 17 十一月 2025 09:30:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/common/service/CommonService.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5dff18c..9db3ac8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -166,10 +166,10 @@
int[] params = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = params[1];
int crnNo = params[2];
- if (!basCrnpService.checkSiteError(crnNo, true)) {
- attempt++;
- continue;
- }
+// if (!basCrnpService.checkSiteError(crnNo, true)) {
+// attempt++;
+// continue;
+// }
int rowCount = params[0];
int nearRow = params[3];
@@ -1017,16 +1017,16 @@
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;
- }
+// 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")) {
@@ -1059,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