#

Junjie

5 小时以前 b6428016edf3de843020bc95fd1708d3bb1961e5

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service("wrkMastService")
@@ -45,7 +49,29 @@

    @Override
    public List<WrkMast> selectWrkByLev(Integer lev) {
        return this.baseMapper.selectWrkByLev("%" + lev);
        ArrayList<WrkMast> currentLevList = new ArrayList<>();
        List<WrkMast> wrkMasts = this.baseMapper.selectList(new EntityWrapper<WrkMast>());
        for (WrkMast wrkMast : wrkMasts) {
            int wrkLev;
            if (wrkMast.getIoType() == WrkIoType.IN.id) {
                wrkLev = Utils.getLev(wrkMast.getLocNo());
            } else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
                wrkLev = Utils.getLev(wrkMast.getSourceLocNo());
            } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_MOVE.id) {
                wrkLev = Utils.getLev(wrkMast.getLocNo());
            } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
                wrkLev = Utils.getLev(wrkMast.getLocNo());
            } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
                wrkLev = Utils.getLev(wrkMast.getLocNo());
            } else {
                throw new CoolException("未知任务类型");
            }

            if (wrkLev == lev) {
                currentLevList.add(wrkMast);
            }
        }
        return currentLevList;
    }

    @Override
@@ -85,8 +111,8 @@
                , WrkStsType.OUTBOUND_LIFT_RUN_COMPLETE.sts

                , WrkStsType.NEW_MOVE.sts
                , WrkStsType.MOVE_SITE.sts
                , WrkStsType.MOVE_SITE_COMPLETE.sts
                , WrkStsType.MOVE_NEARBY.sts
                , WrkStsType.MOVE_NEARBY_COMPLETE.sts
                , WrkStsType.MOVE_IN_LIFT.sts
                , WrkStsType.MOVE_IN_LIFT_COMPLETE.sts
                , WrkStsType.MOVE_LIFT_RUN.sts