#

Junjie

2 天以前 7e52962b703cdb572885cc394d039bc635d979fd

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -4,6 +4,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.Result.CancelTaskBatchResult;
import com.zy.asrs.domain.param.*;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.LocMast;
@@ -151,6 +152,16 @@
        return R.error("任务取消失败");
    }

    @PostMapping("/cancelTaskBatch")
    @OpenApiLog(memo = "任务批量取消")
    public R cancelTaskBatch(@RequestBody CancelTaskBatchParam param) {
        if (param == null) {
            return R.error("参数不能为空");
        }
        CancelTaskBatchResult result = commonService.cancelTaskBatch(param);
        return R.ok().add(result);
    }

    @PostMapping("/deviceStatus")
    // @OpenApiLog(memo = "获取设备状态")
    public R getDeviceStatus() {

 src/main/java/com/zy/asrs/domain/Result/CancelTaskBatchResult.java

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.domain.Result;

import lombok.Data;

import java.util.List;

@Data
public class CancelTaskBatchResult {

    private List<String> successList;

    private List<String> failList;

}

 src/main/java/com/zy/asrs/domain/param/CancelTaskBatchParam.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.domain.param;

import lombok.Data;

import java.util.List;

@Data
public class CancelTaskBatchParam {

    private List<CancelTaskParam> taskList;

}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.Result.CancelTaskBatchResult;
import com.zy.asrs.domain.param.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -129,12 +130,62 @@
            throw new CoolException("任务不存在");
        }

        boolean cancelSuccess = false;
        if (wrkMast.getIoType().equals(WrkIoType.IN.id) && !wrkMast.getWrkSts().equals(WrkStsType.NEW_INBOUND.sts)) {
            cancelSuccess = true;
        } 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;
        }

        if (cancelSuccess) {
            throw new CoolException("任务已执行，取消失败");
        }

        wrkMast.setMk("taskCancel");
        wrkMast.setModiTime(new Date());
        wrkMastService.updateById(wrkMast);
        return true;
    }

    public CancelTaskBatchResult cancelTaskBatch(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 cancelTaskParam : taskList) {
            if (cancelTaskParam == null) {
                throw new CoolException("任务参数不能为空");
            }

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

            if (cancelStatus) {
                successList.add(cancelTaskParam.getTaskNo());
            }else {
                failList.add(cancelTaskParam.getTaskNo());
            }
        }

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

    //移库任务
    public boolean createLocMoveTask(CreateLocMoveTaskParam param) {
        Date now = new Date();

 src/main/resources/docs/WCSÍⲿHTTP API½Ó¿ÚV1.8.docx

Binary files differ