#

zhou zhou

2 天以前 c2f6a9f9ecf61c873bd53b09d00c6a8950e91f45

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -38,7 +39,7 @@
    @Autowired
    private OrderService orderService;

    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -107,12 +108,14 @@
            wrkMastLog.setModiTime(now);
            wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
            if (!wrkMastLogService.insert(wrkMastLog)){
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
                throw new CoolException("保存工作历史档[workNo={0}]失败");
//                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }

            // 删除工作主档
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
//                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
                throw new CoolException("删除工作主档[workNo={0}]失败");
            }
            // 保存工作明细档历史档
            List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -121,22 +124,18 @@
                wrkDetlLog.sync(wrkDetl);
                wrkDetlLog.setModiTime(now);
                if (!wrkDetlLogService.insert(wrkDetlLog)){
                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    throw new CoolException("保存工作明细历史档[workNo={0}]失败");
                }
            });

//            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
////                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
            // 删除工作明细档
            if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
                throw new CoolException("删除工作明细档[workNo={0}]失败");
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
            throw new CoolException("处理工作档转历史失败");
        }
        return SUCCESS;
    }