From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/utils/Utils.java | 76 ++++++++++++-------------------------
1 files changed, 25 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index f4306d5..b5387df 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -8,15 +8,11 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.service.RowLastnoService;
-import com.zy.common.CodeBuilder;
-import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
-import com.zy.system.service.UserService;
-
import java.text.DecimalFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
* Created by vincent on 2020/8/27
@@ -25,26 +21,9 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static String getStaName(Integer sta){
- HashMap<Integer, String> map = new HashMap<>();
- map.put(113,"Ctu搴�102");map.put(115,"Ctu搴�101");
- map.put(204,"Ctu搴�201");map.put(304,"Ctu搴�301");
- map.put(31001,"鍥涘悜搴�101");
- map.put(1024,"鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");map.put(1028,"鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛");
- map.put(1040,"鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");map.put(1042,"鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛");
-
- map.put(2000,"鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");map.put(2002,"鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛");
- map.put(2010,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");map.put(2012,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛");
-
-
- map.put(3010,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");map.put(3012,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
-
- return map.get(sta)==null?sta.toString():map.get(sta);
- }
-
- public static boolean isNorth(Integer sourceStaNo){
- if ((sourceStaNo>1000 && sourceStaNo < 1040) || (sourceStaNo>2000 && sourceStaNo > 2010)|| (sourceStaNo > 3000 && sourceStaNo < 3010)){
+ public static boolean isNorth(Integer sourceStaNo) {
+ if ((sourceStaNo > 1000 && sourceStaNo < 1040) || (sourceStaNo > 2000 && sourceStaNo > 2010) || (sourceStaNo > 3000 && sourceStaNo < 3010)) {
return true;
}
return false;
@@ -146,7 +125,7 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ int shallowRow = remainder == 1 ? (row - 1) : (row + 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -165,10 +144,10 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 0 ) {
- targetRow = row + 1;
- } else if (remainder == 3) {
+ if (remainder == 2) {
targetRow = row - 1;
+ } else if (remainder == 3) {
+ targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
@@ -279,30 +258,30 @@
}
public static boolean BooleanWhsTypeSta2(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType == 3 || whsType == 4 || whsType == 9) {
return true;
}
return false;
}
public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[0];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[0];
}
public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[1];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[1];
}
public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[2];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[2];
}
public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[3];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber,Integer whsType) {
+ public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber, Integer whsType) {
switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
@@ -318,6 +297,8 @@
return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 7://骞冲簱 CTU搴�
return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 8://鍥涘悜搴�(鐗涚溂杞�)eg:鍏夋嘲鍥涘悜
+ return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
@@ -356,9 +337,6 @@
}
}
- //鍫嗗灈鏈哄簱浣嶄粠14鎺掑紑濮�
- necessaryParameters[1] = necessaryParameters[1]+13; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[3] = necessaryParameters[3]+13; //nearRow 鏈�娴呭簱浣嶆帓
return necessaryParameters;
}
@@ -520,6 +498,7 @@
return necessaryParameters;
}
+
//鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -529,18 +508,13 @@
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
- switch (curRow){
+ switch (curRow) {
case 1:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 4:
- necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 5:
+ case 3:
necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
@@ -565,7 +539,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 鏈�娴呭簱浣嶆帓
@@ -640,12 +614,12 @@
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
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));
}
}
--
Gitblit v1.9.1