From 6ca70bea9a055b34e0d7837c485944226d918fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= <sci3197@dingtalk.com>
Date: Tue, 14 Nov 2023 08:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=8F=91=E7=A5=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImageSubmitServiceImpl.java  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
index c3d4c475..df4da04d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
@@ -69,7 +69,17 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         queryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoice> invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper);
         if (invoicesList == null || invoicesList.size() == 0) {
-            return R.error(500, "未查询到发票信息，请重新查验");
+            QueryWrapper<SdnyTDxSaleRecordInvoice> salesQueryWrapper = new QueryWrapper<>();
+            salesQueryWrapper.in("uuid", uuidList);
+            List<SdnyTDxSaleRecordInvoice> saleRecordInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper);
+            if (saleRecordInvoices == null || saleRecordInvoices.size() == 0) {
+                return R.error(500, "未查询到发票信息，请重新查验");
+            }
+            invoicesList = new ArrayList<>();
+            for (SdnyTDxSaleRecordInvoice item : saleRecordInvoices) {
+                SdnyTDxRecordInvoice invoice = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(item), SdnyTDxRecordInvoice.class);
+                invoicesList.add(invoice);
+            }
         }
         if (invoicesList.size() != uuidList.size()) {
             StringBuffer msg = new StringBuffer();
@@ -88,7 +98,17 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         detailQueryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper);
         if (detailList == null || detailList.size() == 0) {
-            return R.error(500,"未查询到发票明细信息，请重新查验");
+            QueryWrapper salesQueryWrapper = new QueryWrapper<>();
+            salesQueryWrapper.in("uuid", uuidList);
+            List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper);
+            if (salesDetailList == null || salesDetailList.size() == 0) {
+                return R.error(500,"未查询到发票明细信息，请重新查验");
+            }
+            detailList = new ArrayList<>();
+            for (SdnyTDxRecordInvoiceDetailSales item : salesDetailList) {
+                SdnyTDxRecordInvoiceDetail detail = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(item), SdnyTDxRecordInvoiceDetail.class);
+                detailList.add(detail);
+            }
         }
         Map<String, List<SdnyTDxRecordInvoiceDetail>> detailiMap = new HashMap<>();
         detailList.stream().forEach(item -> {