From f4a02e646e174cb6d134286d30ac75120bc6e972 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 14:15:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/CommonService.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index aa8979c..e0d6b54 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -235,7 +235,12 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
for (Integer near : nearRowList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", near)
@@ -247,7 +252,7 @@
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
if (locMasts.size() - crnCountO <= 2) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- }else {
+ } else {
nearRow = near;
break;
}
@@ -261,7 +266,12 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
for (Integer near : nearRowList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", near)
@@ -273,7 +283,7 @@
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
if (locMasts.size() - crnCountO <= 2) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- }else {
+ } else {
nearRow = near;
break;
}
@@ -283,7 +293,7 @@
if (nearRow == 0) {
throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
- }else {
+ } else {
throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
}
@@ -347,7 +357,7 @@
.eq("loc_no", shallowLoc)
.eq("loc_sts", "O")
);
- if(shallowLocMast != null) {
+ if (shallowLocMast != null) {
locMast = shallowLocMast;
break;
}
@@ -554,9 +564,16 @@
if (crnNo == 1) {
configService.updateValue("123CrnSearchList", String.valueOf(0));
}
-
+ //閽堝1鍙峰爢鍨涙満鎵撶殑琛ヤ竵锛岄槻姝㈡壘鍒板簱浣嶆椂锛屾壘鍒版渶娴呭簱浣�
+ String deepLoc2 = Utils.getDeepLoc2(slaveProperties, locMast.getLocNo());
+ if (!Cools.isEmpty(deepLoc2)) {
+ LocMast locMastNew = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", deepLoc2).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ if (!Cools.isEmpty(locMastNew)) {
+ locMast = locMastNew;
+ }
+ }
String locNo = locMast.getLocNo();
-
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
// 杩斿洖dto
--
Gitblit v1.9.1