From 307ba2fc4f1b7c09111f6ff8fd7fa13a0b9b4a46 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 13:45:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 5
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 17 -
src/main/java/com/zy/asrs/utils/Utils.java | 478 +++++++++++++++++++++---------------------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 125 -----------
src/main/java/com/zy/asrs/controller/OutController.java | 1
src/main/java/com/zy/asrs/entity/LocMast.java | 2
src/main/java/com/zy/asrs/service/LocMastService.java | 3
src/main/java/com/zy/common/service/CommonService.java | 24 +
8 files changed, 256 insertions(+), 399 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 74f9ee9..9317ec6 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -169,7 +169,6 @@
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
workService.stockOut(staNo, taskDto, getUserId());
- locMastService.breakUp(taskDto.getLocNo(), excludeLocNos);
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 04c0b3d..4648d05 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -98,7 +98,7 @@
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value= "搴撲綅绫诲瀷{1:娣锋斁,2:鍗曞搧}")
@TableField("loc_type3")
private Short locType3;
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 346571f..caf4dc8 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -48,9 +48,6 @@
// 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢�
LocMast findOutMost(String locNo);
- // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
- void breakUp(String locNo, List<String> excludeLocNos);
-
// 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮�
Integer getOutCrnNo(LocMast locMast);
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 1c30ffb..6551134 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -84,9 +84,4 @@
*/
String dealPreHaveStart(Integer wrkNo, Long userId);
- /**
- * 绌挎搴撶Щ杞�
- */
- void shuttleTransfer(List<String> locNos);
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 8c4fc7e..a17dc7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -119,23 +119,6 @@
}
@Override
- public synchronized void breakUp(String locNo, List<String> excludeLocNos) {
- List<String> groupLoc = Utils.getGroupOuterLoc(locNo);
- Iterator<String> iterator = groupLoc.iterator();
- while (iterator.hasNext()) {
- String next = iterator.next();
- LocMast locMast = this.selectById(next);
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
- if (!excludeLocNos.contains(locMast.getLocNo())) {
- continue;
- }
- }
- iterator.remove();
- }
- workService.shuttleTransfer(groupLoc);
- }
-
- @Override
public Integer getOutCrnNo(LocMast locMast) {
return 1;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 6a84d5b..ced2c4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -359,7 +359,6 @@
} else {
throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
- locMastService.breakUp(dto.getLocNo(), excludeLocNos);
}
}
@@ -1088,130 +1087,6 @@
throw new CoolException("鍔熻兘鍋滅敤");
}
return "";
- }
-
- @Override
- @Transactional
- public void shuttleTransfer(List<String> locNos) {
- if (Cools.isEmpty(locNos)) {
- return;
- }
- if (true && !Cools.isEmpty(locNos)) {
- throw new CoolException("鏆備笉鏀寔绉诲簱浠诲姟"); // todo:luxiaotao 绉诲簱寮�鍏�
- }
- LocMast one = locMastService.selectById(locNos.get(0));
- List<Integer> rows = Utils.getGroupLoc(Integer.parseInt(locNos.get(0).substring(0, 2)));
- List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), one.getLocType1());
- if (Cools.isEmpty(locMasts)) {
- throw new CoolException("搴撲綅绉昏浆澶辫触锛屽凡鏃犵┖搴撲綅");
- }
- // 鍏ュ簱鎺掑簭 娣卞簱浣� ==> 娴呭簱浣�
- switch (locMasts.get(0).getRow1()) {
- case 4:
- case 5:
- case 6:
- case 7:
- case 12:
- case 13:
- case 14:
- case 19:
- case 20:
- case 21:
- Collections.reverse(locMasts);
- break;
- default:
- break;
- }
- if (locNos.size() > locMasts.size()) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇�");
- }
- Date now = new Date();
- // 鐢熸垚绉诲簱宸ヤ綔妗�
- Iterator<LocMast> iterator = locMasts.iterator();
- for (String sourceLocNo : locNos) {
-
- while (iterator.hasNext()) {
- LocMast sourceLoc = locMastService.selectById(sourceLocNo);
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
- if (Cools.isEmpty(sourceLoc)){
- throw new CoolException("鏈壘鍒板簱浣�");
- }
- LocMast loc = iterator.next();
- if (Cools.isEmpty(loc)){
- throw new CoolException("鏈壘鍒板簱浣�");
- }
- if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
-// throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�"); todo:luxiaotao
- }
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(15D);
- wrkMast.setOutMost(locMastService.isOutMost(loc.getLocNo(), false)?1:0);;
- wrkMast.setCrnNo(sourceLoc.getCrnNo());
- wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
- wrkMast.setLocNo(loc.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
- wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setAppeUser(9527L);
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(9527L);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- for (LocDetl locDetl : locDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(locDetl);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- wrkDetl.setAnfme(locDetl.getAnfme());
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(9527L);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(9527L);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
- sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
- sourceLoc.setModiUser(9527L);
- sourceLoc.setModiTime(now);
- if (!locMastService.updateById(sourceLoc)){
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
- }
- } else {
- throw new CoolException(sourceLoc.getLocNo() + "婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
- }
- // 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(now);
- loc.setModiUser(9527L);
- if (!locMastService.updateById(loc)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
- }
-
- iterator.remove();
- break;
- }
- }
}
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 078066f..4557c58 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -177,30 +177,28 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- /**
- * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
- */
- public static void toDeepIfEmptyByShallow(String shallowLoc) {
- int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, 4);
- int targetRow = 0;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
- String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-
- }
-
public static String getLocNo(Number row, Number bay, Number lev) {
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
+ public static Integer getOutLayerRow(String locNo, Boolean pakin){
+ int row = getRow(locNo);
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 4;
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 5;
+ } else {
+ return -1;
+ }
+ }
+
+ /**
+ * 鑾峰彇搴撲綅缁�
+ * @param locNo 搴撲綅鍙�
+ */
public static List<String> getGroupLoc(String locNo){
int row = getRow(locNo);
+ int bay = getBay(locNo);
if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
List<String> result = new ArrayList<>();
for (Integer row0 : CommonService.FIRST_GROUP_ROW_LIST) {
@@ -215,13 +213,6 @@
}
return result;
}
- if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
- List<String> result = new ArrayList<>();
- for (Integer row0 : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
- result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
- }
- return result;
- }
if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
List<String> result = new ArrayList<>();
for (Integer row0 : CommonService.THIRD_GROUP_ROW_LIST) {
@@ -229,238 +220,243 @@
}
return result;
}
+ if (CommonService.FOURTH_GROUP_ROW_LIST.contains(row)) {
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.FOURTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ return result;
+ }
+ if (CommonService.FIFTH_GROUP_ROW_LIST.contains(row)) {
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.FIFTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ return result;
+ }
+ if (CommonService.SIXTH_GROUP_ROW_LIST.contains(row) && (bay >= 59 && bay <= 61)) {
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.SIXTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ return result;
+ }
+ if (CommonService.SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.SEVENTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ return result;
+ }
+ if (CommonService.EIGHTH_GROUP_ROW_LIST.contains(row) && bay < 59) {
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.EIGHTH_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ return result;
+ }
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
-
- public static Integer getOutLayerRow(String locNo, Boolean pakin){
- int row = getRow(locNo);
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 4;
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 5;
- } else {
- return -1;
- }
+ public static void main(String[] args) {
+ System.out.println(JSON.toJSONString(getGroupInnerLoc("1605909")));
}
-
- public static List<Integer> getGroupLoc(Integer row){
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return CommonService.FIRST_GROUP_ROW_LIST;
- } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
- return CommonService.FIRST_GROUP_ROW_LIST_SHORT;
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return CommonService.SECOND_GROUP_ROW_LIST;
- } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
- return CommonService.THIRD_GROUP_ROW_LIST;
- } else {
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- }
-
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜
+ /**
+ * 鑾峰彇澶栦晶鏂瑰悜鐨勫簱浣嶇粍
+ * @param locNo 搴撲綅鍙�
+ * @return
+ */
public static List<String> getGroupOuterLoc(String locNo){
int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
- List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
- Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
- List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
- for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
+ int bay = getBay(locNo);
+
+ //(1,3,4,10,11)娌℃湁澶栦晶鏂瑰悜搴撲綅缁�,(13,14,16)59鍒椾箣鍐呮病鏈夊渚ф柟鍚戝簱浣嶇粍
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {//1鎺�
+ return new ArrayList<>();
}
- return result;
+ if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {//3-4鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {//6-7鎺�
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.THIRD_GROUP_ROW_LIST) {
+ if (row0 < row) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ }
+ return result;
+ }
+ if (CommonService.FOURTH_GROUP_ROW_LIST.contains(row)) {//8鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.FIFTH_GROUP_ROW_LIST.contains(row)) {//10-11鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.SIXTH_GROUP_ROW_LIST.contains(row) && (bay >= 59 && bay <= 61)) {//13-16鎺�59-61鍒楀渚ф柟鍚戝簱浣嶇粍
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.SIXTH_GROUP_ROW_LIST) {
+ if (row0 < row) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ }
+ return result;
+ }
+ if (CommonService.SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {//13-14鎺�59鍒椾箣鍐呮病鏈夊渚ф柟鍚戝簱浣嶇粍
+ return new ArrayList<>();
+ }
+ if (CommonService.EIGHTH_GROUP_ROW_LIST.contains(row) && bay < 59) {//16鎺�59鍒椾箣鍐呮病鏈夊渚ф柟鍚戝簱浣嶇粍
+ return new ArrayList<>();
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ /**
+ * 鑾峰彇鍐呬晶鏂瑰悜鐨勫簱浣嶇粍
+ * @param locNo 搴撲綅鍙�
+ * @return
+ */
+ public static List<String> getGroupInnerLoc(String locNo){
+ int row = getRow(locNo);
+ int bay = getBay(locNo);
+
+ //(1,3,4,10,11)娌℃湁鍐呬晶鏂瑰悜搴撲綅缁�,(13,14,16)59鍒椾箣鍐呮病鏈夊唴渚ф柟鍚戝簱浣嶇粍
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {//1鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {//3-4鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {//6-7鎺�
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.THIRD_GROUP_ROW_LIST) {
+ if (row0 > row) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ }
+ return result;
+ }
+ if (CommonService.FOURTH_GROUP_ROW_LIST.contains(row)) {//8鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.FIFTH_GROUP_ROW_LIST.contains(row)) {//10-11鎺�
+ return new ArrayList<>();
+ }
+ if (CommonService.SIXTH_GROUP_ROW_LIST.contains(row) && (bay >= 59 && bay <= 61)) {//13-16鎺�59-61鍒楀唴渚ф柟鍚戝簱浣嶇粍
+ List<String> result = new ArrayList<>();
+ for (Integer row0 : CommonService.SIXTH_GROUP_ROW_LIST) {
+ if (row0 > row) {
+ result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+ }
+ }
+ return result;
+ }
+ if (CommonService.SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {//13-14鎺�59鍒椾箣鍐呮病鏈夊唴渚ф柟鍚戝簱浣嶇粍
+ return new ArrayList<>();
+ }
+ if (CommonService.EIGHTH_GROUP_ROW_LIST.contains(row) && bay < 59) {//16鎺�59鍒椾箣鍐呮病鏈夊唴渚ф柟鍚戝簱浣嶇粍
+ return new ArrayList<>();
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜
public static List<String> getGroupOuterLocIoPri(String locNo){
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
- for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
- for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
- List<Integer> clone = Arrays.asList(new Integer[CommonService.THIRD_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.THIRD_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- }
- return result;
- }
-
- public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupOuterLoc("0200101")));
+// int row = getRow(locNo);
+// List<String> result = new ArrayList<>();
+// if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+// for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
+// if (integer < row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
+// for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
+// if (integer < row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
+// for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
+// if (integer < row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
+// List<Integer> clone = Arrays.asList(new Integer[CommonService.THIRD_GROUP_ROW_LIST.size()]);
+// Collections.copy(clone, CommonService.THIRD_GROUP_ROW_LIST);
+// Collections.reverse(clone);
+// for (Integer integer : clone) {
+// if (integer > row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// }
+// return result;
+ return null;
}
// 鍐呬晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
public static List<String> getGroupInsideLoc(String locNo){
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
- Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else {
-// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- if (!Cools.isEmpty(result)) {
- Collections.reverse(result);
- }
- return result;
- }
-
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutsideLoc(String locNo){
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
- for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
- if (integer < row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
- Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
- Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
- Collections.reverse(clone);
- for (Integer integer : clone) {
- if (integer > row) {
- result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
- } else {
- break;
- }
- }
- } else {
-// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
- if (!Cools.isEmpty(result)) {
- Collections.reverse(result);
- }
- return result;
+// int row = getRow(locNo);
+// List<String> result = new ArrayList<>();
+// if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+// List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
+// Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
+// Collections.reverse(clone);
+// for (Integer integer : clone) {
+// if (integer > row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
+// List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
+// Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
+// Collections.reverse(clone);
+// for (Integer integer : clone) {
+// if (integer > row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+// List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
+// Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
+// Collections.reverse(clone);
+// for (Integer integer : clone) {
+// if (integer > row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
+// for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
+// if (integer < row) {
+// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+// } else {
+// break;
+// }
+// }
+// } else {
+//// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+// }
+// if (!Cools.isEmpty(result)) {
+// Collections.reverse(result);
+// }
+// return result;
+ return null;
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ed76694..af0d55d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -28,16 +28,28 @@
public class CommonService {
public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
- }};
- public static final List<Integer> FIRST_GROUP_ROW_LIST_SHORT = new ArrayList<Integer>() {{
- add(8);add(9);add(10);
+ add(1);
}};
public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(12);add(13);add(14);add(15);add(16);add(17);add(18);
+ add(3);add(4);
}};
public static final List<Integer> THIRD_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(20);add(21);add(22);add(23);
+ add(6);add(7);
+ }};
+ public static final List<Integer> FOURTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(8);
+ }};
+ public static final List<Integer> FIFTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(10);add(11);
+ }};
+ public static final List<Integer> SIXTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(13);add(14);add(15);add(16);
+ }};
+ public static final List<Integer> SEVENTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(13);add(14);
+ }};
+ public static final List<Integer> EIGHTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(16);
}};
--
Gitblit v1.9.1