From 6004efd6f95e26c718325675adcac6149c21b392 Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期四, 11 九月 2025 15:19:11 +0800
Subject: [PATCH] U8订单对接完成(需正式账套)
---
src/main/java/com/zy/asrs/utils/Utils.java | 372 +++++++++++++++++++++++++---------------------------
1 files changed, 180 insertions(+), 192 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index ae2ff5e..69af95a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,5 +1,6 @@
package com.zy.asrs.utils;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -226,42 +227,28 @@
// }
public static Integer GetWhsType(Integer sourceStaNo) {
- switch (sourceStaNo){
- case 104:
- case 173:
- case 174:
- case 175:
- case 130:
- case 125:
- return 5;
- case 204:
- case 273:
- case 274:
- case 275:
- case 230:
- case 225:
- return 2;
- default:
- return 0;
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ List<RowLastno> rowLastnos = rowLastnoService.selectList(new EntityWrapper<RowLastno>());
+ for (RowLastno rowLastno : rowLastnos) {
+ String[] staNoList = rowLastno.getStaNoList().split(";");
+ for (String staNo : staNoList) {
+ if (staNo.equals(sourceStaNo.toString())) {
+ return rowLastno.getWhsType();
+ }
+ }
}
+ return 0;
}
- public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ public static boolean BooleanWhsTypeStaIoType(RowLastno rowLastno) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
+ if (rowLastno.getBeSimilar().equals("Y")) {
return true;
}
return false;
}
- public static boolean BooleanWhsTypeSta(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
- return true;
- }
- return false;
- }
-
- public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
- if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) {
+ public static boolean BooleanWhsTypeSta(RowLastno rowLastno, Integer staDescId) {//绔欑偣璺緞鏇存柊
+ if (rowLastno.getPointSwitch().equals("Y") && staDescId != 11 && staDescId != 111) {
return true;
}
return false;
@@ -285,230 +272,217 @@
//搴撲綅鎺掑彿鍒嗛厤
public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
- switch (whsType){
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
- return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
- return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
- return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //鏈畬鍠�
+ return LocNecessaryParametersDoubleExtension3(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 4://缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
- return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
+ return LocNecessaryParametersDoubleExtension4(rowLastno, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
- return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
+ return LocNecessaryParametersDoubleExtension5(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
- return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
+ return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
}
//缁忓吀鍙屼几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
+
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
- necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ necessaryParameters[1] = sRow + 3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 4 == 0) {//1\5\9\13
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow + 3) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 4 == 0) {//4\8\12\16
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 4;
- if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
//缁忓吀鍙屼几搴撲綅绉诲簱
- public static int[] LocNecessaryParametersMove(Integer whsType, Integer curRow, Integer moveCrnNo) {
+ public static int[] LocNecessaryParametersMove(RowLastno rowLastno, 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 鏈�娣卞簱浣嶆帓
+ 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[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ necessaryParameters[1] = curRow - 2; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
}
return necessaryParameters;
}
//缁忓吀鍗曚几搴撲綅
- public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension2(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 2 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
- necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 2 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
+ necessaryParameters[1] = sRow + 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 2;
+ if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 2 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 2 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 2;
- if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 2 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 2 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
return necessaryParameters;
}
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
- public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension3(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 3 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
- necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow + 2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 3;
- if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1 ; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
- public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension4(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 3 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
- necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow + 2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 3;
- if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1 ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 3 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
//鍙屽伐浣嶅崟浼稿簱浣�
- public static int[] LocNecessaryParametersDoubleExtension5(Integer whsType, Integer curRow, Integer crnNumber) {
+ public static int[] LocNecessaryParametersDoubleExtension5(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
- RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
Integer sCrnNo = rowLastno.getsCrnNo();
- if (BooleanWhsTypeSta(whsType)) {
- necessaryParameters[0] = crnNumber; // 杞娆℃暟
- //婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4 + sRow - 1)) {
- necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
- necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ necessaryParameters[1] = sRow + 3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow + 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 4;
- if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
- if ((curRow - sRow) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
- }
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
}
+
return necessaryParameters;
}
@@ -572,18 +546,32 @@
* 鍑哄簱 false:pakin
* */
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutLocCrn(Integer curRow,Integer nearRow,String locNo,boolean pakin){
+ 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 >= curRow; row--) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
}
return result;
}
+ // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
+ public static List<String> getGroupOutsideLocCrn(String locNo){
+ int row = getRow(locNo);
+ List<String> result = new ArrayList<>();
+ if (row==3 || row == 4){
+ result.add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ result.add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ return result;
+ }else{
+ result.add(locNo);
+ return result;
+ }
+ }
+
}
--
Gitblit v1.9.1