r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
wwb 2026-07-24 20:53:24 +08:00
parent 384afc6429
commit 576d555ac3
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java
View File

@ -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<File> files = new ArrayList<>();
List<DeliveryOrderEntryDO> entrys = getDeliveryOrderEntryListByParentId(deliveryOrder.getId());
List<List<DeliveryOrderEntryDO>> split = ListUtil.split(entrys, 6);
List<List<DeliveryOrderEntryDO>> split = ListUtil.split(entrys, pdfPageSize);
int pageIndex = 1;
for (List<DeliveryOrderEntryDO> entrys2 : split) {
String htmlContent = generateHtmlContent(deliveryOrder, entrys2,pageIndex);
@ -366,7 +370,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService {
Map<String,Object> 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());

8
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -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<SaleContractEntryDO> saleContractEntrys = saleContractService.getSaleContractEntryListByParentId(saleContractId);
List<List<SaleContractEntryDO>> split = ListUtil.split(saleContractEntrys, 6);
List<List<SaleContractEntryDO>> split = ListUtil.split(saleContractEntrys, pdfPageSize);
int pageIndex = 1;
for (List<SaleContractEntryDO> 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<SaleContractEntryDO> saleContractEntrys = BeanUtils.toBean(saleContractVO.getSaleContractEntrys(), SaleContractEntryDO.class);
List<File> files = new ArrayList<>();
List<List<SaleContractEntryDO>> split = ListUtil.split(saleContractEntrys, 6);
List<List<SaleContractEntryDO>> split = ListUtil.split(saleContractEntrys, pdfPageSize);
int pageIndex = 1;
for (List<SaleContractEntryDO> saleContractEntryDOS : split) {
String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,pageIndex);

1
hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue
View File

@ -209,6 +209,7 @@
style="width: 100%"
v-model.number="row.price"
:step="0.001"
:precision="4"
:controls="false"
@change="changeRow(row,'price')"
placeholder="请输入单价"