From be5c6de69ba20049aba8a26591be1cd4a3934dca Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 10:50:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 51 +++++++++++----------------------------------------
1 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d51d09c..fc589c9 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 @@
@Transactional
public StartupDto getLocNoV2(Integer staDescId, Integer sourceStaNo, WrkMast wrkMast, LocTypeDto locTypeDto) {
try {
- Integer whsType = Utils.GetWhsType(sourceStaNo);
+ Integer whsType = 1;
RowLastno rowLastno = rowLastnoService.selectById(whsType);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
/**
@@ -409,7 +409,7 @@
}
/**
- * 褰撳洖婧愬簱浣嶄笉鍦ㄦ湰宸烽亾鏃讹紝鍑哄簱鑷�1070閲嶆柊妫�绱㈠贩閬撴牴鎹�1锛�2宸烽亾涔嬮棿鍒嗛厤锛�3锛�4宸烽亾鍏ㄥ眬鍒嗛厤瑙勫垯
+ * 褰撳洖婧愬簱浣嶄笉鍦ㄦ湰宸烽亾鏃讹紝閲嶆柊妫�绱㈠贩閬撴牴鎹�1锛�2宸烽亾涔嬮棿鍒嗛厤锛�3锛�4宸烽亾鍏ㄥ眬鍒嗛厤瑙勫垯
*/
@Transactional
public StartupDto getLocNoRunV2(Integer whsType, Integer staDescId, Integer sourceStaNo, WrkMast wrkMast, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
@@ -424,16 +424,6 @@
Integer chosenCrnNo = null;
Integer chosenCount = null;
for (int candidate : candidates) {
- if (!basCrnpService.checkSiteError(candidate, true)) {
- continue;
- }
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", candidate));
- if (Cools.isEmpty(staDesc)) {
- continue;
- }
//鍒ゆ柇璇ュ贩閬撴槸鍚﹀瓨鍦ㄧ┖浣�
LocMast candidateLoc = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("crn_no", candidate)
@@ -457,24 +447,17 @@
chosenCount = count;
}
}
- StaDesc staDesc = null;
LocMast locMast = null;
if (chosenCrnNo != null) {
- staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", chosenCrnNo));
- if (!Cools.isEmpty(staDesc)) {
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("crn_no", chosenCrnNo)
- .eq("loc_sts", "O")
- .eq("frozen", 0)
- .eq("deleted", 0)
- .eq("whs_type", 1)
- .orderBy("lev1,bay1"));
- }
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", chosenCrnNo)
+ .eq("loc_sts", "O")
+ .eq("frozen", 0)
+ .eq("deleted", 0)
+ .eq("whs_type", 1)
+ .orderBy("lev1,bay1"));
}
- if (Cools.isEmpty(staDesc) || Cools.isEmpty(locMast)) {
+ if (Cools.isEmpty(locMast)) {
List<LocMast> anyLocs = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
.eq("frozen", 0)
@@ -489,23 +472,13 @@
if (!basCrnpService.checkSiteError(anyLoc.getCrnNo(), true)) {
continue;
}
- StaDesc anyStaDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", anyLoc.getCrnNo()));
- if (Cools.isEmpty(anyStaDesc)) {
- continue;
- }
chosenCrnNo = anyLoc.getCrnNo();
- staDesc = anyStaDesc;
locMast = anyLoc;
break;
}
}
}
- if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
+
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -513,9 +486,7 @@
int workNo = getWorkNo(0);
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(chosenCrnNo);
- startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
- startupDto.setStaNo(staDesc.getCrnStn());
return startupDto;
}
--
Gitblit v1.9.1