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 832f1308..8c347040 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,8 +69,14 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("uuid", uuidList); List invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper); + List recordUuidList = null; QueryWrapper salesQueryWrapper = new QueryWrapper<>(); salesQueryWrapper.in("uuid", uuidList); + if (invoicesList != null && invoicesList.size() > 0) { + recordUuidList = invoicesList.stream().map(SdnyTDxRecordInvoice::getUuid).collect(Collectors.toList()); + salesQueryWrapper.notIn("uuid", recordUuidList); + } + salesQueryWrapper.notIn("uuid", uuidList); List saleInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper); if (saleInvoices!=null && saleInvoices.size()>0) { if (invoicesList == null || invoicesList.size() == 0) { @@ -102,7 +108,10 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { List detailList = detailDao.selectList(detailQueryWrapper); if (saleInvoices != null && saleInvoices.size()>0) { QueryWrapper salesDetailQueryWrapper = new QueryWrapper<>(); - salesQueryWrapper.in("uuid", uuidList); + salesDetailQueryWrapper.in("uuid", uuidList); + if (recordUuidList != null && recordUuidList.size() > 0) { + salesDetailQueryWrapper.notIn("uuid", recordUuidList); + } List salesDetailList = detailSalesDao.selectList(salesDetailQueryWrapper); if (detailList == null || detailList.size() == 0) { detailList = new ArrayList<>();