From 112ac231c1e27d591aec0dc39f1337b4f1971847 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 26 八月 2024 15:05:26 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index ad1411a..0b0f025 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -493,38 +493,28 @@ public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) { int[] necessaryParameters = new int[]{0, 0, 0, 0}; Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿 - Integer offset = 4;//璧峰鎺掑彿 + Integer offset = 16;//璧峰鎺掑彿 Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿 necessaryParameters[0] = crnNumber; // 杞娆℃暟 curRow = curRow - offset; //婊℃澘姝e父鍏ュ簱 switch (curRow){ case 1: - necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓 + necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓 break; - case 4: - necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓 - break; - case 9: - necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓 - necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓 - break; - case 14: + case 3: necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓 + necessaryParameters[3] = 10; //nearRow 鏈�娴呭簱浣嶆帓 break; case 7: - necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[1] = 11; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 - necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓 + necessaryParameters[3] = 11; //nearRow 鏈�娴呭簱浣嶆帓 break; - case 12: + case 11: necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓 necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓 -- Gitblit v1.9.1