From 9d40e93d9468cf815a8353d4c51388eb35ef4a07 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期六, 18 五月 2024 20:05:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a45713b..94df85a 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,35 @@
// }
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) {
+ 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;
@@ -296,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
}
@@ -511,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) {
@@ -565,12 +588,12 @@
/*
- * 鏈�娣卞簱浣嶆帓鍙� 锛� curRow
- * 鏈�娴呭簱浣嶆帓鍙� 锛� nearRow
- * 鏈�娴呭簱浣嶅彿锛岀敤浜庨攣瀹氬垪銆佸眰 锛� nearRow
- * 鍏ュ簱 true:pakin
- * 鍑哄簱 false:pakin
- * */
+ * 鏈�娣卞簱浣嶆帓鍙� 锛� curRow
+ * 鏈�娴呭簱浣嶆帓鍙� 锛� nearRow
+ * 鏈�娴呭簱浣嶅彿锛岀敤浜庨攣瀹氬垪銆佸眰 锛� nearRow
+ * 鍏ュ簱 true:pakin
+ * 鍑哄簱 false:pakin
+ * */
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
public static List<String> getGroupOutLocCrn(Integer curRow,Integer nearRow,String locNo,boolean pakin){
List<String> result = new ArrayList<>();
--
Gitblit v1.9.1