From 757f103f37d83dfb55bb49b3df0b805cb520d4f7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:28:26 +0800
Subject: [PATCH] 第三版
---
src/main/java/com/zy/common/service/CommonService.java | 105 +++++++++++++++++-----------------------------------
1 files changed, 35 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6437d04..c17d5c6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -143,82 +143,47 @@
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
-
- if (crnNo==1){
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts", "F")
- .eq("loc_type1", (short) 3));//寰呮祴搴撲綅
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ if(staDescId==1){
+ List<LocMast> locMast1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
- .eq("loc_type1", (short) 1));//娴嬭瘯搴撲綅
- if (!Cools.isEmpty(locMast1)||Cools.isEmpty(locMast2)){
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O").eq("loc_type1", (short) 3)
- .orderBy("row1",false).orderBy("bay1",true));
- if(!Cools.isEmpty(locMasts)){
- locMast = locMasts.get(0);
- }else{
- throw new CoolException("娌℃湁寰呮祴搴撲綅鏃犳硶鍏ュ簱锛侊紒锛�");
- }
+ .eq("loc_type1", (short) 3)//寰呮祴搴撲綅
+ .orderBy("row1",true)
+ .orderBy("bay1",true));
+ List<LocMast> locMast2 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", (short) 1)//娴嬭瘯搴撲綅
+ .orderBy("row1",true)
+ .orderBy("bay1",true));
+ if (Cools.isEmpty(locMast1) || Cools.isEmpty(locMast2)) {
+ throw new CoolException("娌℃湁寰呮祴鍜屾祴璇曞簱浣嶆棤娉曞叆搴擄紒锛侊紒");
}
- }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
- if (locMasts.size() > 0) {
- for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
- continue;
- }
- if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
- }
- }
- }
+ if(!Cools.isEmpty(locMast2)){
+ locMast=locMast2.get(0);
+ }else if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1.get(0);
}
- if (Cools.isEmpty(locMast)) {
- List<LocMast> locMastList3 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O")
- .eq("row1",3)
- .notIn("loc_type1",1));
- if (!Cools.isEmpty(locMastList3)) {
- locMast = locMastList3.get(0);
- }else {
- List<LocMast> locMastList1 = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "O")
- .eq("row1",1)
- .notIn("loc_type1",1));
- if (!Cools.isEmpty(locMastList1)) {
- locMast = locMastList1.get(0);
- }
- }
+ }else if(staDescId==10){
+ List<LocMast> locMast1 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", (short) 3)//寰呮祴搴撲綅
+ .orderBy("row1",true)
+ .orderBy("bay1",true));
+ List<LocMast> locMast2 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", (short) 1)//娴嬭瘯搴撲綅
+ .orderBy("row1",true)
+ .orderBy("bay1",true));
+ if (Cools.isEmpty(locMast1) || Cools.isEmpty(locMast2)) {
+ throw new CoolException("娌℃湁寰呮祴鍜屾祴璇曞簱浣嶆棤娉曞叆绌烘墭锛侊紒锛�");
+ }
+ if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1.get(0);
+ }else if(!Cools.isEmpty(locMast2)){
+ locMast=locMast2.get(0);
}
}
- if (Cools.isEmpty(locMast)){
- locMast = locMastService.queryFreeLocMast(1, locTypeDto.getLocType1());
-// // 寮�濮嬫煡鎵惧簱浣� ==============================>
-// int ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
-// if (whsType != 1) {
-// locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
-// } else if (ruleId == 1) { //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
-// locMast = locMastService.queryFreeLocMast1(curRow, locTypeDto.getLocType1(), channelMax + 1);
-// } else if (ruleId == 2) { //鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
-// Short locType2 = getLocType2Small(curRow, locTypeDto.getLocType1());
-// locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1(), locType2);
-// } else { //榛樿瑙勫垯
-// locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
-// }
- }
+
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1