From 3d35502631c71da0ff11834aa92b6839d3e707d2 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期六, 18 五月 2024 16:33:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 35 ++++++++++++++++++++++++++++++++---
src/main/java/com/zy/common/service/CommonService.java | 8 ++++----
2 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2109368..94df85a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -241,21 +241,21 @@
}
public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ if (whsType == 1 || whsType==3 || whsType==4 || whsType == 9) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
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) {
+ if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4 || whsType == 9) && staDescId != 11 && staDescId != 111) {
return true;
}
return false;
@@ -290,6 +290,8 @@
return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
+ case 9://鍓嶅弻浼� 鍚庡乏鍗曞彸鍙�(灏忓崟澶у弻) 鐓滄槦瀹氬埗
+ return LocNecessaryParametersDoubleExtension9(whsType, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
}
@@ -505,6 +507,33 @@
}
return necessaryParameters;
}
+ public static int[] LocNecessaryParametersDoubleExtension9(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(21)) {
+ necessaryParameters[1] = 25; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 7; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 25; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(25)) {
+ necessaryParameters[1] = 24; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 6; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 23; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(24)) {
+ necessaryParameters[1] = 27; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 7; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 26; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(27)) {
+ necessaryParameters[1] = 21; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 6; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 22; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
+ return necessaryParameters;
+ }
public static void main(String[] args) {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index eb95817..43865c8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -200,10 +200,10 @@
if (Utils.BooleanWhsTypeStaIoType(whsType)){
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
- signRule1 = true;
- }
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// if (!Cools.isEmpty(matnr) && staDescId == 1){
+// signRule1 = true;
+// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
if (!Cools.isEmpty(matnr) && staDescId == 1) {
signRule2 = true;
--
Gitblit v1.9.1