From f36b01fcf99f5ef0a1500d155c309ccbc7a20250 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 14:38:11 +0800
Subject: [PATCH] 高库位收到locType1=3调整
---
src/main/java/com/zy/asrs/utils/Utils.java | 210 ++++++++++++++++++++++++++++------------------------
1 files changed, 114 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a67ee58..91537d3 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -45,10 +45,10 @@
return (float) Arith.multiplys(2, f, 1);
}
- public static int armStaNo(int armNo,int staNo) {
- switch (armNo){
+ public static int armStaNo(int armNo, int staNo) {
+ switch (armNo) {
case 1:
- switch (staNo){
+ switch (staNo) {
case 0:
return 7;
case 1:
@@ -61,7 +61,7 @@
return 0;
}
case 2:
- switch (staNo){
+ switch (staNo) {
case 0:
return 5;
case 1:
@@ -74,7 +74,7 @@
return 0;
}
case 3:
- switch (staNo){
+ switch (staNo) {
case 0:
return 3;
case 1:
@@ -87,7 +87,7 @@
return 0;
}
case 4:
- switch (staNo){
+ switch (staNo) {
case 0:
return 1;
case 1:
@@ -100,7 +100,7 @@
return 0;
}
case 5:
- switch (staNo){
+ switch (staNo) {
case 0:
return 11;
case 1:
@@ -113,7 +113,7 @@
return 0;
}
case 6:
- switch (staNo){
+ switch (staNo) {
case 0:
return 13;
case 1:
@@ -149,17 +149,18 @@
* <p>澶勭悊瑙勫垯锛�
* 1. 鍏堟牴鎹叆搴撶珯鐐规煡璇㈡墍灞炲簱鍖恒��
* 2. 鍏堟彁鍙栬搴撳尯鍐呯殑鍫嗗灈鏈猴紝骞舵寜鍙敤绌哄簱浣嶈繃婊や笉鍙敤鍫嗗灈鏈恒��
- * 3. 鑻ュ綋鍓嶅簱鍖烘病鏈夋弧瓒虫潯浠剁殑绌哄簱浣嶏紝鍐嶈ˉ鍏呭叾浠栧簱鍖虹殑鍫嗗灈鏈恒��
- * 4. 褰� {@code locType1 = 1} 鏃讹紝鍏堣繑鍥炰綆搴撲綅鍫嗗灈鏈猴紝鍐嶆妸鍚屾壒鍫嗗灈鏈虹殑楂樺簱浣嶈拷鍔犲埌鍚庨潰銆�
- * 5. 瀵逛笉瀛樺湪銆佹晠闅溿�佷笉鍙叆浠ュ強鏃犵┖搴撲綅鐨勫爢鍨涙満鐩存帴鍓旈櫎銆�
- * 6. 褰撶墿鏂欎负 {@code emptyPallet} 鏃讹紝鎸夌┖鏉垮叆搴撲紭鍏堣鍒欓噸鏂版帓搴忋��
+ * 3. 褰� {@code locType1 = 1} 鏃讹紝鍏堣繑鍥炰綆搴撲綅鍫嗗灈鏈猴紝鍐嶆妸鍚屾壒鍫嗗灈鏈虹殑楂樺簱浣嶈拷鍔犲埌鍚庨潰銆�
+ * 4. 瀵逛笉瀛樺湪銆佹晠闅溿�佷笉鍙叆浠ュ強鏃犵┖搴撲綅鐨勫爢鍨涙満鐩存帴鍓旈櫎銆�
+ *
+ * <p>杩欓噷鏄彧璇绘帓搴忓伐鍏凤紝涓嶅啀鍐欏洖 {@code asr_row_lastno.crn_qty}銆�
+ * {@code crn_qty} 鍦ㄤ富鏁版嵁閲岃〃绀衡�滃爢鍨涙満鏁伴噺鈥濓紝涓嶈兘鍐嶈鎷挎潵褰撹疆璇㈡父鏍囷紝鍚﹀垯浼氭妸鏁翠粨閰嶇疆鍐欏潖銆�
*
* <p>杩斿洖缁撴灉涓殑姣忎竴椤规牸寮忎负锛�
* {@code {crnNo: 鍫嗗灈鏈哄彿, locType1: 搴撲綅楂樹綆绫诲瀷}}
*
* @param stationId 鍏ュ簱绔欑偣
- * @param locType1 鐩爣搴撲綅楂樹綆绫诲瀷锛�1=浣庡簱浣嶏紝2=楂樺簱浣�
- * @param matnr 鐗╂枡缂栫爜锛屼紶鍏� {@code emptyPallet} 鏃朵娇鐢ㄧ┖鏉挎帓搴忚鍒�
+ * @param locType1 鐩爣搴撲綅楂樹綆绫诲瀷锛�1=浣庡簱浣嶏紝2=楂樺簱浣�
+ * @param matnr 鐗╂枡缂栫爜锛屼紶鍏� {@code emptyPallet} 鏃朵娇鐢ㄧ┖鏉挎帓搴忚鍒�
* @return 鎸変紭鍏堢骇鎺掑ソ搴忕殑鍫嗗灈鏈哄垪琛�
*/
public static List<Map<String, Integer>> getStationStorageAreaName(Integer stationId, Integer locType1, String matnr) {
@@ -183,35 +184,30 @@
// 鍏堝彇褰撳墠搴撳尯瀵瑰簲鐨勫爢鍨涙満銆�
List<Integer> preferredCrnNos = getAreaCrnNos(storageArea, rowLastno);
List<Integer> preferredAvailableCrnNos = getAvailableCrnNos(preferredCrnNos, locType1, emptyPallet, basCrnpService, locMastService);
- appendCrnLocTypeEntries(result, preferredAvailableCrnNos, locType1, locMastService);
+ appendCrnLocTypeEntries(result, preferredAvailableCrnNos, locType1, emptyPallet, locMastService);
- // 褰撳墠搴撳尯娌℃湁鍙敤瀹归噺鏃讹紝鍐嶈ˉ鍏呭叾浠栧簱鍖哄爢鍨涙満銆�
- if (!hasAvailableCapacity(preferredCrnNos, locType1, basCrnpService, locMastService)) {
- List<Integer> otherAreaCrnNos = getOtherAreaCrnNos(storageArea, rowLastno);
- List<Integer> otherAvailableCrnNos = getAvailableCrnNos(otherAreaCrnNos, locType1, emptyPallet, basCrnpService, locMastService);
- appendCrnLocTypeEntries(result, otherAvailableCrnNos, locType1, locMastService);
- }
return result;
}
- private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Integer locType1, LocMastService locMastService) {
+
+ private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Integer locType1, boolean emptyPallet, LocMastService locMastService) {
Short normalizedLocType1 = normalizeLocType1(locType1);
if (normalizedLocType1 == null) {
- appendCrnLocTypeEntries(result, crnNos, (short) 1, locMastService);
- appendCrnLocTypeEntries(result, crnNos, (short) 2, locMastService);
+ appendCrnLocTypeEntries(result, crnNos, (short) 1, emptyPallet, locMastService);
+ appendCrnLocTypeEntries(result, crnNos, (short) 2, emptyPallet, locMastService);
return;
}
- appendCrnLocTypeEntries(result, crnNos, normalizedLocType1, locMastService);
+ appendCrnLocTypeEntries(result, crnNos, normalizedLocType1, emptyPallet, locMastService);
if (normalizedLocType1 == 1) {
- appendCrnLocTypeEntries(result, crnNos, (short) 2, locMastService);
+ appendCrnLocTypeEntries(result, crnNos, (short) 2, emptyPallet, locMastService);
}
}
- private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Short targetLocType1, LocMastService locMastService) {
+ private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Short targetLocType1, boolean emptyPallet, LocMastService locMastService) {
if (targetLocType1 == null || Cools.isEmpty(crnNos)) {
return;
}
for (Integer crnNo : crnNos) {
- if (!hasAvailableLoc(crnNo, targetLocType1, locMastService) || containsCrnLocType(result, crnNo, targetLocType1)) {
+ if (!hasAvailableLoc(crnNo, targetLocType1, emptyPallet, locMastService) || containsCrnLocType(result, crnNo, targetLocType1)) {
continue;
}
Map<String, Integer> item = new LinkedHashMap<>();
@@ -238,7 +234,7 @@
}
private static List<Integer> getAvailableCrnNos(List<Integer> candidateCrnNos, Integer locType1, boolean emptyPallet,
- BasCrnpService basCrnpService, LocMastService locMastService) {
+ BasCrnpService basCrnpService, LocMastService locMastService) {
LinkedHashSet<Integer> availableCrnNos = new LinkedHashSet<>();
if (Cools.isEmpty(candidateCrnNos)) {
return new ArrayList<>();
@@ -247,7 +243,7 @@
if (crnNo == null || !basCrnpService.checkSiteError(crnNo, true)) {
continue;
}
- if (!hasAvailableLocForRequest(crnNo, locType1, locMastService)) {
+ if (!hasAvailableLocForRequest(crnNo, locType1, emptyPallet, locMastService)) {
continue;
}
availableCrnNos.add(crnNo);
@@ -272,30 +268,37 @@
return "Y".equalsIgnoreCase(basCrnp.getEmpIn()) ? 1 : 0;
}
- private static boolean hasAvailableLocForRequest(Integer crnNo, Integer locType1, LocMastService locMastService) {
+ private static boolean hasAvailableLocForRequest(Integer crnNo, Integer locType1, boolean emptyPallet, LocMastService locMastService) {
Short normalizedLocType1 = normalizeLocType1(locType1);
if (normalizedLocType1 == null) {
- return hasAvailableLoc(crnNo, (short) 1, locMastService) || hasAvailableLoc(crnNo, (short) 2, locMastService);
+ return hasAvailableLoc(crnNo, (short) 1, emptyPallet, locMastService)
+ || hasAvailableLoc(crnNo, (short) 2, emptyPallet, locMastService);
}
- if (hasAvailableLoc(crnNo, normalizedLocType1, locMastService)) {
+ if (hasAvailableLoc(crnNo, normalizedLocType1, emptyPallet, locMastService)) {
return true;
}
- return normalizedLocType1 == 1 && hasAvailableLoc(crnNo, (short) 2, locMastService);
+ return normalizedLocType1 == 1 && hasAvailableLoc(crnNo, (short) 2, emptyPallet, locMastService);
}
- private static boolean hasAvailableLoc(Integer crnNo, Short locType1, LocMastService locMastService) {
+ private static boolean hasAvailableLoc(Integer crnNo, Short locType1, boolean emptyPallet, LocMastService locMastService) {
if (crnNo == null || locType1 == null) {
return false;
}
- return locMastService.selectCount(new EntityWrapper<LocMast>()
- .eq("crn_no", crnNo)
- .eq("loc_sts", "O")
- .eq("loc_type1", locType1)) > 0;
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<LocMast>();
+ wrapper.eq("crn_no", crnNo);
+ wrapper.eq("loc_sts", "O");
+ wrapper.eq("loc_type1", locType1);
+ if (!emptyPallet) {
+ wrapper.ne("loc_type2", 1);
+ }
+ return locMastService.selectCount(wrapper) > 0;
}
private static Short normalizeLocType1(Integer locType1) {
if (locType1 == null || (locType1 != 1 && locType1 != 2)) {
return null;
+ } else {
+ locType1 = 2;
}
return locType1.shortValue();
}
@@ -321,21 +324,10 @@
if (areaRowLastno == null) {
return new ArrayList<>(crnNos);
}
- Integer startCrnNo = resolveAreaStartCrnNo(areaRowLastno, rowLastno);
- Integer endCrnNo = resolveAreaEndCrnNo(areaRowLastno, rowLastno);
- if (startCrnNo != null && endCrnNo != null && startCrnNo <= endCrnNo) {
- for (int crnNo = startCrnNo; crnNo <= endCrnNo; crnNo++) {
- addAreaCrnNo(crnNos, crnNo, 1, endCrnNo);
- }
- for (int crnNo = areaRowLastno.getsCrnNo(); crnNo <= startCrnNo; crnNo++) {
- addAreaCrnNo(crnNos, crnNo, 1, endCrnNo);
- }
- Integer nextCrnQty = startCrnNo + 1;
- if (areaRowLastno.geteCrnNo() != null && nextCrnQty > areaRowLastno.geteCrnNo()) {
- nextCrnQty = areaRowLastno.getsCrnNo() == null ? 1 : areaRowLastno.getsCrnNo();
- }
- areaRowLastno.setCrnQty(nextCrnQty);
- SpringUtils.getBean(RowLastnoService.class).updateById(areaRowLastno);
+ Integer startCrnNo = resolveAreaStartCrnNo(areaRowLastno);
+ List<Integer> orderedCrnNos = getOrderedCrnNos(areaRowLastno, startCrnNo);
+ if (!orderedCrnNos.isEmpty()) {
+ crnNos.addAll(orderedCrnNos);
}
if (crnNos.isEmpty()) {
@@ -349,11 +341,11 @@
return defaultRowLastno;
}
RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- List<RowLastno> typeMatched = rowLastnoService.selectList(new EntityWrapper<RowLastno>()
- .eq("type_id", area));
- if (!Cools.isEmpty(typeMatched)) {
- return typeMatched.get(0);
- }
+// List<RowLastno> typeMatched = rowLastnoService.selectList(new EntityWrapper<RowLastno>()
+// .eq("type_id", area));
+// if (!Cools.isEmpty(typeMatched)) {
+// return typeMatched.get(0);
+// }
List<RowLastno> whsMatched = rowLastnoService.selectList(new EntityWrapper<RowLastno>()
.eq("whs_type", area));
if (!Cools.isEmpty(whsMatched)) {
@@ -362,34 +354,47 @@
return defaultRowLastno;
}
- private static Integer resolveAreaStartCrnNo(RowLastno areaRowLastno, RowLastno defaultRowLastno) {
- if (areaRowLastno != null && areaRowLastno.getCrnQty() != null && areaRowLastno.getCrnQty() > 0) {
- return areaRowLastno.getCrnQty();
+ private static Integer resolveAreaStartCrnNo(RowLastno areaRowLastno) {
+ if (areaRowLastno == null) {
+ return null;
}
- if (areaRowLastno != null && areaRowLastno.getsCrnNo() != null && areaRowLastno.getsCrnNo() > 0) {
- return areaRowLastno.getsCrnNo();
+ Integer startCrnNo = areaRowLastno.getsCrnNo();
+ Integer endCrnNo = areaRowLastno.geteCrnNo();
+ Integer currentRow = areaRowLastno.getCurrentRow();
+ Integer rowSpan = getCrnRowSpan(areaRowLastno.getTypeId());
+ if (startCrnNo == null || startCrnNo <= 0) {
+ return 1;
}
- if (defaultRowLastno != null && defaultRowLastno.getsCrnNo() != null && defaultRowLastno.getsCrnNo() > 0) {
- return defaultRowLastno.getsCrnNo();
+ if (endCrnNo == null || endCrnNo < startCrnNo || currentRow == null || rowSpan == null || rowSpan <= 0) {
+ return startCrnNo;
}
- return 1;
+ int startRow = areaRowLastno.getsRow() == null ? 1 : areaRowLastno.getsRow();
+ int offset = Math.max(currentRow - startRow, 0) / rowSpan;
+ int resolvedCrnNo = startCrnNo + offset;
+ if (resolvedCrnNo < startCrnNo || resolvedCrnNo > endCrnNo) {
+ return startCrnNo;
+ }
+ return resolvedCrnNo;
}
- private static Integer resolveAreaEndCrnNo(RowLastno areaRowLastno, RowLastno defaultRowLastno) {
- if (areaRowLastno != null && areaRowLastno.geteCrnNo() != null && areaRowLastno.geteCrnNo() > 0) {
- return areaRowLastno.geteCrnNo();
+ private static List<Integer> getOrderedCrnNos(RowLastno rowLastno, Integer startCrnNo) {
+ List<Integer> orderedCrnNos = new ArrayList<>();
+ if (rowLastno == null) {
+ return orderedCrnNos;
}
- return null;
- }
-
- private static void addAreaCrnNo(LinkedHashSet<Integer> crnNos, Integer crnNo, Integer startCrnNo, Integer endCrnNo) {
- if (crnNos == null || crnNo == null || startCrnNo == null || endCrnNo == null) {
- return;
+ int start = rowLastno.getsCrnNo() == null ? 1 : rowLastno.getsCrnNo();
+ int end = rowLastno.geteCrnNo() == null ? start + ((rowLastno.getCrnQty() == null ? 1 : rowLastno.getCrnQty()) - 1) : rowLastno.geteCrnNo();
+ int first = startCrnNo == null ? start : startCrnNo;
+ if (first < start || first > end) {
+ first = start;
}
- if (crnNo < startCrnNo || crnNo > endCrnNo) {
- return;
+ for (int crnNo = first; crnNo <= end; crnNo++) {
+ orderedCrnNos.add(crnNo);
}
- crnNos.add(crnNo);
+ for (int crnNo = start; crnNo < first; crnNo++) {
+ orderedCrnNos.add(crnNo);
+ }
+ return orderedCrnNos;
}
private static List<Integer> getAllCrnNos(RowLastno rowLastno) {
@@ -540,6 +545,7 @@
return null;
}
}
+
private static Integer parseStorageArea(String area) {
if (Cools.isEmpty(area)) {
return null;
@@ -565,6 +571,7 @@
}
return null;
}
+
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
return msg;
@@ -679,8 +686,8 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);
- boolean deepLocRight = isDeepLocRight(slaveProperties, row+1);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row - 1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, row + 1);
int targetRow;
if (deepLocLeft) {
targetRow = row - 1;
@@ -709,8 +716,8 @@
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);
- boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow+1);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow - 1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow + 1);
int targetRow;
if (deepLocLeft) {
targetRow = shallowRow - 1;
@@ -868,13 +875,13 @@
if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - (sRow-1)) % 4 == 0) {
+ if ((curRow - (sRow - 1)) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - (sRow-1)) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - (sRow - 1)) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - (sRow-1)-1) % 4 == 0) {
+ } else if ((curRow - (sRow - 1) - 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - (sRow-1)-1) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - (sRow - 1) - 1) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
@@ -1042,6 +1049,7 @@
return necessaryParameters;
}
+
//鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -1051,7 +1059,7 @@
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
- switch (curRow){
+ switch (curRow) {
case 1:
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
@@ -1097,7 +1105,7 @@
Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(rowLastno.geteRow())){
+ if (curRow.equals(rowLastno.geteRow())) {
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
@@ -1172,16 +1180,25 @@
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
public static List<String> getGroupOutLocCrn(Integer curRow, Integer nearRow, String locNo, boolean pakin) {
List<String> result = new ArrayList<>();
- if (pakin){
- for (int row = curRow;row>=nearRow;row--){
+ if (pakin) {
+ for (int row = curRow; row >= nearRow; row--) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
- }else {
- for (int row = curRow;row<=nearRow;row++){
+ } else {
+ for (int row = curRow; row <= nearRow; row++) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
}
return result;
+ }
+
+ //erp搴綅杞夋彌
+ public static String ERPLocToWMSLoc(String locNo) {
+ String WmsLoc = locNo.substring(1);
+ String[] split = locNo.split("-");
+ WmsLoc = split[0].substring(1) + split[1] + split[2];
+
+ return WmsLoc;
}
//灏唚ms搴撲綅鍙疯浆鎹㈡垚wcs搴撲綅鍙�
@@ -1191,7 +1208,7 @@
for (char c : row.toCharArray()) {
if (c == '0') {
i++;
- }else {
+ } else {
break;
}
}
@@ -1201,7 +1218,7 @@
for (char c : boy.toCharArray()) {
if (c == '0') {
j++;
- }else {
+ } else {
break;
}
}
@@ -1211,13 +1228,14 @@
for (char c : lev.toCharArray()) {
if (c == '0') {
k++;
- }else {
+ } else {
break;
}
}
lev = lev.substring(k);
return row + "-" + boy + "-" + lev;
}
+
}
--
Gitblit v1.9.1