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 invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper); if (invoicesList == null || invoicesList.size() == 0) { - return R.error(500, "未查询到发票信息,请重新查验"); + QueryWrapper salesQueryWrapper = new QueryWrapper<>(); + salesQueryWrapper.in("uuid", uuidList); + List 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 detailList = detailDao.selectList(detailQueryWrapper); if (detailList == null || detailList.size() == 0) { - return R.error(500,"未查询到发票明细信息,请重新查验"); + QueryWrapper salesQueryWrapper = new QueryWrapper<>(); + salesQueryWrapper.in("uuid", uuidList); + List 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> detailiMap = new HashMap<>(); detailList.stream().forEach(item -> {