From 3ada754b60571bfa156c2e61df8ddea7ccc496fb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 14:13:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b2a4261..83b24d0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -28,16 +28,28 @@
public class CommonService {
public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
- }};
- public static final List<Integer> FIRST_GROUP_ROW_LIST_SHORT = new ArrayList<Integer>() {{
- add(8);add(9);add(10);
+ add(1);
}};
public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(12);add(13);add(14);add(15);add(16);add(17);add(18);
+ add(3);add(4);
}};
public static final List<Integer> THIRD_GROUP_ROW_LIST = new ArrayList<Integer>() {{
- add(20);add(21);add(22);add(23);
+ add(6);add(7);
+ }};
+ public static final List<Integer> FOURTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(8);
+ }};
+ public static final List<Integer> FIFTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(10);add(11);
+ }};
+ public static final List<Integer> SIXTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(13);add(14);add(15);add(16);
+ }};
+ public static final List<Integer> SEVENTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(13);add(14);
+ }};
+ public static final List<Integer> EIGHTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(16);
}};
@@ -144,6 +156,8 @@
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
+ // 鏍规嵁鐗╂枡棰戠巼鏌ヨ搴撲綅
+
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
@@ -330,9 +344,9 @@
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
List<LocMast> peakLocs = locMastService.selectAllPeakLoc();
for (LocMast peakLoc : peakLocs) {
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(peakLoc.getLocNo());
- if (!Cools.isEmpty(groupInsideLoc)) {
- if (!locMastService.checkAllLocEmpty(groupInsideLoc)) continue;
+ List<String> groupInnerLoc = Utils.getGroupInnerLoc(peakLoc.getLocNo());
+ if (!Cools.isEmpty(groupInnerLoc)) {
+ if (!locMastService.checkAllLocEmpty(groupInnerLoc)) continue;
locMast = peakLoc;
break;
} else {
--
Gitblit v1.9.1