diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 4a6515d25..d3eca287a 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -1,6 +1,9 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -9,6 +12,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; +import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -23,6 +27,7 @@ import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.system.*; import com.glxp.api.util.IntUtil; import com.glxp.api.util.JasperUtils; @@ -67,6 +72,8 @@ public class BasicOrderPrintController { SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; @Resource SystemParamConfigService systemParamConfigService; + @Resource + IoOrderInvoiceService orderInvoiceService; //校验模板是否正确 @AuthRuleAnnotation("") @@ -159,6 +166,20 @@ public class BasicOrderPrintController { // bizData.put("createTime", dateStr == null ? ' ' : dateStr); // // } + //添加发票号 + String fphm = ""; + String fprq = null; + List invoiceList = orderInvoiceService.list(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, ioOrderResponse.getBillNo()) + .eq(IoOrderInvoiceEntity::getBindRlFk, obj.getBindRlFk()) + .eq(StrUtil.isNotEmpty(obj.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, obj.getBatchNo()) + .groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); + if (CollectionUtil.isNotEmpty(invoiceList)) { + fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); + if (invoiceList.get(0).getInvoiceDate() != null) + fprq = invoiceList.get(0).getInvoiceDate(); + } + bizData.put("invoiceDate", fprq); + bizData.put("invoiceNo", fphm); list.add(bizData); i++; } @@ -231,6 +252,20 @@ public class BasicOrderPrintController { // String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime()); // bizData.put("createTime", dateStr == null ? ' ' : dateStr); // } + //添加发票号 + String fphm = ""; + String fprq = null; + List invoiceList = orderInvoiceService.list(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, ioOrderResponse.getBillNo()) + .eq(IoOrderInvoiceEntity::getBindRlFk, obj.getRelId()) + .eq(StrUtil.isNotEmpty(obj.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, obj.getBatchNo()) + .groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); + if (CollectionUtil.isNotEmpty(invoiceList)) { + fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); + if (invoiceList.get(0).getInvoiceDate() != null) + fprq = invoiceList.get(0).getInvoiceDate(); + } + bizData.put("invoiceDate", fprq); + bizData.put("invoiceNo", fphm); list.add(bizData); i++; }