|
|
@ -821,9 +821,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil |
|
|
|
if (ObjectUtils.isNotEmpty(detailList)) { |
|
|
|
if (ObjectUtils.isNotEmpty(detailList)) { |
|
|
|
// 得到需要打印的页面数量
|
|
|
|
// 得到需要打印的页面数量
|
|
|
|
int num = (int) Math.ceil((double) detailList.size() / 4); |
|
|
|
int num = (int) Math.ceil((double) detailList.size() / 4); |
|
|
|
if (detailList.size() % 4>0) { |
|
|
|
// if (detailList.size() % 4>0) {
|
|
|
|
num = num+1; |
|
|
|
// num = num+1;
|
|
|
|
} |
|
|
|
// }
|
|
|
|
// int totalPages = (int) Math.ceil((double) totalItems / itemsPerPage);
|
|
|
|
// int totalPages = (int) Math.ceil((double) totalItems / itemsPerPage);
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = 1; i <= num; i++) { |
|
|
|
for (int i = 1; i <= num; i++) { |
|
|
@ -832,7 +832,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil |
|
|
|
if (i == num) { |
|
|
|
if (i == num) { |
|
|
|
warehouseWayBillDetails = detailList.subList((i - 1) * 4, detailList.size()); |
|
|
|
warehouseWayBillDetails = detailList.subList((i - 1) * 4, detailList.size()); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
warehouseWayBillDetails = detailList.subList((i - 1) * 4, 4); |
|
|
|
int c=(i - 1) * 4; |
|
|
|
|
|
|
|
warehouseWayBillDetails = detailList.subList(c, c+4); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!warehouseWayBillDetails.isEmpty()) { |
|
|
|
if (!warehouseWayBillDetails.isEmpty()) { |
|
|
|
|
|
|
|
|
|
|
|