From c0bc2548715c8506bc69c5b6625e0810264b9fb6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 17 十月 2025 15:24:25 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/utils/Utils.java | 118 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 45 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..ea5588f 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;
@@ -121,7 +122,8 @@
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);
+ int shallowRow = row;
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -226,28 +228,21 @@
// }
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==2 || whsType==3 || whsType==4) {
return true;
}
return false;
@@ -356,45 +351,78 @@
return necessaryParameters;
}
- //缁忓吀鍗曚几搴撲綅
+// //缁忓吀鍗曚几搴撲綅
+// public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, 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 鏈�娴呭簱浣嶆帓
+// } 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);
+// }
+// }
+// }
+// return necessaryParameters;
+// }
+
+ // 缁忓吀鍗曚几搴撲綅
public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, 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 eRow = rowLastno.geteRow();
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 鏈�娴呭簱浣嶆帓
- } 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);
- }
+
+ // 璁＄畻鏈�娣卞簱浣嶆帓鍜屾渶娴呭簱浣嶆帓
+ int minRow = sRow; // 璧峰鎺掑彿
+ int maxRow = eRow; //
+
+ // 妫�鏌ユ帓鍙疯寖鍥存槸鍚﹀悎娉�
+ if (curRow < minRow || curRow > maxRow) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
+
+ // 璁＄畻鍫嗗灈鏈哄彿鍜屽搴旀帓鍙�
+ int crnOffset = (curRow - minRow) / 2; // 璁＄畻褰撳墠鍫嗗灈鏈哄亸绉婚噺
+ necessaryParameters[1] = curRow; // curRow: 褰撳墠璐ф灦鎺掑彿
+ necessaryParameters[2] = sCrnNo + crnOffset; // crnNo: 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow; // nearRow: 褰撳墠璐ф灦鎺掑彿
}
+
return necessaryParameters;
}
+
//缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
--
Gitblit v1.9.1