From 29b9be643d725e60d753d34932a18646ae244369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Mon, 18 Dec 2023 10:55:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=85=B6=E4=B8=AD=E6=9C=89=E7=A5=A8=E6=9C=AA?= =?UTF-8?q?=E5=9C=A8=E8=BF=9B=E9=A1=B9=E8=A1=A8=E4=B8=AD=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ImageSubmitServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 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 b2094e70..5186c38a 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 @@ -68,19 +68,21 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("uuid", uuidList); List invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper); - if (invoicesList == null || invoicesList.size() == 0) { - QueryWrapper salesQueryWrapper = new QueryWrapper<>(); - salesQueryWrapper.in("uuid", uuidList); - List saleRecordInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper); - if (saleRecordInvoices == null || saleRecordInvoices.size() == 0) { - return R.error(500, "未查询到发票信息，请重新查验"); + QueryWrapper salesQueryWrapper = new QueryWrapper<>(); + salesQueryWrapper.in("uuid", uuidList); + List saleInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper); + if (saleInvoices!=null && saleInvoices.size()>0) { + if (invoicesList == null || invoicesList.size() == 0) { + invoicesList = new ArrayList<>(); } - invoicesList = new ArrayList<>(); - for (SdnyTDxSaleRecordInvoice item : saleRecordInvoices) { + for (SdnyTDxSaleRecordInvoice item : saleInvoices) { SdnyTDxRecordInvoice invoice = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(item), SdnyTDxRecordInvoice.class); invoicesList.add(invoice); } } + if (invoicesList == null || invoicesList.size() == 0) { + return R.error(500, "未查询到发票信息，请重新查验"); + } if (invoicesList.size() != uuidList.size()) { StringBuffer msg = new StringBuffer(); Map invoiceMap = invoicesList.stream().collect(Collectors.toMap(SdnyTDxRecordInvoice::getUuid, v -> v)); @@ -97,19 +99,22 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { QueryWrapper detailQueryWrapper = new QueryWrapper<>(); detailQueryWrapper.in("uuid", uuidList); List detailList = detailDao.selectList(detailQueryWrapper); - if (detailList == null || detailList.size() == 0) { - QueryWrapper salesQueryWrapper = new QueryWrapper<>(); + if (saleInvoices != null && saleInvoices.size()>0) { + QueryWrapper salesDetailQueryWrapper = new QueryWrapper<>(); salesQueryWrapper.in("uuid", uuidList); - List salesDetailList = detailSalesDao.selectList(salesQueryWrapper); - if (salesDetailList == null || salesDetailList.size() == 0) { - return R.error(500,"未查询到发票明细信息，请重新查验"); + List salesDetailList = detailSalesDao.selectList(salesDetailQueryWrapper); + if (detailList == null || detailList.size() == 0) { + detailList = new ArrayList<>(); } - detailList = new ArrayList<>(); for (SdnyTDxRecordInvoiceDetailSales item : salesDetailList) { SdnyTDxRecordInvoiceDetail detail = JsonUtils.getInstance().parseObject(JSONObject.toJSONString(item), SdnyTDxRecordInvoiceDetail.class); detailList.add(detail); } } + if (detailList == null || detailList.size() == 0) { + return R.error(500,"未查询到发票明细信息，请重新查验"); + + } Map> detailiMap = new HashMap<>(); detailList.stream().forEach(item -> { List list = null; From 19cc5e41b2e8fc4dc86e54faf1b42c84600c5e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Wed, 20 Dec 2023 15:35:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=A8=E7=94=B5?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BB=A3=E7=A0=81=E5=8F=B7=E7=A0=81=E6=8B=86?= =?UTF-8?q?=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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 5186c38a..832f1308 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.FplxEnum; +import com.dxhy.common.enums.SNFplxEnum; import com.dxhy.common.utils.DateUtils; import com.dxhy.common.utils.R; import com.dxhy.erp.dao.*; @@ -235,6 +236,10 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { ZData zdata = new ZData(); zdata.setZFPDM(StringUtils.isBlank(item.getInvoiceCode())?"":item.getInvoiceCode()); zdata.setZFPHM(item.getInvoiceNo()); + if (SNFplxEnum.QDPP.getFplxDm().equals(item.getInvoiceType()) || SNFplxEnum.QDZP.getFplxDm().equals(item.getInvoiceType())) { + zdata.setZFPDM(""); + zdata.setZFPHM(item.getEleInvoiceNo()); + } zdata.setZFPLX(invoiceType); zdata.setZXFBM(item.getXfTaxNo()); zdata.setZGFBH(item.getGfTaxNo()); From 67dd48a88e5efd1d92791fa5632cf552d6c01eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Thu, 21 Dec 2023 09:31:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=94=80=E9=A1=B9?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/ImageSubmitServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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<>(); From 81169bfbb1bcd278154f2539e98421d23512f4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Fri, 22 Dec 2023 09:09:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=94=80=E9=A1=B9?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/ImageSubmitServiceImpl.java | 10 ++++++++-- 1 file changed, 8 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 8c347040..e89caa5c 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 @@ -307,7 +307,7 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { detail.setTaxRate(detail.getTaxRateOfSap().multiply(new BigDecimal(100)).setScale(4,BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString()); log.info("明细行数据：{}",JSONObject.toJSONString(detail)); BigDecimal totalAmount = new BigDecimal(detail.getDetailAmount()).add(new BigDecimal(detail.getTaxAmount())); - zDatas.add(ZData.builder() + ZData datas = ZData.builder() .ZBHSJE(detail.getDetailAmount()) .ZBHSJE_DIF("0") .ZBHSJE_Y(detail.getDetailAmount()) @@ -329,7 +329,13 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { .ZHWMC(detail.getGoodsName()) .ZTID(zdata.getZTID()) .ZSM(TaxRateCodeEnum.getCode(detail.getTaxRate())) - .build()); + .build(); + if (SNFplxEnum.QDPP.getFplxDm().equals(item.getInvoiceType()) || SNFplxEnum.QDZP.getFplxDm().equals(item.getInvoiceType())) { + datas.setZFPDM(""); + datas.setZFPHM(item.getEleInvoiceNo()); + } + zDatas.add(datas); + } String taxRate = ""; if (item.getDetailList().size() > 0) { From f3d6cc6d5a6acdd0a2ec66ae1f446bdad1b1a3a7 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Fri, 22 Dec 2023 17:06:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 e89caa5c..ef9f8cb5 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 @@ -76,7 +76,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService { 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) {