#地图编辑路径联通性导致算法计算失败问题修复

Junjie

1 天以前 ed266efb662c5b8460ecc22e31a070a718f35f9c

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

@@ -1,6 +1,7 @@
package com.zy.common.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.Result.CancelTaskBatchResult;
@@ -112,6 +113,8 @@
            wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
        } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
            wrkMast.setWrkSts(WrkStsType.COMPLETE_LOC_MOVE.sts);
        } else if (wrkMast.getIoType() == WrkIoType.CRN_MOVE.id) {
            wrkMast.setWrkSts(WrkStsType.COMPLETE_CRN_MOVE.sts);
        }

        wrkMast.setModiTime(new Date());
@@ -142,6 +145,8 @@
        } else if (wrkMast.getIoType().equals(WrkIoType.OUT.id) && !wrkMast.getWrkSts().equals(WrkStsType.NEW_OUTBOUND.sts)) {
            cancelSuccess = true;
        } else if (wrkMast.getIoType().equals(WrkIoType.LOC_MOVE.id) && !wrkMast.getWrkSts().equals(WrkStsType.NEW_LOC_MOVE.sts)) {
            cancelSuccess = true;
        } else if (wrkMast.getIoType().equals(WrkIoType.CRN_MOVE.id) && !wrkMast.getWrkSts().equals(WrkStsType.NEW_CRN_MOVE.sts)) {
            cancelSuccess = true;
        }

@@ -182,6 +187,80 @@
        return true;
    }

    public CancelTaskBatchResult cancelOutTaskBatchInfo(CancelTaskBatchParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }
        List<CancelTaskParam> taskList = param.getTaskList();
        if (taskList == null || taskList.isEmpty()) {
            throw new CoolException("任务参数列表为空");
        }

        List<String> successList = new ArrayList<>();
        List<String> failList = new ArrayList<>();
        for (CancelTaskParam taskParam : taskList) {
            if (taskParam == null) {
                throw new CoolException("任务参数不能为空");
            }
            boolean cancelStatus = false;
            try {
                cancelStatus = cancelSingleOutTaskBatchInfo(taskParam);
            } catch (Exception e) {
            }

            if (cancelStatus) {
                successList.add(resolveTaskIdentifier(taskParam));
            } else {
                failList.add(resolveTaskIdentifier(taskParam));
            }
        }

        CancelTaskBatchResult result = new CancelTaskBatchResult();
        result.setSuccessList(successList);
        result.setFailList(failList);
        return result;
    }

    private boolean cancelSingleOutTaskBatchInfo(CancelTaskParam param) {
        WrkMast wrkMast = null;
        Integer wrkNo = param.getWrkNo();
        String taskNo = param.getTaskNo();
        if (wrkNo == null) {
            if (Cools.isEmpty(taskNo)) {
                throw new CoolException("WMS任务号不能为空");
            }
            wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
        } else {
            wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        }
        if (wrkMast == null) {
            throw new CoolException("任务不存在");
        }
        if (!wrkMast.getIoType().equals(WrkIoType.OUT.id)) {
            throw new CoolException("仅支持出库任务");
        }

        boolean updated = wrkMast.getWrkNo() != null && wrkMastService.update(null, new UpdateWrapper<WrkMast>()
                .eq("wrk_no", wrkMast.getWrkNo())
                .set("batch", null)
                .set("batch_seq", null)
                .set("modi_time", new Date()));
        if (!updated) {
            throw new CoolException("取消出库任务批次和批次序号失败");
        }
        return true;
    }

    private String resolveTaskIdentifier(CancelTaskParam param) {
        if (!Cools.isEmpty(param.getTaskNo())) {
            return param.getTaskNo();
        }
        if (param.getWrkNo() != null) {
            return String.valueOf(param.getWrkNo());
        }
        return "";
    }

    public CancelTaskBatchResult cancelTaskBatch(CancelTaskBatchParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");