1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败

zwl

昨天 13d295c4210ee589b3e524bd157f85c63bca5a3e

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

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -43,12 +40,16 @@
    @Autowired
    private BasArmMastLogService basArmMastLogService;
    @Autowired
    private BasAgvMastLogService basAgvMastLogService;
    @Autowired
    private BasArmMastService basArmMastService;

    @Autowired
    private BasAgvMastService basAgvMastService;
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            int wrkDetlCount = Cools.isEmpty(wrkDetls) ? 0 : wrkDetls.size();
            // 修改订单状态 作业中 ===>> 已完成
            if (!Cools.isEmpty(wrkDetls)) {
                Iterator<WrkDetl> iterator = wrkDetls.iterator();
@@ -109,17 +110,17 @@
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 保存工作明细档历史档
            if (wrkDetlCount > 0 && !wrkDetlLogService.save(wrkMast.getWrkNo())) {
                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 删除工作主档
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            // 保存工作明细档历史档
            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());
            if (wrkDetlCount > 0 && !wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
@@ -133,8 +134,9 @@
    @Transactional
    public ReturnT<String> startArm(BasArmMast basArmMast) {
        try {
            BasArmMastLog basArmMastLog = new BasArmMastLog(basArmMast);
            // 保存工作主档历史档
            if (!basArmMastLogService.save(basArmMast.getId())) {
            if (!basArmMastLogService.insert(basArmMastLog)) {
                exceptionHandle("保存ARM工作历史档[id={0}]失败", basArmMast.getId());
            }
            // 删除工作主档
@@ -150,4 +152,25 @@
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> startAgv(BasAgvMast basAgvMast) {
        try {
            BasAgvMastLog basAgvMastLog = new BasAgvMastLog(basAgvMast);
            // 保存工作主档历史档
            if (!basAgvMastLogService.insert(basAgvMastLog)) {
                exceptionHandle("保存ARM工作历史档[id={0}]失败", basAgvMast.getId());
            }
            // 删除工作主档
            if (!basAgvMastService.deleteById(basAgvMast)) {
                exceptionHandle("删除ARM工作主档[id={0}]失败", basAgvMast.getId());
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }

}