#取消出库优化

Junjie

1 天以前 9079c4f09f4c267576638b5f41c8aa695742a66a

 src/main/java/com/zy/common/service/CommonService.java

@@ -20,6 +20,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Comparator;
@@ -124,7 +125,8 @@
        return true;
    }

    public boolean cancelTask(CancelTaskParam param, boolean allowDirectCancel) {
    @Transactional
    public boolean cancelTask(CancelTaskParam param) {
        WrkMast wrkMast = null;
        Integer wrkNo = param.getWrkNo();
        String taskNo = param.getTaskNo();//wms任务号
@@ -139,17 +141,6 @@

        if (null == wrkMast) {
            throw new CoolException("任务不存在");
        }

        if (allowDirectCancel) {
            boolean updated = wrkMastService.update(null, new UpdateWrapper<WrkMast>()
                    .eq("wrk_no", wrkMast.getWrkNo())
                    .set("mk", "taskCancel")
                    .set("modi_time", new Date()));
            if (!updated) {
                throw new CoolException("任务取消失败");
            }
            return true;
        }

        Long expectedWrkSts;
@@ -176,6 +167,34 @@
                .set("modi_time", new Date()));
        if (!updated) {
            throw new CoolException("任务状态已变化，取消失败");
        }
        return true;
    }

    @Transactional
    public boolean forceCancelTask(CancelTaskParam param) {
        WrkMast wrkMast = null;
        Integer wrkNo = param.getWrkNo();
        String taskNo = param.getTaskNo();//wms任务号

        if (wrkNo == null) {
            if (!Cools.isEmpty(taskNo)) {
                wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
            }
        } else {
            wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        }

        if (wrkMast == null) {
            throw new CoolException("任务不存在");
        }

        boolean updated = wrkMastService.update(null, new UpdateWrapper<WrkMast>()
                .eq("wrk_no", wrkMast.getWrkNo())
                .set("mk", "taskForceCancel")
                .set("modi_time", new Date()));
        if (!updated) {
            throw new CoolException("任务强制取消失败");
        }
        return true;
    }
@@ -282,10 +301,6 @@
    }

    public CancelTaskBatchResult cancelTaskBatch(CancelTaskBatchParam param) {
        return cancelTaskBatch(param, false);
    }

    public CancelTaskBatchResult cancelTaskBatch(CancelTaskBatchParam param, boolean allowDirectCancel) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }
@@ -305,7 +320,7 @@

            boolean cancelStatus = false;
            try {
                cancelStatus = cancelTask(cancelTaskParam, allowDirectCancel);
                cancelStatus = cancelTask(cancelTaskParam);
            } catch (Exception e) {
            }