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 3923d86a..04c0a933 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,22 +1439,25 @@ 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()); - if (collect.size() > 0) { - es.setZTYPE("E"); - es.setZMESSAGE("发票未认证不可转出"); - outPut.setES_OUTPUT(es); - log.info("进项税转出传入发票存在未认证发票"); - 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"); 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); }