From 5eef9609a1afd7d15fa56992927bce198966e8d9 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 31 Jul 2023 16:42:05 +0800 Subject: [PATCH 01/13] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=AE=A4=E8=AF=81=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java index 6df45393..ec38c406 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java @@ -146,7 +146,7 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl queryRecord = new QueryWrapper<>(); queryRecord.eq("uuid", uuid); BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord); - if (rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ + if (rdxRecordInvoice != null && rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString()); } if (rdxRecordInvoice != null) { From 7403e85f44e068e208db74cc5ecfd984d3ea1307 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 1 Aug 2023 14:12:31 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9FI847=E5=92=8CFI849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InvoiceAuthServiceImpl.java | 37 +++++++++++++------ .../service/impl/ReceiptOutServiceImpl.java | 1 + 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index 11c80b9e..2a7247bd 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -22,6 +22,7 @@ import com.dxhy.erp.service.InvoiceAuthService; import com.dxhy.erp.service.TDxInvoiceReimburseService; import com.dxhy.erp.utils.CheckUtils; import com.dxhy.erp.utils.DateUtil; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -346,11 +347,14 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl exitList = Lists.newArrayList(); + List notExit = Lists.newArrayList(); for (ZDATA zdata1 : zdata) { log.info("zdata1.getZFPHM()===>{}", zdata1.getZFPHM()); String collect = fplxList.stream().collect(Collectors.joining(",")); if (!collect.contains(convertFpzldm(zdata1.getZFPLX()))) { log.info("非增值税先不处理：{}", JSON.toJSONString(zdata1)); + exitList.add(zdata1); continue; } String fphm = zdata1.getZFPHM(); @@ -369,16 +373,18 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl 1) { - es.setZMESSAGE(errorMsg.toString() + "不存在"); - es.setZTYPE("E"); - return es; - } - log.info("zdata={}",zdata); - for (ZDATA zdata1 : zdata) { +// if (errorMsg.length() > 1) { +// es.setZMESSAGE(errorMsg.toString() + "不存在"); +// es.setZTYPE("E"); +// return es; +// } + log.info("exitList={}",exitList); + for (ZDATA zdata1 : exitList) { //成功或者失败标识 boolean flag = false; log.info("zdata1.getZFPHM():{}", zdata1.getZFPHM()); @@ -441,10 +447,17 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl0){ + es.setZTYPE("E"); + errorMsg.append("发票号码：").append(notExit).append("不存在,其余成功"); + es.setZMESSAGE(errorMsg.toString()); + }else { + es.setZMESSAGE("处理成功"); + zdataresp.setPROMSG(promsg.toString()); + zdataresp.setPROTYP("S"); + es.setZdata(zdataresp); + } } return es; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index c401c8c6..800aa6e4 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -62,6 +62,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl "0".equals(e.getRzhYesorno())).collect(Collectors.toList()); // second：根据uuids查询出转出明细并转为map，key=uuid ，value=转出明细 List outs = listByUuids(ids); Map outMap = From 01448b1d4d66cf91c46c3096831ab05b0c868807 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 1 Aug 2023 14:24:32 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9FI847=E5=92=8CFI849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/InterfaceController.java | 2 ++ .../dxhy/erp/service/impl/InvoiceAuthServiceImpl.java | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index a578f25a..7c6bd12b 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -45,6 +45,7 @@ import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author jiaohongyang @@ -1290,6 +1291,7 @@ public class InterfaceController extends AbstractController { es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); es.setZTYPE("S"); es.setZMESSAGE("处理成功"); + invoices = invoices.stream().filter(e->"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(invoices)){ es.setZTYPE("E"); es.setZMESSAGE("底账数据不存在"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index 2a7247bd..8aecbd60 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -378,11 +378,11 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl 1) { -// es.setZMESSAGE(errorMsg.toString() + "不存在"); -// es.setZTYPE("E"); -// return es; -// } + if (exitList.size() ==0) { + es.setZMESSAGE(errorMsg.append("发票号码").append(notExit).toString() + "不存在"); + es.setZTYPE("E"); + return es; + } log.info("exitList={}",exitList); for (ZDATA zdata1 : exitList) { //成功或者失败标识 From 6d4bc2935730bee1e9c635f677e21a4d86217d5e Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 1 Aug 2023 15:46:59 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9FI847=E5=92=8CFI849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 4 ++-- .../service/impl/InvoiceAuthServiceImpl.java | 22 +++++++++---------- .../service/impl/ReceiptOutServiceImpl.java | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 7c6bd12b..132100a7 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1291,10 +1291,10 @@ public class InterfaceController extends AbstractController { es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); es.setZTYPE("S"); es.setZMESSAGE("处理成功"); - invoices = invoices.stream().filter(e->"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); + invoices = invoices.stream().filter(e->!"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(invoices)){ es.setZTYPE("E"); - es.setZMESSAGE("底账数据不存在"); + es.setZMESSAGE("底账数据不存在可转出发票"); outPut.setES_OUTPUT(es); try { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index 8aecbd60..9ba13a1f 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -447,17 +447,17 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl0){ - es.setZTYPE("E"); - errorMsg.append("发票号码：").append(notExit).append("不存在,其余成功"); - es.setZMESSAGE(errorMsg.toString()); - }else { - es.setZMESSAGE("处理成功"); - zdataresp.setPROMSG(promsg.toString()); - zdataresp.setPROTYP("S"); - es.setZdata(zdataresp); - } + } + //判断是否有底账库不存在发票 + if(notExit.size()>0){ + es.setZTYPE("E"); + errorMsg.append("发票号码：").append(notExit).append("不存在,其余成功"); + es.setZMESSAGE(errorMsg.toString()); + }else { + es.setZMESSAGE("处理成功"); + zdataresp.setPROMSG(promsg.toString()); + zdataresp.setPROTYP("S"); + es.setZdata(zdataresp); } return es; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index 800aa6e4..4d37947c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -62,7 +62,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl "0".equals(e.getRzhYesorno())).collect(Collectors.toList()); + invoices = invoices.stream().filter(e -> !"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); // second：根据uuids查询出转出明细并转为map，key=uuid ，value=转出明细 List outs = listByUuids(ids); Map outMap = From f7bc3117b6f40d01a59c54ef1adb699fce4afe2b Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 1 Aug 2023 17:34:42 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9FI849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 87 ++++++++++++++----- .../service/impl/ReceiptOutServiceImpl.java | 3 +- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 132100a7..6b3db213 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1278,37 +1278,78 @@ public class InterfaceController extends AbstractController { "/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "transferOut"); transferOutRecord.setBzdh(JSONObject.toJSONString(bzdhs)); - for(Map map:list){ - String invoiceCode =(String) map.get("ZFPDM"); - String invoiceNo = (String)map.get("ZFPHM"); - String uuid = invoiceCode+invoiceNo; - String[] ids = uuid.split(","); - DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ); - List invoices = baseIReceiptInvoiceService.selectByUuids(ids); + boolean fphmNotBlank = list.stream().allMatch(e -> StringUtils.isNotBlank((String)e.get("ZFPHM"))); + boolean fpdmNotBlank = list.stream().allMatch(e -> StringUtils.isNotBlank((String)e.get("ZFPDM"))); + if (!fpdmNotBlank || !fphmNotBlank){ OutPut outPut = new OutPut(); EsOutPutResp es = new EsOutPutResp(); es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); - es.setZTYPE("S"); - es.setZMESSAGE("处理成功"); - invoices = invoices.stream().filter(e->!"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(invoices)){ - es.setZTYPE("E"); - es.setZMESSAGE("底账数据不存在可转出发票"); - outPut.setES_OUTPUT(es); - - try { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); - requestRecordService.saveFailedRequestRecord(transferOutRecord, 0, JsonUtils.getInstance().toJsonString(outPut), - es.getZMESSAGE()); - } catch (Exception e) { - log.error("FI849接口记录保存失败，errormsg:{}",e); - } + es.setZTYPE("E"); + es.setZMESSAGE("传入数据存在没有发票号码或发票代码问题"); + outPut.setES_OUTPUT(es); + return JsonUtils.getInstance().toJsonString(outPut); + } - return JsonUtils.getInstance().toJsonString(outPut); + StringBuilder uuids = new StringBuilder(); + for (int i = 0; i < list.size(); i++) { + String invoiceCode =(String) list.get(i).get("ZFPDM"); + String invoiceNo = (String)list.get(i).get("ZFPHM"); + uuids.append(invoiceCode).append(invoiceNo); + if (i invoices = baseIReceiptInvoiceService.selectByUuids(ids); + log.info("849查询到发票信息{}",invoices); + invoices = invoices.stream().filter(e->!"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); + log.info("过滤后发票信息{}",invoices); + if (CollectionUtils.isEmpty(invoices)){ + OutPut outPut = new OutPut(); + EsOutPutResp es = new EsOutPutResp(); + es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); + es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); + es.setZTYPE("E"); + es.setZMESSAGE("底账数据不存在可转出发票"); + outPut.setES_OUTPUT(es); + return JsonUtils.getInstance().toJsonString(outPut); + } + +// for(Map map:list){ +// String invoiceCode =(String) map.get("ZFPDM"); +// String invoiceNo = (String)map.get("ZFPHM"); +// String uuid = invoiceCode+invoiceNo; +// String[] ids = uuid.split(","); +// DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ); +// List invoices = baseIReceiptInvoiceService.selectByUuids(ids); +// OutPut outPut = new OutPut(); +// EsOutPutResp es = new EsOutPutResp(); +// es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); +// es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); +// es.setZTYPE("S"); +// es.setZMESSAGE("处理成功"); +// +// if(CollectionUtils.isEmpty(invoices)){ +// es.setZTYPE("E"); +// es.setZMESSAGE("底账数据不存在可转出发票"); +// outPut.setES_OUTPUT(es); +// +// try { +// DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); +// requestRecordService.saveFailedRequestRecord(transferOutRecord, 0, JsonUtils.getInstance().toJsonString(outPut), +// es.getZMESSAGE()); +// } catch (Exception e) { +// log.error("FI849接口记录保存失败，errormsg:{}",e); +// } +// +// return JsonUtils.getInstance().toJsonString(outPut); +// } +// } + try{ /** diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index 4d37947c..baf9e55b 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -52,7 +52,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl invoices = baseIReceiptInvoiceService.selectByUuids(ids); From 4c00abc2f8d9e8fe41f0d62cac6298a05702997f Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 1 Aug 2023 18:01:41 +0800 Subject: [PATCH 06/13] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=A8=8E=E7=8E=87=E4=B8=BA=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=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/SignSaveInvoiceInfoServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index 6cdb85ae..7a8814de 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -1,6 +1,5 @@ package com.dxhy.erp.service.impl; -import com.aisinopdf.text.pdf.B; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -328,7 +327,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Tue, 1 Aug 2023 19:12:47 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9FI849?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/common/constant/TransferContant.java | 15 ++++ .../erp/controller/InterfaceController.java | 88 ++++++++----------- .../dxhy/erp/service/IReceiptOutService.java | 2 +- .../impl/BaseIReceiptInvoiceServiceImpl.java | 3 +- .../service/impl/ReceiptOutServiceImpl.java | 21 ++--- 5 files changed, 61 insertions(+), 68 deletions(-) create mode 100644 dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java diff --git a/dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java b/dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java new file mode 100644 index 00000000..3ebe73ec --- /dev/null +++ b/dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java @@ -0,0 +1,15 @@ +package com.dxhy.common.constant; + +public class TransferContant { + + public static final String SUCCESS = "SUCCESS"; + + public static final String INVOICE_NO_NOT_EXIT = "INVOICE_NO_NOT_EXIT"; + + public static final String INVOICE_NOT_EXIT = "INVOICE_NOT_EXIT"; + + public static final String NOT_RZ = "NOT_RZ"; + + public static final String CANCEL_SUCCESS = "CANCEL_SUCCESS"; + +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 6b3db213..bb092d58 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -2,11 +2,13 @@ package com.dxhy.erp.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.druid.sql.ast.statement.SQLIfStatement; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.constant.ConfigureConstant; import com.dxhy.common.constant.ConfigurerInfo; import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.constant.TransferContant; import com.dxhy.common.controller.AbstractController; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.RespStatusEnum; @@ -30,6 +32,7 @@ import com.dxhy.erp.utils.HmacSHA1Util; import com.dxhy.erp.utils.JsonUtils; import com.dxhy.erp.utils.OpenApiUtils; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Lists; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; @@ -1278,46 +1281,6 @@ public class InterfaceController extends AbstractController { "/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "transferOut"); transferOutRecord.setBzdh(JSONObject.toJSONString(bzdhs)); - boolean fphmNotBlank = list.stream().allMatch(e -> StringUtils.isNotBlank((String)e.get("ZFPHM"))); - boolean fpdmNotBlank = list.stream().allMatch(e -> StringUtils.isNotBlank((String)e.get("ZFPDM"))); - if (!fpdmNotBlank || !fphmNotBlank){ - OutPut outPut = new OutPut(); - EsOutPutResp es = new EsOutPutResp(); - es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); - es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); - es.setZTYPE("E"); - es.setZMESSAGE("传入数据存在没有发票号码或发票代码问题"); - outPut.setES_OUTPUT(es); - return JsonUtils.getInstance().toJsonString(outPut); - } - - StringBuilder uuids = new StringBuilder(); - for (int i = 0; i < list.size(); i++) { - String invoiceCode =(String) list.get(i).get("ZFPDM"); - String invoiceNo = (String)list.get(i).get("ZFPHM"); - uuids.append(invoiceCode).append(invoiceNo); - if (i invoices = baseIReceiptInvoiceService.selectByUuids(ids); - log.info("849查询到发票信息{}",invoices); - invoices = invoices.stream().filter(e->!"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); - log.info("过滤后发票信息{}",invoices); - if (CollectionUtils.isEmpty(invoices)){ - OutPut outPut = new OutPut(); - EsOutPutResp es = new EsOutPutResp(); - es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); - es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); - es.setZTYPE("E"); - es.setZMESSAGE("底账数据不存在可转出发票"); - outPut.setES_OUTPUT(es); - return JsonUtils.getInstance().toJsonString(outPut); - } // for(Map map:list){ // String invoiceCode =(String) map.get("ZFPDM"); @@ -1354,13 +1317,21 @@ public class InterfaceController extends AbstractController { try{ /** * 根据金额判断是转入还是转出 - * - * */ + String transfer =""; + + List invoiceNoNotExit = Lists.newArrayList(); + List invoiceNotExit = Lists.newArrayList(); + List notRz = Lists.newArrayList(); + List success = Lists.newArrayList(); for(Map map:list) { String invoiceCode =(String) map.get("ZFPDM"); String invoiceNo = (String)map.get("ZFPHM"); + if (StringUtils.isBlank(invoiceNo)){ + invoiceNoNotExit.add((String)map.get("ID")); + continue; + } BigDecimal bigDecimal = (BigDecimal) map.get("JXSZC"); String outReason = (String)map.get("ZZCYY"); String outTaxPeriod = (String)map.get("BUDAT"); @@ -1373,20 +1344,21 @@ public class InterfaceController extends AbstractController { baseInvoiceEditVO.setOutTaxPeriod(outTaxPeriod); UserInfo userInfo = new UserInfo(); if(bigDecimal.compareTo(BigDecimal.ZERO)==1){ - transfer = iReceiptOutService.transfer(erpInvoiceData,baseInvoiceEditVO, userInfo); + transfer = iReceiptOutService.transfer(baseInvoiceEditVO, userInfo); + if (TransferContant.INVOICE_NOT_EXIT.equals(transfer)){ + invoiceNotExit.add((String)map.get("ZFPHM")); + }else if (TransferContant.NOT_RZ.equals(transfer)){ + notRz.add((String)map.get("ZFPHM")); + }else if (TransferContant.SUCCESS.equals(transfer)){ + success.add((String)map.get("ZFPHM")); + } + }else { BaseReceiptOutCancelEditReqVO baseReceiptOutCancelEditReqVO = new BaseReceiptOutCancelEditReqVO(); baseReceiptOutCancelEditReqVO.setPrimaryKey(uuid); String s = baseIReceiptInvoiceService.cancelOut(baseReceiptOutCancelEditReqVO); - if(s.equals("取消转出成功")){ - OutPut outPut = new OutPut(); - EsOutPutResp es = new EsOutPutResp(); - es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); - es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); - es.setZTYPE("S"); - es.setZMESSAGE("处理成功"); - outPut.setES_OUTPUT(es); - transfer = JsonUtils.getInstance().toJsonString(outPut); + if(TransferContant.CANCEL_SUCCESS.equals(s)){ + success.add((String)map.get("ZFPHM")); } } } @@ -1398,7 +1370,17 @@ public class InterfaceController extends AbstractController { log.error("FI849接口记录保存失败，errormsg:{}",e); } - return transfer; + StringBuilder message = new StringBuilder(); + message.append("ID:").append(invoiceNoNotExit).append("的发票未传入发票号码,").append("发票号码:") + .append(invoiceNotExit).append("的发票不存在,").append("发票号码:").append(notRz).append("的发票未认证,") + .append("发票号码:").append(success).append("处理成功"); + OutPut outPut = new OutPut(); + EsOutPutResp es = new EsOutPutResp(); + es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY()); + es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); + es.setZTYPE("S"); + es.setZMESSAGE(message.toString()); + return JsonUtils.getInstance().toJsonString(outPut); }catch (Exception e){ log.error("error", e); OutPut outPut = new OutPut(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java index 565291f6..01f71d7d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/IReceiptOutService.java @@ -10,5 +10,5 @@ import com.dxhy.erp.model.ErpInvoiceData; */ public interface IReceiptOutService { - String transfer(ErpInvoiceData erpInvoiceData, BaseInvoiceEditVO baseInvoiceEditVO, UserInfo userInfo); + String transfer(BaseInvoiceEditVO baseInvoiceEditVO, UserInfo userInfo); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java index e873db33..4594ec06 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.constant.TransferContant; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.JxszcCancelEnum; import com.dxhy.common.enums.JxszcZtEnum; @@ -68,7 +69,7 @@ public class BaseIReceiptInvoiceServiceImpl extends MpBaseServiceImpl invoices = baseIReceiptInvoiceService.selectByUuids(ids); if(CollectionUtils.isEmpty(invoices)){ - es.setZTYPE("E"); - es.setZMESSAGE("底账数据不存在"); - outPut.setES_OUTPUT(es); - return JsonUtils.getInstance().toJsonString(outPut); + return TransferContant.INVOICE_NOT_EXIT; } invoices = invoices.stream().filter(e -> !"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(invoices)){ + return TransferContant.NOT_RZ; + } // second：根据uuids查询出转出明细并转为map，key=uuid ，value=转出明细 List outs = listByUuids(ids); Map outMap = @@ -87,8 +82,8 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl Date: Wed, 2 Aug 2023 14:00:23 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E5=8E=BB=E6=8E=89=E7=A9=BA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=92=8Cnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml b/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml index 119d1721..7c14a18b 100644 --- a/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml +++ b/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml @@ -15,6 +15,8 @@ where company = #{company} and org_type = '5' and del_flag = '0' + and taxno != '' + and taxno is not null From 1d03dbbfd30bd5bc07c9e810dc86066e2dcea5d3 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 3 Aug 2023 10:50:57 +0800 Subject: [PATCH 10/13] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E9=87=87?= =?UTF-8?q?=E9=9B=86=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA&=E4=BE=9B=E5=BA=94=E5=95=86=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/base/controller/BaseFpcjController.java | 2 +- .../com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java index f6422611..7f0aa28f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java @@ -128,7 +128,7 @@ public class BaseFpcjController extends AbstractController { return ResponseEntity.ok(R.error("购方信息不能为空！")); } if (StringUtils.isNotBlank(cjrq)) { - cjrq = DateUtils.getNight(DateUtils.strToDate(cjrq)); +// cjrq = DateUtils.getNight(DateUtils.strToDate(cjrq)); pramsMap.put("cjrq", cjrq); } else { return ResponseEntity.ok(R.error("采集日期不能为空！")); diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java index db47982d..dd44c898 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java @@ -172,7 +172,7 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl risks = new ArrayList<>(); From 60be3c31bd4c62a3f1632e3d4c6e8a5dbf38bcd2 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 4 Aug 2023 14:48:17 +0800 Subject: [PATCH 11/13] =?UTF-8?q?fi847=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=9D=A1=E6=95=B0=E5=92=8C=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index 9ba13a1f..0c1ce50c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -379,7 +379,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl0){ es.setZTYPE("E"); - errorMsg.append("发票号码：").append(notExit).append("不存在,其余成功"); + errorMsg.append("成功"+exitList.size()+"条,").append("失败"+notExit.size()+"条,").append("失败原因:发票号码：").append(notExit).append("不存在,其余成功"); es.setZMESSAGE(errorMsg.toString()); }else { - es.setZMESSAGE("处理成功"); + es.setZMESSAGE("处理成功"+exitList.size()+"条"); zdataresp.setPROMSG(promsg.toString()); zdataresp.setPROTYP("S"); es.setZdata(zdataresp); From ece892998350d981529aa55f4fde6e429dcc7fbd Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 4 Aug 2023 14:57:58 +0800 Subject: [PATCH 12/13] =?UTF-8?q?fi849=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/controller/InterfaceController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index bb092d58..803200c0 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1380,6 +1380,7 @@ public class InterfaceController extends AbstractController { es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); es.setZTYPE("S"); es.setZMESSAGE(message.toString()); + outPut.setES_OUTPUT(es); return JsonUtils.getInstance().toJsonString(outPut); }catch (Exception e){ log.error("error", e); From 4df2bc6b3065ff4110afe89351b3a0d597f62851 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 4 Aug 2023 15:24:29 +0800 Subject: [PATCH 13/13] =?UTF-8?q?fi849=E8=BF=94=E5=9B=9E=E6=8A=A5=E6=96=87?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/InterfaceController.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 803200c0..70474ab8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1371,9 +1371,18 @@ public class InterfaceController extends AbstractController { } StringBuilder message = new StringBuilder(); - message.append("ID:").append(invoiceNoNotExit).append("的发票未传入发票号码,").append("发票号码:") - .append(invoiceNotExit).append("的发票不存在,").append("发票号码:").append(notRz).append("的发票未认证,") - .append("发票号码:").append(success).append("处理成功"); + if (invoiceNoNotExit.size()>0){ + message.append("ID:").append(invoiceNoNotExit).append("的发票未传入发票号码。"); + } + if (invoiceNotExit.size()>0){ + message.append("发票号码:").append(invoiceNotExit).append("的发票不存在。"); + } + if (notRz.size()>0){ + message.append("发票号码:").append(notRz).append("的发票未认证。"); + } + if (success.size()>0){ + message.append("发票号码:").append(success).append("处理成功"); + } OutPut outPut = new OutPut(); EsOutPutResp es = new EsOutPutResp(); es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY());