#

LSH

2022-08-12 e846633fef8654e346c0a82655abeb3411b3085c

#

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

@@ -65,15 +65,15 @@
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            ReturnT<String> result = null;
            if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
                result = postMesData(wrkMast,inpath,1);
            } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
                result = postMesData(wrkMast,outPath,2);
            }
            if(null != result && !result.isSuccess()){
                return result;
            }
//            ReturnT<String> result = null;
//            if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
//                result = postMesData(wrkMast,inpath,1);
//            } else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
//                result = postMesData(wrkMast,outPath,2);
//            }
//            if(null != result && !result.isSuccess()){
//                return result;
//            }

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -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 {
                    // 保存接口日志