From 81f1adefe6044e511ec7f7483abae6b0103f8b62 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 27 九月 2024 13:19:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/utils/Utils.java | 12 +-----------
1 files changed, 1 insertions(+), 11 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..9ae5dff 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -493,7 +493,7 @@
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 = 0;//璧峰鎺掑彿
Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
@@ -515,16 +515,6 @@
necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓
break;
case 14:
- necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 7:
- necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 12:
necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
--
Gitblit v1.9.1