From 2c799e6d26c726e3943f24e61c84f7d562087cfc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 26 六月 2025 10:20:12 +0800
Subject: [PATCH] #增加堆垛机12物料衔接类型
---
src/main/java/com/zy/asrs/utils/Utils.java | 150 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 122 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index b4de45a..816a012 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -8,10 +8,12 @@
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.ArrayList;
@@ -121,9 +123,17 @@
*/
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);
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, row);
+ int targetRow;
+ if (deepLocLeft) {
+ targetRow = row + 1;
+ } else if (deepLocRight) {
+ targetRow = row - 1;
+ } else {
+ throw new RuntimeException(deepLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ }
+ return zerofill(String.valueOf(targetRow), 2) + deepLoc.substring(2);
}
/**
@@ -139,30 +149,45 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, row+1);
int targetRow;
- if (remainder == 2) {
+ if (deepLocLeft) {
targetRow = row - 1;
- } else if (remainder == 3) {
+ } else if (deepLocRight) {
targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
}
+// public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
+// int row = getRow(shallowLoc);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// int targetRow;
+// if (remainder == 2) {
+// targetRow = row - 1;
+// } else if (remainder == 3) {
+// targetRow = row + 1;
+// } else {
+// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+// }
+// return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+// }
/**
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow+1);
int targetRow;
- if (remainder == 2) {
+ if (deepLocLeft) {
targetRow = shallowRow - 1;
- } else if (remainder == 3) {
+ } else if (deepLocRight) {
targetRow = shallowRow + 1;
} else {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
+ throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return targetRow;
}
@@ -254,26 +279,24 @@
return false;
}
- public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[0];
+ public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[0];
}
- public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[1];
+ public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[1];
}
- public static int getCrnNo(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[2];
+ public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[2];
}
- public static int getNearRow(Integer whsType, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(whsType, curRow, crnNumber)[3];
+ public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
@@ -285,6 +308,10 @@
return LocNecessaryParametersDoubleExtension4(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
return LocNecessaryParametersDoubleExtension5(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 6://鍥涘悜搴�(鐗涚溂杞�)eg:鍏夋嘲鍥涘悜
+ return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 7://骞冲簱 CTU搴�
+ return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
@@ -417,8 +444,8 @@
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
public static int[] LocNecessaryParametersDoubleExtension4(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- Integer sRow = rowLastno.getsRow();
- Integer sCrnNo = rowLastno.getsCrnNo();
+ Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿
+ Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
if (curRow.equals(crnNumber * 3 + sRow - 1)) {
@@ -472,7 +499,7 @@
}
if ((curRow - sRow) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
} else if ((curRow - sRow + 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
@@ -481,6 +508,73 @@
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
+ }
+
+ return necessaryParameters;
+ }
+ //鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
+ public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿
+ Integer offset = 4;//璧峰鎺掑彿
+ Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ curRow = curRow - offset;
+ //婊℃澘姝ｅ父鍏ュ簱
+ switch (curRow){
+ case 1:
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 4:
+ necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 9:
+ necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 14:
+ necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 7:
+ necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ case 12:
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
+ default:
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ necessaryParameters[1] = necessaryParameters[1] + offset;
+ necessaryParameters[3] = necessaryParameters[3] + offset;
+ return necessaryParameters;
+ }
+
+ //骞冲簱锛堝厜娉癨CTU锛�
+ public static int[] LocNecessaryParametersDoubleExtension7(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿
+ Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(rowLastno.geteRow())){
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ necessaryParameters[1] = curRow + 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
}
return necessaryParameters;
@@ -548,12 +642,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 >= curRow; row--) {
+ }else {
+ for (int row = curRow;row<=nearRow;row++){
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
}
--
Gitblit v1.9.1