From d61d4384e19580a32becb54e8e7f2287bed5469a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 26 五月 2025 09:08:18 +0800
Subject: [PATCH] 1.出库口补空板 2.组托时调用agv 3.新增agv调用程序
---
src/main/java/com/zy/common/service/CommonService.java | 144 +++++++++++++++++++++++++++++++-----------------
1 files changed, 93 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3ec9bd1..6437d04 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;
@@ -52,6 +53,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
* @return workNo(宸ヤ綔鍙�)
*/
@@ -64,17 +66,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
while (true) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0){
+ if (workNo > 0) {
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -82,7 +84,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -91,21 +93,18 @@
/**
* 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞宸ヤ綔绫诲瀷
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞宸ヤ綔绫诲瀷
* @param sourceStaNo 婧愮珯
- * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+ * @param matNos 鍟嗗搧缂栧彿闆嗗悎
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- if (sourceStaNo.equals(100)){
- whsType=1;
- }else if (sourceStaNo.equals(200)){
- whsType=2;
- }
-
+ whsType = 1;
+ locTypeDto.setLocType1((short) 1);
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -123,14 +122,6 @@
// 鐩爣搴撲綅
LocMast locMast = null;
- if (curRow==3){
- curRow=4;
- }else if (curRow==4){
- curRow=3;
- }else {
- rowCount=0;
- }
-
if (crnNo == 0) {
throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
}
@@ -146,37 +137,89 @@
}
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
- // 寮�濮嬫煡鎵惧簱浣� ==============================>>
- if (Cools.isEmpty(locMast)) {
- Integer 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 (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>()
+ .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("娌℃湁寰呮祴搴撲綅鏃犳硶鍏ュ簱锛侊紒锛�");
+ }
+ }
+ }
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ 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(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);
+ }
+ }
}
}
- // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ 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)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- 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();
@@ -192,17 +235,16 @@
return startupDto;
}
- public Short getLocType2Small(Integer curRow,short locType1){
- Integer OCount = locMastService.queryFreeLocMastCount(curRow, locType1, (short)1);
- short locType2=1;
- for (int i=2;i<equipmentCount+1;i++){
- Integer integer =locMastService.queryFreeLocMastCount(curRow, locType1, (short)i);
- if (OCount<integer){
- OCount=integer;
- locType2=(short)i;
+ public Short getLocType2Small(Integer curRow, short locType1) {
+ Integer OCount = locMastService.queryFreeLocMastCount(curRow, locType1, (short) 1);
+ short locType2 = 1;
+ for (int i = 2; i < equipmentCount + 1; i++) {
+ Integer integer = locMastService.queryFreeLocMastCount(curRow, locType1, (short) i);
+ if (OCount < integer) {
+ OCount = integer;
+ locType2 = (short) i;
}
}
-
return locType2;
}
--
Gitblit v1.9.1