From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案， 如何实现，对现有找库位规则进行整改，数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位，离线设备不分配 3、库位分配要均衡到每一个设备 4、库位高度需要匹配到对应库位信息，低库位能向上兼容 5、空托盘优先放在locType2库位=1的库位，没有这种库位了，允许放到其他库位 6、给入库站点设置有限去那些堆垛机，其次去那些堆垛机，弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置，当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频，如果是高频则从前往后找库位，如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用
---
src/main/java/com/zy/asrs/utils/Utils.java | 318 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 222 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 6e13c42..a95300b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -29,6 +29,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Locale;
/**
@@ -45,10 +46,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 +62,7 @@
return 0;
}
case 2:
- switch (staNo){
+ switch (staNo) {
case 0:
return 5;
case 1:
@@ -74,7 +75,7 @@
return 0;
}
case 3:
- switch (staNo){
+ switch (staNo) {
case 0:
return 3;
case 1:
@@ -87,7 +88,7 @@
return 0;
}
case 4:
- switch (staNo){
+ switch (staNo) {
case 0:
return 1;
case 1:
@@ -100,7 +101,7 @@
return 0;
}
case 5:
- switch (staNo){
+ switch (staNo) {
case 0:
return 11;
case 1:
@@ -113,7 +114,7 @@
return 0;
}
case 6:
- switch (staNo){
+ switch (staNo) {
case 0:
return 13;
case 1:
@@ -131,104 +132,220 @@
}
- public static Integer getStationStorageArea(Integer stationId) {
+ public static List<Integer> getStationStorageAreas(Integer stationId) {
if (stationId == null || stationId <= 0) {
- return null;
+ return new ArrayList<>();
}
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
BasDevp station = basDevpService.selectById(stationId);
if (station == null) {
+ return new ArrayList<>();
+ }
+ return parseStorageAreas(station.getArea());
+ }
+
+ public static Integer getStationStorageArea(Integer stationId) {
+ List<Integer> storageAreas = getStationStorageAreas(stationId);
+ if (Cools.isEmpty(storageAreas)) {
return null;
}
- return parseStorageArea(station.getArea());
+ return storageAreas.get(0);
}
/**
* 鐢熸垚鍏ュ簱鎵惧簱浣嶆椂鐨勫爢鍨涙満浼樺厛椤哄簭銆�
*
- * <p>澶勭悊瑙勫垯锛�
- * 1. 鍏堟牴鎹叆搴撶珯鐐规煡璇㈡墍灞炲簱鍖恒��
- * 2. 鍏堟彁鍙栬搴撳尯鍐呯殑鍫嗗灈鏈猴紝骞舵寜鍙敤绌哄簱浣嶈繃婊や笉鍙敤鍫嗗灈鏈恒��
- * 3. 鑻ュ綋鍓嶅簱鍖烘病鏈夋弧瓒虫潯浠剁殑绌哄簱浣嶏紝鍐嶈ˉ鍏呭叾浠栧簱鍖虹殑鍫嗗灈鏈恒��
- * 4. 褰� {@code locType1 = 1} 鏃讹紝鍏堣繑鍥炰綆搴撲綅鍫嗗灈鏈猴紝鍐嶆妸鍚屾壒鍫嗗灈鏈虹殑楂樺簱浣嶈拷鍔犲埌鍚庨潰銆�
- * 5. 瀵逛笉瀛樺湪銆佹晠闅溿�佷笉鍙叆浠ュ強鏃犵┖搴撲綅鐨勫爢鍨涙満鐩存帴鍓旈櫎銆�
- *
- * <p>杩欓噷鏄彧璇绘帓搴忓伐鍏凤紝涓嶅啀鍐欏洖 {@code asr_row_lastno.crn_qty}銆�
- * {@code crn_qty} 鍦ㄤ富鏁版嵁閲岃〃绀衡�滃爢鍨涙満鏁伴噺鈥濓紝涓嶈兘鍐嶈鎷挎潵褰撹疆璇㈡父鏍囷紝鍚﹀垯浼氭妸鏁翠粨閰嶇疆鍐欏潖銆�
+ * <p>褰撳墠璇箟宸茬粡鍒囨崲涓衡�滅珯鐐圭涓�浼樺厛姹� + 绗簩浼樺厛姹犫�濈殑閰嶇疆棰勮锛�
+ * 涓嶅啀娌跨敤鏃х殑 area 椤哄簭銆�
*
* <p>杩斿洖缁撴灉涓殑姣忎竴椤规牸寮忎负锛�
- * {@code {crnNo: 鍫嗗灈鏈哄彿, locType1: 搴撲綅楂樹綆绫诲瀷}}
+ * {@code {pool: 浼樺厛姹犵紪鍙�, seq: 姹犲唴椤哄簭, crnNo: 鍫嗗灈鏈哄彿}}
*
* @param stationId 鍏ュ簱绔欑偣
- * @param locType1 鐩爣搴撲綅楂樹綆绫诲瀷锛�1=浣庡簱浣嶏紝2=楂樺簱浣�
- * @param matnr 鐗╂枡缂栫爜锛屼紶鍏� {@code emptyPallet} 鏃朵娇鐢ㄧ┖鏉挎帓搴忚鍒�
- * @return 鎸変紭鍏堢骇鎺掑ソ搴忕殑鍫嗗灈鏈哄垪琛�
+ * @param locType1 淇濈暀鍏煎鍙傛暟锛屽綋鍓嶄笉鍙備笌鎺掑簭
+ * @param matnr 淇濈暀鍏煎鍙傛暟锛屽綋鍓嶄笉鍙備笌鎺掑簭
+ * @return 鎸変紭鍏堟睜椤哄簭鎺掑ソ鐨勫爢鍨涙満鍒楄〃
*/
public static List<Map<String, Integer>> getStationStorageAreaName(Integer stationId, Integer locType1, String matnr) {
List<Map<String, Integer>> result = new ArrayList<>();
- // 鍏堝畾浣嶅叆搴撶珯鐐规墍灞炲簱鍖恒��
- Integer storageArea = getStationStorageArea(stationId);
- Integer whsType = GetWhsType(stationId);
- if (storageArea == null || whsType == null || whsType <= 0) {
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ BasDevp station = basDevpService.selectById(stationId);
+ if (station == null) {
return result;
}
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (rowLastno == null) {
- return result;
- }
-
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
- boolean emptyPallet = "emptyPallet".equalsIgnoreCase(matnr);
-
- // 鍏堝彇褰撳墠搴撳尯瀵瑰簲鐨勫爢鍨涙満銆�
- List<Integer> preferredCrnNos = getAreaCrnNos(storageArea, rowLastno);
- List<Integer> preferredAvailableCrnNos = getAvailableCrnNos(preferredCrnNos, locType1, emptyPallet, basCrnpService, locMastService);
- appendCrnLocTypeEntries(result, preferredAvailableCrnNos, locType1, 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);
- }
+ appendCrnPoolEntries(result, 1, distinctCrnNos(station.getInFirstCrnCsv()));
+ appendCrnPoolEntries(result, 2, distinctCrnNos(station.getInSecondCrnCsv()));
return result;
}
- private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Integer locType1, LocMastService locMastService) {
- Short normalizedLocType1 = normalizeLocType1(locType1);
- if (normalizedLocType1 == null) {
- appendCrnLocTypeEntries(result, crnNos, (short) 1, locMastService);
- appendCrnLocTypeEntries(result, crnNos, (short) 2, locMastService);
+
+ public static List<Integer> parseCrnNos(String csv) {
+ List<Integer> crnNos = new ArrayList<>();
+ if (Cools.isEmpty(csv)) {
+ return crnNos;
+ }
+ String normalized = csv.replace("锛�", ",")
+ .replace("锛�", ",")
+ .replace("銆�", ",")
+ .replaceAll("\\s+", "");
+ if (normalized.isEmpty()) {
+ return crnNos;
+ }
+ for (String segment : normalized.split("[,;]")) {
+ if (segment == null || segment.isEmpty()) {
+ continue;
+ }
+ Integer crnNo = safeParseInt(segment);
+ if (crnNo == null || crnNo <= 0) {
+ throw new CoolException("鍫嗗灈鏈哄彿鏍煎紡閿欒锛�" + segment);
+ }
+ crnNos.add(crnNo);
+ }
+ return crnNos;
+ }
+
+ public static List<Integer> distinctCrnNos(String csv) {
+ return distinctCrnNos(parseCrnNos(csv));
+ }
+
+ public static List<Integer> distinctCrnNos(List<Integer> crnNos) {
+ List<Integer> result = new ArrayList<>();
+ if (Cools.isEmpty(crnNos)) {
+ return result;
+ }
+ LinkedHashSet<Integer> orderedCrnNos = new LinkedHashSet<>();
+ for (Integer crnNo : crnNos) {
+ if (crnNo == null || crnNo <= 0) {
+ continue;
+ }
+ orderedCrnNos.add(crnNo);
+ }
+ result.addAll(orderedCrnNos);
+ return result;
+ }
+
+ public static String normalizeCrnCsv(String csv) {
+ return normalizeCrnCsv(parseCrnNos(csv));
+ }
+
+ public static String normalizeCrnCsv(List<Integer> crnNos) {
+ return joinCrnNos(distinctCrnNos(crnNos));
+ }
+
+ public static String joinCrnNos(List<Integer> crnNos) {
+ if (Cools.isEmpty(crnNos)) {
+ return "";
+ }
+ StringBuilder builder = new StringBuilder();
+ for (Integer crnNo : crnNos) {
+ if (crnNo == null || crnNo <= 0) {
+ continue;
+ }
+ if (builder.length() > 0) {
+ builder.append(",");
+ }
+ builder.append(crnNo);
+ }
+ return builder.toString();
+ }
+
+ private static void appendCrnPoolEntries(List<Map<String, Integer>> result, int pool, List<Integer> crnNos) {
+ if (result == null || Cools.isEmpty(crnNos)) {
return;
}
- appendCrnLocTypeEntries(result, crnNos, normalizedLocType1, locMastService);
- if (normalizedLocType1 == 1) {
- appendCrnLocTypeEntries(result, crnNos, (short) 2, locMastService);
+ int seq = 1;
+ for (Integer crnNo : crnNos) {
+ if (crnNo == null || crnNo <= 0) {
+ continue;
+ }
+ Map<String, Integer> item = new LinkedHashMap<>();
+ item.put("pool", pool);
+ item.put("seq", seq++);
+ item.put("crnNo", crnNo);
+ result.add(item);
}
}
- private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Short targetLocType1, LocMastService locMastService) {
+ public static List<Integer> parseStorageAreas(String area) {
+ List<Integer> areas = new ArrayList<>();
+ if (Cools.isEmpty(area)) {
+ return areas;
+ }
+ LinkedHashSet<Integer> orderedAreas = new LinkedHashSet<>();
+ String normalized = area.replace("锛�", ",")
+ .replace("锛�", ";")
+ .replace("銆�", ",")
+ .replaceAll("\\s+", "");
+ if (normalized.isEmpty()) {
+ return areas;
+ }
+ for (String segment : normalized.split("[,;]")) {
+ if (segment == null || segment.isEmpty()) {
+ continue;
+ }
+ Integer areaNo = parseStorageArea(segment);
+ if (areaNo != null) {
+ orderedAreas.add(areaNo);
+ }
+ }
+ areas.addAll(orderedAreas);
+ return areas;
+ }
+
+ public static String formatStorageArea(Integer area) {
+ if (area == null) {
+ return "";
+ }
+ switch (area) {
+ case 1:
+ return "A搴撳尯";
+ case 2:
+ return "B搴撳尯";
+ case 3:
+ return "C搴撳尯";
+ default:
+ return String.valueOf(area);
+ }
+ }
+
+ private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Integer locType1,
+ boolean emptyPallet, LocMastService locMastService, Integer area) {
+ Short normalizedLocType1 = normalizeLocType1(locType1);
+ if (normalizedLocType1 == null) {
+ appendCrnLocTypeEntries(result, crnNos, (short) 1, emptyPallet, locMastService, area);
+ appendCrnLocTypeEntries(result, crnNos, (short) 2, emptyPallet, locMastService, area);
+ return;
+ }
+ appendCrnLocTypeEntries(result, crnNos, normalizedLocType1, emptyPallet, locMastService, area);
+ if (normalizedLocType1 == 1) {
+ appendCrnLocTypeEntries(result, crnNos, (short) 2, emptyPallet, locMastService, area);
+ }
+ }
+
+ private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Short targetLocType1,
+ boolean emptyPallet, LocMastService locMastService, Integer area) {
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, area, crnNo, targetLocType1)) {
continue;
}
Map<String, Integer> item = new LinkedHashMap<>();
+ item.put("area", area);
item.put("crnNo", crnNo);
item.put("locType1", targetLocType1.intValue());
result.add(item);
}
}
- private static boolean containsCrnLocType(List<Map<String, Integer>> result, Integer crnNo, Short locType1) {
+ private static boolean containsCrnLocType(List<Map<String, Integer>> result, Integer area, Integer crnNo, Short locType1) {
for (Map<String, Integer> item : result) {
if (item == null) {
continue;
}
- if (crnNo.equals(item.get("crnNo")) && locType1.intValue() == item.get("locType1")) {
+ if (crnNo.equals(item.get("crnNo"))
+ && locType1.intValue() == item.get("locType1")
+ && Objects.equals(area, item.get("area"))) {
return true;
}
}
@@ -240,7 +357,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<>();
@@ -249,7 +366,7 @@
if (crnNo == null || !basCrnpService.checkSiteError(crnNo, true)) {
continue;
}
- if (!hasAvailableLocForRequest(crnNo, locType1, locMastService)) {
+ if (!hasAvailableLocForRequest(crnNo, locType1, emptyPallet, locMastService)) {
continue;
}
availableCrnNos.add(crnNo);
@@ -274,25 +391,30 @@
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) {
@@ -340,11 +462,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)) {
@@ -544,6 +666,7 @@
return null;
}
}
+
private static Integer parseStorageArea(String area) {
if (Cools.isEmpty(area)) {
return null;
@@ -569,6 +692,7 @@
}
return null;
}
+
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
return msg;
@@ -683,8 +807,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;
@@ -713,8 +837,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;
@@ -872,13 +996,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);
@@ -1046,6 +1170,7 @@
return necessaryParameters;
}
+
//鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -1055,7 +1180,7 @@
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
- switch (curRow){
+ switch (curRow) {
case 1:
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
@@ -1101,7 +1226,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 鏈�娴呭簱浣嶆帓
@@ -1176,22 +1301,23 @@
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
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];
+ WmsLoc = split[0].substring(1) + split[1] + split[2];
return WmsLoc;
}
@@ -1203,7 +1329,7 @@
for (char c : row.toCharArray()) {
if (c == '0') {
i++;
- }else {
+ } else {
break;
}
}
@@ -1213,7 +1339,7 @@
for (char c : boy.toCharArray()) {
if (c == '0') {
j++;
- }else {
+ } else {
break;
}
}
@@ -1223,14 +1349,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