#

LSH

2022-08-12 a3e7e923289c8909c3ee1b393ecadf501091ffcc

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -67,9 +67,9 @@
        try {
            ReturnT<String> result = null;
            if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
                result = postMesData(wrkMast,inpath);
                result = postMesData(wrkMast,inpath,1);
            } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
                result = postMesData(wrkMast,outPath);
                result = postMesData(wrkMast,outPath,2);
            }
            if(null != result && !result.isSuccess()){
                return result;
@@ -100,7 +100,7 @@
        return SUCCESS;
    }

    private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath){
    private ReturnT<String> postMesData(WrkMast wrkMast, String mesPath,int a){
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        if(wrkDetl != null){
            CombParam combParam = new CombParam();
@@ -126,9 +126,9 @@
                    throw new CoolException("上报mes系统失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
                /*log.error("fail", e);
//                      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg(e.getMessage());
                return FAIL.setMsg(e.getMessage());*/
            } finally {
                try {
                    // 保存接口日志