From d854c87dcb5dfc629a7e1e3e8d693271908e592f Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期日, 14 十二月 2025 19:43:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f0c187c..1d119bf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -152,7 +152,8 @@
}
} catch (Exception e) {
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�"+e.getMessage(), sourceStaNo);
+ throw new CoolException(sourceStaNo+"绔欑偣, 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�"+e.getMessage());
}
return null;
}
@@ -166,10 +167,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];
@@ -375,7 +376,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", false));
+ .orderBy("lev1", true).orderBy("bay1", true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
@@ -440,7 +441,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", false));
+ .orderBy("lev1", true).orderBy("bay1", true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
--
Gitblit v1.9.1