From d95eac3f8d10cd5b46bf6f39afa64f64646274f3 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期六, 08 十月 2022 19:17:59 +0800
Subject: [PATCH] #lsh
---
src/main/java/com/zy/common/service/CommonService.java | 136 ++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 86 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bf10229..ffb7743 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.entity.Parameter;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
@@ -112,74 +113,49 @@
int crn_qty = rowLastno.getCrnQty();
int rowCount = eRow - sRow + 1;
// 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
+ int crnNo = crn_qty;
// 鐩爣搴撲綅
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 (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;
+ switch (curRow){
+ case 2:
+ curRow = 4;
break;
- }
+ case 4:
+ curRow = 6;
+ break;
+ case 6:
+ curRow = 8;
+ break;
+ case 8:
+ curRow = 10;
+ break;
+ case 10:
+ curRow = 12;
+ break;
+ case 12:
+ curRow = 3;
+ break;
+ case 3:
+ curRow = 5;
+ break;
+ case 5:
+ curRow = 7;
+ break;
+ case 7:
+ curRow = 9;
+ break;
+ case 9:
+ curRow = 11;
+ break;
+ case 11:
+ curRow = 13;
+ break;
+ case 13:
+ curRow = 2;
+ break;
}
}
@@ -219,25 +195,18 @@
// }
// }
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;
-// }
-// }
+
+ Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
+ if (ruleId == 0){//榛樿瑙勫垯
+ locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
+ } else if (ruleId == 1){ //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
+ locMast = locMastService.queryFreeLocMast1(2, locTypeDto.getLocType1());
+ } else if (ruleId == 2){//鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
+ locMast = locMastService.queryFreeLocMast2(2, locTypeDto.getLocType1(), curRow);
+ } else {
+ locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
+ }
+
}
// }
@@ -249,11 +218,6 @@
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("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1