diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java index dd9e1d5..7f72ea7 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java @@ -93,6 +93,10 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { @Value("${wkappurl}") private String wkappUrl; + //PDF每页表格行数量 + private int pdfPageSize = 10; + + @Override @Transactional(rollbackFor = Exception.class) public Long createDeliveryOrder(DeliveryOrderSaveReqVO createReqVO) { @@ -216,7 +220,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { for (DeliveryOrderDO deliveryOrder : deliveryOrders) { List files = new ArrayList<>(); List entrys = getDeliveryOrderEntryListByParentId(deliveryOrder.getId()); - List> split = ListUtil.split(entrys, 6); + List> split = ListUtil.split(entrys, pdfPageSize); int pageIndex = 1; for (List entrys2 : split) { String htmlContent = generateHtmlContent(deliveryOrder, entrys2,pageIndex); @@ -366,7 +370,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { Map items = new LinkedHashMap<>(); int j = i + 1; PageUtil.setFirstPageNo(1); - int start = PageUtil.getStart(pageIndex, 6); + int start = PageUtil.getStart(pageIndex, pdfPageSize); items.put("itemIndex", start+j + ""); items.put("productDesc1", productInfo.getCode()); items.put("productDesc2", productInfo.getName()); diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 7d1a33c..c0110a7 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -184,6 +184,8 @@ public class SaleOrderServiceImpl implements SaleOrderService { @Value("${wkappurl}") private String wkappUrl; + //PDF每页表格行数量 + private int pdfPageSize = 10; @Override @@ -486,7 +488,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { SaleContractDO saleContract = saleContractService.getSaleContract(saleContractId); List saleContractEntrys = saleContractService.getSaleContractEntryListByParentId(saleContractId); - List> split = ListUtil.split(saleContractEntrys, 6); + List> split = ListUtil.split(saleContractEntrys, pdfPageSize); int pageIndex = 1; for (List saleContractEntryDOS : split) { String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,pageIndex); @@ -735,7 +737,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { String spec = specBuilder.toString(); int j = i + 1; PageUtil.setFirstPageNo(1); - int start = PageUtil.getStart(pageIndex, 6); + int start = PageUtil.getStart(pageIndex, pdfPageSize); context.setVariable("item" + j, start+j + ""); context.setVariable("explain" + j, code); context.setVariable("qty" + j, saleContractEntryDO.getQty()); @@ -763,7 +765,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { SaleContractDO saleContract = BeanUtils.toBean(saleContractVO, SaleContractDO.class); List saleContractEntrys = BeanUtils.toBean(saleContractVO.getSaleContractEntrys(), SaleContractEntryDO.class); List files = new ArrayList<>(); - List> split = ListUtil.split(saleContractEntrys, 6); + List> split = ListUtil.split(saleContractEntrys, pdfPageSize); int pageIndex = 1; for (List saleContractEntryDOS : split) { String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,pageIndex); diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue index 5a54573..ff36416 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue @@ -209,6 +209,7 @@ style="width: 100%" v-model.number="row.price" :step="0.001" + :precision="4" :controls="false" @change="changeRow(row,'price')" placeholder="请输入单价"