Browse Source

fix:

1.修复打印bug
master
pref_mail@163.com 3 months ago
parent
commit
d83669275d
  1. 44
      blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
  2. 9
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

44
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");

9
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()) {

Loading…
Cancel
Save