From d647ee9a9564a769f053d93bd7cf6e95dd8f5b3c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 19 九月 2024 16:18:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index b2690ec..9ae5dff 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -287,6 +287,8 @@
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
}
@@ -497,25 +499,15 @@
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
- case 2:
+ case 1:
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 7:
+ case 4:
necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 12:
- necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 4:
- necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓
break;
case 9:
necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓
@@ -535,6 +527,26 @@
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;
+ }
+
public static void main(String[] args) {
List<LocMast> locS = new ArrayList<LocMast>();
--
Gitblit v1.9.1