From d83669275dcd9de9f5110ef29abf5e006da5ffe8 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 19 Nov 2024 10:22:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/factory/TestService.java   | 44 ++++++++++---------
 .../impl/WarehouseWaybillServiceImpl.java     |  9 ++--
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
index fac8e69e9..b5c5fadeb 100644
--- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
+++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
@@ -1115,28 +1115,32 @@ public class TestService {
 	}
 	public static void main(String[] args) throws IOException, InterruptedException {
 
-		List<String> strings = new ArrayList<>();
 
-		strings.add("11");
-		strings.add("11");
-		strings.add("14");
-		strings.add("11");
-		strings.add("11");
-		strings.add("13");
-		strings.add("11");
-		strings.add("11");
+			int num = (int) Math.ceil((double) 11 / 4);
+		System.out.println(num);
 
-		for (int a=0 ;a< 1200;a++){
-			strings.add(a+100+"");
-
-		}
-
-		List<List<String>> split = CollUtil.split(strings, 500);
-
-		split.forEach(s -> {
-			System.out.println(s);
-
-		});
+//		List<String> strings = new ArrayList<>();
+//
+//		strings.add("11");
+//		strings.add("11");
+//		strings.add("14");
+//		strings.add("11");
+//		strings.add("11");
+//		strings.add("13");
+//		strings.add("11");
+//		strings.add("11");
+//
+//		for (int a=0 ;a< 1200;a++){
+//			strings.add(a+100+"");
+//
+//		}
+//
+//		List<List<String>> split = CollUtil.split(strings, 500);
+//
+//		split.forEach(s -> {
+//			System.out.println(s);
+//
+//		});
 
 //		Date data1 = DateUtil.parse("2024-07-23 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS");
 //		Date data2 = DateUtil.parse("2024-07-24 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS");
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index 724dd924c..485423f21 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -821,9 +821,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			if (ObjectUtils.isNotEmpty(detailList)) {
 				// 得到需要打印的页面数量
 				int num = (int) Math.ceil((double) detailList.size() / 4);
-				if (detailList.size() % 4>0) {
-					num = num+1;
-				}
+//				if (detailList.size() % 4>0) {
+//					num = num+1;
+//				}
 //				int totalPages = (int) Math.ceil((double) totalItems / itemsPerPage);
 
 				for (int i = 1; i <= num; i++) {
@@ -832,7 +832,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 					if (i == num) {
 						warehouseWayBillDetails = detailList.subList((i - 1) * 4, detailList.size());
 					} else {
-						warehouseWayBillDetails = detailList.subList((i - 1) * 4, 4);
+						int c=(i - 1) * 4;
+						warehouseWayBillDetails = detailList.subList(c, c+4);
 					}
 					if (!warehouseWayBillDetails.isEmpty()) {