From d8e113bef1917445a9d87e8329e348101312d990 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 5 Jun 2024 09:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=89=93=E5=8D=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 40 ++++++++++++++++++- .../controller/sync/SyncDelController.java | 2 +- .../entity/inout/IoOrderInvoiceEntity.java | 6 +++ 3 files changed, 46 insertions(+), 2 deletions(-) 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 2a819f9a..edebb129 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; @@ -10,10 +13,12 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; 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.*; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.basic.FilterOrderPrintRequest; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.thrsys.UdiwmsOrderDetailRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -22,8 +27,10 @@ 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.service.thrsys.ThrProductsService; +import com.glxp.api.util.DateUtil; import com.glxp.api.util.FileUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.JasperUtils; @@ -72,6 +79,8 @@ public class BasicOrderPrintController { SystemParamConfigService systemParamConfigService; @Resource ThrProductsService thrProductsService; + @Resource + IoOrderInvoiceService orderInvoiceService; //校验模板是否正确 @AuthRuleAnnotation("") @@ -168,10 +177,26 @@ public class BasicOrderPrintController { } + //添加发票号 + 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++; } } + + } else { //查询单据表 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); @@ -241,7 +266,20 @@ public class BasicOrderPrintController { bizData.put("ylqxzcrbarmc", thrProductsEntity.getYlqxzcrbarmc() == null ? ' ' : thrProductsEntity.getYlqxzcrbarmc()); } - + //添加发票号 + 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++; } diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java index 22d0e3a9..66e90692 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java @@ -253,7 +253,7 @@ public class SyncDelController extends BaseController { @AuthRuleAnnotation("") @Log(title = "单据同步删除", businessType = BusinessType.DELETE) @PostMapping("/udiwms/sync/order/delete") - public BaseResponse deleteOrder(DeleteRequest deleteRequest) { + public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest) { List delBillNos = new ArrayList<>(); if (CollUtil.isNotEmpty(deleteRequest.getBillNos())) { delBillNos.addAll(deleteRequest.getBillNos()); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java index c7eacf2d..e849c439 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java @@ -9,8 +9,14 @@ import java.util.Date; import java.util.List; import kotlin.jvm.internal.Lambda; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data @TableName(value = "io_order_invoice") public class IoOrderInvoiceEntity {