From 74ece86c7482683dbdeaecffea941283bfd8f761 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Tue, 18 Mar 2025 09:52:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BasicOrderPrintController.java      | 32 +++++++++++++++++--
 .../CollectOrderUploadCountResponse.java      |  2 ++
 2 files changed, 31 insertions(+), 3 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 cce5136e1..ccea3cb1a 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
@@ -3,11 +3,13 @@ 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.conditions.query.QueryWrapper;
 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;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.IoCodeEntity;
@@ -31,6 +33,7 @@ import com.glxp.api.service.system.*;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.JasperUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -94,7 +97,8 @@ public class BasicOrderPrintController {
 
     }
 
-
+    @Resource
+    private IoOrderInvoiceMapper ioOrderInvoiceMapper;
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/pdf/template/order/file")
     public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -156,7 +160,19 @@ public class BasicOrderPrintController {
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
                     bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
-                    bizData.put("invoiceCode",ioOrderResponse.getInvoiceCode());
+
+                    List<IoOrderInvoiceEntity> list1 = ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>()
+                            .eq("orderIdFk",filterOrderPrintRequest.getOrderIdFk())
+                    );
+                    String code = "";
+                    if(list1!= null && list1.size()>0){
+                        for (IoOrderInvoiceEntity ioOrderInvoiceEntity : list1) {
+                            if(StringUtils.isNotEmpty(ioOrderInvoiceEntity.getInvoiceEncode())){
+                                code+=ioOrderInvoiceEntity.getInvoiceEncode()+",";
+                            }
+                        }
+                    }
+                    bizData.put("invoiceCode",code);
 
                     //添加发票号
                     String fphm = "";
@@ -235,7 +251,17 @@ public class BasicOrderPrintController {
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
                     bizData.put("udiCode", obj.getCode().replaceAll("\u001D", ""));
                     bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
-
+                    List<IoOrderInvoiceEntity> list1 = ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>()
+                            .eq("orderIdFk",ioOrderResponse.getBillNo())
+                    );
+                    String code = "";
+                    if(list1!= null && list1.size()>0){
+                        for (IoOrderInvoiceEntity ioOrderInvoiceEntity : list1) {
+                            if(StringUtils.isNotEmpty(ioOrderInvoiceEntity.getInvoiceEncode())){
+                                code+=ioOrderInvoiceEntity.getInvoiceEncode()+",";
+                            }                        }
+                    }
+                    bizData.put("invoiceCode",code);
                     //添加发票号
                     String fphm = "";
                     String fprq = null;
diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java
index d8da91894..95664c02e 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java
@@ -19,6 +19,8 @@ public class CollectOrderUploadCountResponse {
     private Integer codeCount;
     private Integer buyerScanCount;
     private Integer salesScanCount;
+    private Integer buyerScanCountReturn ;
+    private Integer salesScanCountReturn ;
     private Integer count;
     /**
      * 拆零赋码数量