From 793a8667b34f33bcd2977ddad65c94ff16aa0c04 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 13 一月 2023 09:23:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 07661fa..f343216 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -229,12 +230,14 @@
curRow = 1;
if (null != theCrnNo) {
curRow = 8;
+ crnNo1 = crnNo1 + 1;
}
break;
case 2:
curRow = 7;
if (null != theCrnNo) {
curRow = 14;
+ crnNo1 = crnNo1 + 1;
}
break;
case 3:
@@ -258,12 +261,14 @@
curRow = 15;
if (null != theCrnNo) {
curRow = 8;
+ crnNo1 = crnNo1 - 1;
}
break;
case 4:
curRow = 21;
if (null != theCrnNo) {
curRow = 14;
+ crnNo1 = crnNo1 - 1;
}
break;
default:
@@ -317,6 +322,10 @@
}
}
}
+// LocMast locMast0 = locMastService.findOutMost(locMasts.stream().map(LocMast::getLocNo).distinct().collect(Collectors.toList()));
+// if (!Cools.isEmpty(locMast0)) {
+// locMast = locMast0;
+// }
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
--
Gitblit v1.9.1