From b630f392f5a3c990d1849968c310ded82f073a97 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Jun 2024 15:28:26 +0800 Subject: [PATCH] =?UTF-8?q?6/11=20=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 16 ++++++++++++++++ .../inout/IoOrderDetailResultController.java | 3 +++ .../res/inout/IoOrderDetailResultResponse.java | 1 + .../com/glxp/api/res/inout/IoOrderResponse.java | 2 ++ .../mybatis/mapper/inout/IoOrderDao.xml | 2 +- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 54e52f217..2f9075fef 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -97,6 +97,9 @@ public class IoOrderController extends BaseController { @Resource InvProductDetailService invProductDetailService; + @Resource + IoOrderInvoiceService ioOrderInvoiceService; + /** * 查询单据列表 * @@ -132,7 +135,20 @@ public class IoOrderController extends BaseController { if (!customerId.equals("110")) { filterOrderRequest.setFromCorp(customerId); } + //拿到当前单据 List list = orderService.filterList(filterOrderRequest); + //根据单据查询 发票号 + for (IoOrderResponse ioOrderResponse : list){ + FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest(); + filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo()); + List orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(filterOrderDetailCodeRequest.getOrderIdFk()); + String invoiceCodes = orderInvoiceEntities.stream() + .map(IoOrderInvoiceEntity::getInvoiceEncode) + .collect(Collectors.joining(",")); + log.error("当前所有的发票号{}",invoiceCodes); + ioOrderResponse.setInvoiceCodes(invoiceCodes); + } + PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index d2070e52a..2b5a3e31b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -41,6 +41,7 @@ import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.JasperUtils; import com.glxp.api.util.MsDateUtil; import com.glxp.api.vo.dev.DeviceInfoVo; +import lombok.extern.slf4j.Slf4j; import net.sf.jasperreports.engine.JRException; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Value; @@ -64,6 +65,7 @@ import java.util.*; * 单据扫码明细查询接口 */ @RestController +@Slf4j public class IoOrderDetailResultController extends BaseController { @Resource IoOrderService orderService; @@ -345,6 +347,7 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("productDate", ioOrderDetailResultResponse.getProductDate() == null ? ' ' : ioOrderDetailResultResponse.getProductDate()); ioOrderDetailResultData.put("expireDate", ioOrderDetailResultResponse.getExpireDate() == null ? ' ' : ioOrderDetailResultResponse.getExpireDate()); ioOrderDetailResultData.put("coName", ioOrderDetailResultResponse.getCoName() == null ? ' ' : ioOrderDetailResultResponse.getCoName()); + ioOrderDetailResultData.put("corpName", ioOrderDetailResultResponse.getCorpName()== null ? ' ' : ioOrderDetailResultResponse.getCorpName()); ioOrderDetailResultData.put("certCode", ioOrderDetailResultResponse.getCertCode() == null ? ' ' : ioOrderDetailResultResponse.getCertCode()); ioOrderDetailResultData.put("ylqxzcrbarmc", ioOrderDetailResultResponse.getYlqxzcrbarmc() == null ? ' ' : ioOrderDetailResultResponse.getYlqxzcrbarmc()); ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer()); diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 63fc2d379..7a3a3f53e 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -214,6 +214,7 @@ public class IoOrderDetailResultResponse { @ExcelProperty(value = "发票确认时间", index = 12) private Date confirmTime; + @ExcelProperty(value = "配送商", index = 7) private String corpName; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 9f7d9a2d8..560612762 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -264,6 +264,8 @@ public class IoOrderResponse { private String checkPreInOrders; + private String invoiceCodes;//单据所有发票号 + public String getFromName() { diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 0dae4e934..cf68d87a5 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -53,7 +53,7 @@ AND io.fromCorp = #{fromCorp} - AND ioi.invoiceEncode = #{invoiceEncode} + AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%') AND (