From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/utils/Utils.java | 264 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 168 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 90c58c9..2243f79 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,8 +3,8 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
import java.text.DecimalFormat;
import java.util.ArrayList;
@@ -19,31 +19,59 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static float scale(Float f){
+ public static float scale(Float f) {
if (f == null || f == 0f || Float.isNaN(f)) {
return 0f;
}
return (float) Arith.multiplys(2, f, 1);
}
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
return msg;
- } else if (msg.length() > count){
+ } else if (msg.length() > count) {
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for (int i = 0; i<count-msg.length(); i++){
- msgBuilder.insert(0,"0");
+ for (int i = 0; i < count - msg.length(); i++) {
+ msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
}
+ }
+ public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(1);add(2);
+ }};
+ public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(3);add(4);
+ }};
+ public static List<String> getGroupLocNo(String locNo, Boolean pakIn) {
+ int row = getRow(locNo);
+ List<String> result = new ArrayList<>();
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ for (Integer groupRow : FIRST_GROUP_ROW_LIST) {
+ result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
+ }
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
+ List<Integer> clone = Arrays.asList(new Integer[SECOND_GROUP_ROW_LIST.size()]);
+ Collections.copy(clone, SECOND_GROUP_ROW_LIST);
+ Collections.reverse(clone);
+ for (Integer integer : clone) {
+ result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
+ }
+ }
+
+ if (!pakIn) {
+ //鍑哄簱锛屽弽杞暟鎹�
+ Collections.reverse(result);
+ }
+ return result;
}
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return slaveProperties.getDoubleLocs().contains(row);
@@ -55,7 +83,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -66,7 +94,7 @@
/**
* 鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
*/
- public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocsLeft().contains(row);
} else {
@@ -78,7 +106,7 @@
/**
* 鍒ゆ柇鏄惁涓哄彸娣卞簱浣�
*/
- public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocsRight().contains(row);
} else {
@@ -89,7 +117,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return !slaveProperties.getDoubleLocs().contains(row);
@@ -101,7 +129,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return !slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -217,104 +245,148 @@
// slaveProperties.setGroupCount(4);
// Integer deepRow = getDeepRow(slaveProperties, 6);
// System.out.println(deepRow);
-//
// }
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutsideLocCrn(String locNo,boolean pakin){
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- result.add(locNo);
-
-// result.add(zerofill(String.valueOf(32), 2) + locNo.substring(2));
-
- return result;
- }
-
- public static boolean BooleanWhsTypeSta(Integer whsType){
- if (whsType==1){
+ public static boolean BooleanWhsTypeSta(Integer whsType) {
+ if (whsType == 1) {
return true;
}
return false;
}
- public static int RowCount(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[0];
+ public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
+ if (whsType == 1 && staDescId != 11 && staDescId != 111) {
+ return true;
+ }
+ return false;
}
- public static int getCurRow(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[1];
+
+ public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[0];
}
- public static int getCrnNo(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[2];
+
+ public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[1];
}
- public static int getNearRow(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[3];
+
+ public static int getCrnNo(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[2];
+ }
+
+ public static int getNearRow(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(Integer whsType,Integer curRow){
- int[] necessaryParameters=new int[]{0,0,0,0};
- if (BooleanWhsTypeSta(whsType)){
- necessaryParameters[0] = 6;
- switch (curRow){ //婊℃澘姝ｅ父鍏ュ簱
- case 24:
- necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 21:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- default:
- curRow=curRow+4;
- if (curRow<1 || curRow>24){
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
- if ((curRow-1)%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow+3)/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- }else if (curRow%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = curRow/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
- }else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
- }
- }else {//绌烘澘涓嶅叆1鍙�
- necessaryParameters[0] = 5;
- switch (curRow){
- case 24:
- necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 2; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 21:
- necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 2; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- default:
- curRow=curRow+4;
- if (curRow<5 || curRow>24){
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
- if ((curRow-1)%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow+3)/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- }else if (curRow%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = curRow/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
- }else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
+ public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
+ switch (whsType){
+ case 1://缁忓吀鍙屼几搴撲綅
+ return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber);
+ default:
+ return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
+ }
+ }
+
+ //缁忓吀鍙屼几搴撲綅
+ public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4)) {
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(crnNumber * 4 - 3)) {
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < 1 || curRow > (crnNumber * 4)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow + 3) / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = curRow / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
}
}
return necessaryParameters;
}
+
+ //缁忓吀鍙屼几搴撲綅绉诲簱
+ public static int[] LocNecessaryParametersMove(Integer whsType, Integer curRow, Integer moveCrnNo) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ necessaryParameters[0] = 2; // 杞娆℃暟
+ if (curRow.equals(moveCrnNo*4-2)){
+ necessaryParameters[1] = curRow+2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ }else {
+ necessaryParameters[1] = curRow-2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
+ }
+ return necessaryParameters;
+ }
+
+
+ public static void main(String[] args) {
+ List<LocMast> locS = new ArrayList<LocMast>();
+ String locNo = "0000102";
+ for (int i = 1; i < 16; i++) {
+ String s = zerofill(String.valueOf(i), 2) + locNo.substring(2);
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(s);
+ locS.add(locMast);
+ }
+ List<String> innermostSideLoc = getInnermostSideLoc(locS);
+ System.out.println(innermostSideLoc);
+ }
+
+ //杞崲涓哄悇鑷搴旂殑娣卞簱浣�
+ public static List<String> getInnermostSideLoc(List<LocMast> locS) {
+ ArrayList<String> listLocRBL = new ArrayList<>();
+ for (LocMast locMast : locS) {
+ String innermostSideLocRBL = Utils.getInnermostSideLocRBL(locMast.getLocNo());
+ if (Cools.isEmpty(innermostSideLocRBL)) {
+ continue;
+ }
+ if (!listLocRBL.contains(innermostSideLocRBL)) {
+ listLocRBL.add(innermostSideLocRBL);
+ }
+ }
+ return listLocRBL;
+ }
+
+ public static String getInnermostSideLocRBL(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row % 4 == 0 || (row + 3) % 4 == 0) {
+ return zerofill(String.valueOf(row), 2) + locNo.substring(2);
+ } else if ((row + 2) % 4 == 0) {
+ return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2);
+ } else if ((row + 1) % 4 == 0) {
+ return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2);
+ }
+ return null;
+ }
+
+ public static String getInnermostSideLocLBR(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row % 4 == 0) {
+ return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2);
+ } else if ((row + 3) % 4 == 0) {
+ return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2);
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1