From 835a4d179d4e3fcecc7e2a8cd63e6698bb3f16c4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 31 三月 2025 16:54:27 +0800
Subject: [PATCH] wcs电视机代码移植
---
src/main/java/com/zy/common/service/CommonService.java | 412 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 378 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index cd7aafa..98226ab 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -13,11 +14,13 @@
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -49,6 +52,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
* @return workNo(宸ヤ綔鍙�)
*/
@@ -61,17 +65,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);
}
@@ -79,7 +83,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -88,21 +92,27 @@
/**
* 妫�绱㈠簱浣嶅彿
- * @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) {
- whsType = getWhsType(staDescId, times);
+ public StartupDto getLocNo4(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
StartupDto startupDto = new StartupDto();
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
+ if (sourceStaNo == 101 || sourceStaNo == 103) {
+ whsType = 1;
+ } else if (sourceStaNo == 105 || sourceStaNo == 107) {
+ whsType = 2;
+ } else {
+ throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// ===============>>>> 寮�濮嬫墽琛�
@@ -146,10 +156,13 @@
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
continue;
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ 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();
@@ -163,17 +176,22 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
- if (whsType == 1) {
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- break;
- }
+ int divides = (int) Arith.divides(1, curRow - 1, 4);
+ curRow = (int) Arith.remainder(curRow, 4);
+ if (curRow == 0) {
+ curRow = 4;
+ }
+ for (int i = 0; i < shelves.group; i++) {
+ curRow = shelves.start(curRow);
+ if (curRow < 0) {
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ Integer crnNo1 = shelves.get(curRow);
+ crnNo1 = crnNo1 + divides * 1;
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
+ curRow = curRow + divides * 4;
+ break;
}
}
}
@@ -193,8 +211,9 @@
}
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);
@@ -253,6 +272,214 @@
}
String locNo = locMast.getLocNo();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setLocNo(locNo);
+ return startupDto;
+ }
+
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞宸ヤ綔绫诲瀷
+ * @param sourceStaNo 婧愮珯
+ * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
+// whsType = getWhsType(sourceStaNo, times);
+ StartupDto startupDto = new StartupDto();
+
+// if (sourceStaNo < 200){
+// whsType = 1;
+// } else if (sourceStaNo > 199 && sourceStaNo < 300){
+// whsType = 2;
+// } else if (sourceStaNo > 299 && sourceStaNo < 400){
+// whsType = 3;
+// } else if (sourceStaNo > 399){
+// whsType = 4;
+// }
+
+ if (sourceStaNo == 101 || sourceStaNo == 103) {
+ whsType = 1;
+ } else if (sourceStaNo == 105 || sourceStaNo == 107) {
+ whsType = 2;
+ } else {
+ throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ // ===============>>>> 寮�濮嬫墽琛�
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crn_qty = rowLastno.getCrnQty();
+ int rowCount = eRow - sRow + 1;
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ // 鐩爣搴撲綅
+ LocMast locMast = null;
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matNos)) {
+ List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
+ for (String locNo : locNos) {
+ if (Utils.isShallowLoc(slaveProperties, locNo)) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ 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 (null == locMast) {
+ Shelves shelves = new Shelves(rowCount, crn_qty);
+ int divides = (int) Arith.divides(1, curRow - 1, 4);
+ curRow = (int) Arith.remainder(curRow, 4);
+ if (curRow == 0) {
+ curRow = 4;
+ }
+ for (int i = 0; i < shelves.group; i++) {
+ curRow = shelves.start(curRow);
+ if (curRow < 0) {
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ Integer crnNo1 = shelves.get(curRow);
+ crnNo1 = crnNo1 + divides * 1;
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
+ curRow = curRow + divides * 4;
+ break;
+ }
+ }
+ }
+
+ if (crnNo == 0) {
+ throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ }
+
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+
+ // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
+ if (locMast == null) {
+ if (Utils.isShallowLoc(slaveProperties, curRow)) {
+ Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
+ locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
+ // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (!locMastService.checkEmptyCount(locMast)) {
+ locMast = null;
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ if (!locMastService.checkEmptyCount(locMast)) {
+ locMast = null;
+ }
+ // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
+ if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
+ LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
+ if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
+ locMast = null;
+ }
+ }
+ // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
+ if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
+ LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
+ if (!shallowLoc.getLocSts().equals("O")) {
+ locMast = null;
+ }
+ }
+ }
+ }
+
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (Cools.isEmpty(locMast)) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < rowCount) {
+ times = times + 1;
+ return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+ }
+
+ // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
+ if (locTypeDto.getLocType1() == 1) {
+ locTypeDto.setLocType1((short) 2);
+ return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+ }
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(crnNo);
@@ -270,7 +497,7 @@
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
+ for (int i = 0; i < count - msg.length(); ++i) {
msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
@@ -280,11 +507,11 @@
/**
* 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
*/
- private Integer getWhsType(Integer staDescId, int times) {
+ private Integer getWhsType(Integer sourceStaNo, int times) {
if (times >= 16) {
return 4;
}
- switch (staDescId) {
+ switch (sourceStaNo) {
case 173:
case 176:
case 180:
@@ -296,15 +523,132 @@
case 202:
return 2;
case 206:
- case 211:
- case 215:
- case 219:
- case 223:
- case 226:
+// case 211:
+// case 215:
+// case 219:
+// case 223:
+ case 227:
return 3;
+ case 305:
+ case 303:
+ case 301:
+ return 4;
default:
- throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + staDescId);
+ throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
}
}
+ /**
+ * @param waitPakin 缁勬墭鐨勭墿鏂�
+ * @param arr 淇濆瓨椤哄簭灞�
+ * @param d 涓嬫爣
+ * @param locType 鐗╂枡鏄惁涓虹壒娈婄墿鏂�
+ * @param locType1 1.婊℃墭 2.绌烘墭
+ * @return
+ */
+ public LocMast getLocNo2(WaitPakin waitPakin, Integer[] arr, Integer d, Integer locType, Integer locType1) {
+ LocMast locMast = null;
+ //涓�.鏌ヨ鍏ュ簱璐х墿鏄惁鏄壒娈婃憜鏀捐揣鐗�
+ if (locType == 2) {
+ //鏌ユ壘灞傛爣璁扮殑
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("lev1", arr[d])
+ .eq("loc_sts", "O")
+ .eq("loc_type1", 2)
+ .eq("loc_attribute", 1));
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ }
+ } else {
+ List<LocMast> locMasts = new ArrayList<>();
+ //浜�.绌烘爤鏉挎憜鏀捐鍒�
+ //1.璇ュ眰鐩稿悓绌烘爤鏉�
+ //2.鑾峰緱locAttribute搴撲綅灞炴�т负1鐨勬墍鏈夊簱浣�
+ //3.鏌ョ湅缁勯噷鏄惁杩樻湁绌轰綅
+ if (locType1 == 2) {
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("lev1", arr[d])
+ .eq("loc_sts", "D")
+ .eq("loc_type1", 1)
+ .eq("loc_attribute", 1));
+ if (!Cools.isEmpty(locMasts)) {
+ for (LocMast locMast1 : locMasts) {
+ //4.鏌ョ湅璇ョ粍鏄惁鏈夐绾﹀叆搴撳拰棰勭害鍑哄簱鐨勫簱浣嶏紝鏈夌殑璇濈洿鎺ヨ烦杩囪缁�
+ List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("group1", locMast1.getGroup1())
+ .in("loc_sts", "P", "Q", "R", "S"));
+ if (!Cools.isEmpty(locMasts2)) {
+ continue;
+ }
+ //5.鎵惧嚭鍚屼竴缁勭殑绌哄簱浣�
+ //6.瀵规繁娴呭簱浣嶈繘琛屾帓搴�
+ List<LocMast> locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("group1", locMast1.getGroup1())
+ .eq("loc_sts", "O")
+ .orderBy("locAttribute"));
+ if (Cools.isEmpty(locMasts1)) {
+ continue;
+ }
+ //7.鏌ョ湅
+ locMast = locMasts1.get(0);
+ }
+ }
+ } else {
+ //涓�.姝ｅ父璐х墿鍏ュ簱
+ //1.璇ュ眰鐩稿悓鐗╂枡鎽嗘斁
+ //2.鑾峰緱locAttribute搴撲綅灞炴�т负1鐨勬墍鏈夊簱浣�
+ //3.鏌ョ湅缁勯噷鏄惁杩樻湁绌轰綅
+ locMasts = locMastService.querySame(waitPakin.getMatnr(), arr[d]);
+ if (!Cools.isEmpty(locMasts)) {
+ for (LocMast locMast1 : locMasts) {
+ //4.鏌ョ湅璇ョ粍鏄惁鏈夐绾﹀叆搴撳拰棰勭害鍑哄簱鐨勫簱浣嶏紝鏈夌殑璇濈洿鎺ヨ烦杩囪缁�
+ List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("group1", locMast1.getGroup1())
+ .in("loc_sts", "P", "Q", "R", "S"));
+ if (!Cools.isEmpty(locMasts2)) {
+ continue;
+ }
+ //5.鎵惧嚭鍚屼竴缁勭殑绌哄簱浣�
+ //6.瀵规繁娴呭簱浣嶈繘琛屾帓搴�
+ List<LocMast> locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("group1", locMast1.getGroup1())
+ .eq("loc_sts", "O")
+ .orderBy("locAttribute"));
+ if (Cools.isEmpty(locMasts1)) {
+ continue;
+ }
+ //7.鏌ョ湅
+ locMast = locMasts1.get(0);
+ }
+ }
+
+ }
+ //鍥�.娌℃湁鐩稿悓鐗╂枡锛岃繘琛屾甯告壘搴�
+ if (Cools.isEmpty(locMast)) {
+ //鏌ユ壘璇ュ眰鎵�鏈夌┖鐨�"loc_attribute",1
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("lev1", arr[d])
+ .eq("loc_sts", "O")
+ .eq("loc_type1", 1)
+ .eq("loc_attribute", 1)
+ .orderBy("row1", false)
+ .orderBy("bay1", false));
+ if (!Cools.isEmpty(locMastList)) {
+ locMast = locMastList.get(0);
+ }
+ }
+ //璇ュ眰娌℃湁鎵惧埌搴撲綅鏃惰繘鍏ラ�掑綊鎹㈠眰鎵惧簱浣�
+ if (Cools.isEmpty(locMast)) {
+ if (d > 6) {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ if (d == 6 && locType == 2) {
+ return getLocNo2(waitPakin, arr, 0, 1, locType1);
+ }
+ return getLocNo2(waitPakin, arr, d++, locType, locType1);
+ }
+ }
+ return locMast;
+ }
+
}
--
Gitblit v1.9.1