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 | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bfef011..c17d5c6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.entity.Parameter;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -142,45 +143,48 @@
// 鏇存柊搴撲綅鎺掑彿
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)){
- locMast = locMastService.queryFreeLocMast(2,(short)3);
- if (Cools.isEmpty(locMast)){
- locMast = locMastService.queryFreeLocMast(1,(short)3);
- }
+ .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(locMast2)){
+ locMast=locMast2.get(0);
+ }else if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1.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)){
- // 寮�濮嬫煡鎵惧簱浣� ==============================>
- 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());
- }
- }
- // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
- times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
String locNo = locMast.getLocNo();
--
Gitblit v1.9.1