Merge remote-tracking branch 'origin/FI849Log' into release

2 years ago · 255c794660
parent b8b68a064e 12f1858d53
commit 255c794660
1 changed files with 2 additions and 1 deletions
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
@ -1465,9 +1465,10 @@ public class InterfaceController extends AbstractController {
            iReceiptOutService.transferOrcancelOut(zdatans,userInfo);
            es.setZTYPE("S");
            es.setZMESSAGE("操作成功");
+            outPut.setES_OUTPUT(es);
            log.info("进项税转出成功");
            log.info("FI849返回报文：{}",JsonUtils.getInstance().toJsonString(outPut));
-            return JsonUtils.getInstance().toJsonString(es);
+            return JsonUtils.getInstance().toJsonString(outPut);
        }catch(RuntimeException e){
            log.error("error", e);
            OutPut outPut = new OutPut();