From a4ee0f840454a3f9102464428a49ec2623512771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 4 Dec 2023 15:58:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/InterfaceController.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 d7a954cf..8f60441a 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 @@ -1425,6 +1425,7 @@ public class InterfaceController extends AbstractController { es.setZMESSAGE("发票号码不能为空"); outPut.setES_OUTPUT(es); log.info("进项税转出传入发票存在没有发票号码发票"); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } StringBuilder uuids = new StringBuilder(); @@ -1438,6 +1439,7 @@ public class InterfaceController extends AbstractController { es.setZMESSAGE("发票在发票系统中不存在"); outPut.setES_OUTPUT(es); log.info("进项税转出传入发票在发票系统中不存在"); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } List collect = tDxRecordInvoices.stream().filter(e -> "0".equals(e.getRzhYesorno())).collect(Collectors.toList()); @@ -1446,6 +1448,7 @@ public class InterfaceController extends AbstractController { es.setZMESSAGE("发票未认证不可转出"); outPut.setES_OUTPUT(es); log.info("进项税转出传入发票存在未认证发票"); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } List collect1 = tDxRecordInvoices.stream().filter(e -> BigDecimal.ZERO.compareTo(e.getTaxAmount()) > 0).collect(Collectors.toList()); @@ -1454,6 +1457,7 @@ public class InterfaceController extends AbstractController { es.setZMESSAGE("税额小于零不可转出"); outPut.setES_OUTPUT(es); log.info("进项税转出传入发票存在税额小于零发票"); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } //进项税转出或者取消转出 @@ -1462,10 +1466,10 @@ public class InterfaceController extends AbstractController { es.setZTYPE("Y"); es.setZMESSAGE("操作成功"); log.info("进项税转出成功"); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(es); }catch(RuntimeException e){ - e.printStackTrace(); - log.error("error", e.getMessage()); + log.error("error", e); OutPut outPut = new OutPut(); EsOutPutResp es = new EsOutPutResp(); es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); @@ -1473,10 +1477,10 @@ public class InterfaceController extends AbstractController { es.setZTYPE("E"); es.setZMESSAGE(e.getMessage()); outPut.setES_OUTPUT(es); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } catch (Exception e){ - e.printStackTrace(); - log.error("error", e.getMessage()); + log.error("error",e); OutPut outPut = new OutPut(); EsOutPutResp es = new EsOutPutResp(); es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); @@ -1484,6 +1488,7 @@ public class InterfaceController extends AbstractController { es.setZTYPE("E"); es.setZMESSAGE("系统内部错误"); outPut.setES_OUTPUT(es); + log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } From 6446cea6bef829e1b2baa4520c515e4ad23bcd05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 5 Dec 2023 11:14:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E7=A8=8E=E8=BD=AC?= =?UTF-8?q?=E5=87=BA=E5=8E=BB=E6=8E=89=E8=AE=A4=E8=AF=81=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 8f60441a..b0772485 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 @@ -1442,15 +1442,15 @@ public class InterfaceController extends AbstractController { log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); return JsonUtils.getInstance().toJsonString(outPut); } - List collect = tDxRecordInvoices.stream().filter(e -> "0".equals(e.getRzhYesorno())).collect(Collectors.toList()); - if (collect.size() > 0) { - es.setZTYPE("E"); - es.setZMESSAGE("发票未认证不可转出"); - outPut.setES_OUTPUT(es); - log.info("进项税转出传入发票存在未认证发票"); - log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); - return JsonUtils.getInstance().toJsonString(outPut); - } +// List collect = tDxRecordInvoices.stream().filter(e -> "0".equals(e.getRzhYesorno())).collect(Collectors.toList()); +// if (collect.size() > 0) { +// es.setZTYPE("E"); +// es.setZMESSAGE("发票未认证不可转出"); +// outPut.setES_OUTPUT(es); +// log.info("进项税转出传入发票存在未认证发票"); +// log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut)); +// return JsonUtils.getInstance().toJsonString(outPut); +// } List collect1 = tDxRecordInvoices.stream().filter(e -> BigDecimal.ZERO.compareTo(e.getTaxAmount()) > 0).collect(Collectors.toList()); if (collect1 != null && collect1.size()>0){ es.setZTYPE("E");