#

Junjie

2025-01-14 c4281fca922cfdda53dec5dfe79890db7671d19d

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

@@ -2,11 +2,17 @@

import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.param.CancelTaskParam;
import com.zy.asrs.domain.param.CompleteTaskParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

@Slf4j
@Service
@@ -14,6 +20,8 @@

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkLastnoService wrkLastnoService;

@@ -32,7 +40,7 @@
        int eNo = wrkLastno.getENo();
        workNo = workNo>=eNo ? sNo : workNo+1;
        while (true) {
            WrkMast wrkMast = wrkMastService.selectById(workNo);
            WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo);
            if (null != wrkMast) {
                workNo = workNo>=eNo ? sNo : workNo+1;
            } else {
@@ -48,7 +56,7 @@
        if (workNo == 0) {
            throw new CoolException("生成工作号失败，请联系管理员");
        } else {
            if (wrkMastService.selectById(workNo)!=null) {
            if (wrkMastService.selectByWorkNo(workNo)!=null) {
                throw new CoolException("生成工作号" + workNo + "在工作档中已存在");
            }
        }
@@ -69,4 +77,38 @@
        }
    }

    public boolean completeTask(CompleteTaskParam param) {
        Integer wrkNo = param.getWrkNo();
        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        if (null == wrkMast) {
            throw new CoolException("任务不存在");
        }

        if (wrkMast.getIoType() == WrkIoType.IN.id) {
            wrkMast.setWrkSts(WrkStsType.COMPLETE_INBOUND.sts);
        }else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
            wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
        } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_MOVE.id) {
            wrkMast.setWrkSts(WrkStsType.COMPLETE_MOVE.sts);
        } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
            wrkMast.setWrkSts(WrkStsType.COMPLETE_CHARGE.sts);
        }

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

    public boolean cancelTask(CancelTaskParam param) {
        Integer wrkNo = param.getWrkNo();
        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        if (null == wrkMast) {
            throw new CoolException("任务不存在");
        }

        wrkMastLogService.save(wrkNo);
        wrkMastService.deleteById(wrkNo);
        return true;
    }

}