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 c0110a7..5589b39 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 @@ -703,6 +703,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { context.setVariable("currencyType", saleContract.getCurrencyType()); context.setVariable("zhTotalAmount", "合共人民币" + NumberChineseFormatterUtils.convertToChinese(saleContract.getAmount()) + "整"); + List> list = new ArrayList<>(); for (int i = 0; i < saleContractEntrys.size(); i++) { SaleContractEntryDO saleContractEntryDO = saleContractEntrys.get(i); ProductInfoDO productInfo = productInfoService.getProductInfo(saleContractEntryDO.getProductId()); @@ -735,20 +736,35 @@ public class SaleOrderServiceImpl implements SaleOrderService { specBuilder.append(thickness); } String spec = specBuilder.toString(); + Map items = new LinkedHashMap<>(); int j = i + 1; PageUtil.setFirstPageNo(1); int start = PageUtil.getStart(pageIndex, pdfPageSize); - context.setVariable("item" + j, start+j + ""); - context.setVariable("explain" + j, code); - context.setVariable("qty" + j, saleContractEntryDO.getQty()); - context.setVariable("price" + j, saleContractEntryDO.getPrice()); - context.setVariable("discount" + j, saleContractEntryDO.getDiscount()); - context.setVariable("amount" + j, saleContractEntryDO.getAmount()); - context.setVariable("deliverydate" + j, DateUtil.date(saleContractEntryDO.getDeliveryDate()).toDateStr()); - context.setVariable("explain" + j + "1", name); - context.setVariable("explain" + j + "2", details); - context.setVariable("explain" + j + "3", spec); +// context.setVariable("item" + j, start+j + ""); +// context.setVariable("explain" + j, code); +// context.setVariable("qty" + j, saleContractEntryDO.getQty()); +// context.setVariable("price" + j, saleContractEntryDO.getPrice()); +// context.setVariable("discount" + j, saleContractEntryDO.getDiscount()); +// context.setVariable("amount" + j, saleContractEntryDO.getAmount()); +// context.setVariable("deliverydate" + j, DateUtil.date(saleContractEntryDO.getDeliveryDate()).toDateStr()); +// context.setVariable("explain" + j + "1", name); +// context.setVariable("explain" + j + "2", details); +// context.setVariable("explain" + j + "3", spec); + + + items.put("item", start+j + ""); + items.put("explain", code); + items.put("qty", saleContractEntryDO.getQty()); + items.put("price", saleContractEntryDO.getPrice()); + items.put("discount", saleContractEntryDO.getDiscount()); + items.put("amount", saleContractEntryDO.getAmount()); + items.put("deliverydate", DateUtil.date(saleContractEntryDO.getDeliveryDate()).toDateStr()); + items.put("explain"+ "1", name); + items.put("explain"+ "2", details); + items.put("explain"+ "3", spec); + list.add(items); } + context.setVariable("items",list); return context; } diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html index 8925aa2..6977926 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html @@ -125,30 +125,31 @@ - - 1 - Doe - 12344 - Doe - Doe - Doe - 2024-01-12 - - - - 跨越多列的标题 - - - - 跨越多列的标题 - - - - 跨越多列的标题 - - - + + + 1 + Doe + 12344 + Doe + Doe + Doe + 2024-01-12 + + + + 跨越多列的标题 + + + + 跨越多列的标题 + + + + 跨越多列的标题 + + +