#入库获取Row优化

Junjie

6 小时以前 1817a79605b464735014a00e762e715788229a4b

#入库获取Row优化

 .gitignore

@@ -30,6 +30,7 @@
output/
tmp/
docs/
.playwright-cli/

### VS Code ###
.vscode/

 src/main/java/com/zy/asrs/domain/vo/WrkTaskCountVo.java

New file
@@ -0,0 +1,16 @@
package com.zy.asrs.domain.vo;

import lombok.Data;

@Data
public class WrkTaskCountVo {

    // 设备编号，单工位对应crn_no，双工位对应dual_crn_no
    private Integer deviceNo;

    // 当前设备总任务数
    private Integer totalCount;

    // 当前设备入库任务数
    private Integer inCount;
}

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.domain.vo.WrkTaskCountVo;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -13,4 +14,8 @@

    WrkMast selectByWorkNo(Integer workNo);

    List<WrkTaskCountVo> selectCrnTaskCountList(@Param("inIoType") Integer inIoType);

    List<WrkTaskCountVo> selectDualCrnTaskCountList(@Param("inIoType") Integer inIoType);

}

 src/main/java/com/zy/asrs/service/WrkMastService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.domain.vo.WrkTaskCountVo;
import com.zy.asrs.entity.WrkMast;

import java.util.List;
@@ -9,4 +10,8 @@

    WrkMast selectByWorkNo(Integer workNo);

    List<WrkTaskCountVo> selectCrnTaskCountList();

    List<WrkTaskCountVo> selectDualCrnTaskCountList();

}

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

@@ -1,10 +1,14 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.domain.vo.WrkTaskCountVo;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.enums.WrkIoType;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("wrkMastService")
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
@@ -14,4 +18,14 @@
        return this.baseMapper.selectByWorkNo(workNo);
    }

    @Override
    public List<WrkTaskCountVo> selectCrnTaskCountList() {
        return this.baseMapper.selectCrnTaskCountList(WrkIoType.IN.id);
    }

    @Override
    public List<WrkTaskCountVo> selectDualCrnTaskCountList() {
        return this.baseMapper.selectDualCrnTaskCountList(WrkIoType.IN.id);
    }

}

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -4,15 +4,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.domain.vo.WrkTaskCountVo;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.entity.BasStationDevice;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDualCrnpService;
import com.zy.asrs.service.BasStationDeviceService;
@@ -36,6 +35,8 @@
public class Utils {

    private static final String LOC_NO_FLAG = "-";
    private static final long STATION_REACHABLE_CACHE_SECONDS = 7 * 24 * 60 * 60L;
    private static final long PRECOMPUTE_IN_TASK_ROW_CACHE_SECONDS = 60L;
    private static final DecimalFormat fmt = new DecimalFormat("##0.00");
    private static Integer defaultDeviceLogCollectTime = 200;
    private static Long lastUpdateDeviceLogCollectTime = -1L;
@@ -150,6 +151,24 @@
        return getInTaskEnableRow(stationId, new ArrayList<>(), new ArrayList<>(), true);
    }

    public static void precomputeInTaskEnableRow(Integer stationId) {
        if (stationId == null) {
            return;
        }
        List<Integer> rowList = getInTaskEnableRow(stationId);
        cacheInTaskEnableRow(stationId, rowList);
    }

    public static List<Integer> getInTaskEnableRowWithCache(Integer stationId) {
        List<Integer> cachedRowList = getCachedInTaskEnableRow(stationId);
        if (cachedRowList != null) {
            return cachedRowList;
        }
        List<Integer> rowList = getInTaskEnableRow(stationId);
        cacheInTaskEnableRow(stationId, rowList);
        return rowList;
    }

    //获取入库任务可用排
    public static List<Integer> getInTaskEnableRow(Integer stationId, List<Integer> excludeCrnList, List<Integer> excludeDualCrnList, boolean maxInTaskControl) {
        //获取堆垛机入库任务可用排
@@ -189,34 +208,29 @@
                currentCircleTaskCrnNo = Integer.parseInt(String.valueOf(object));
            }

            Map<Integer, WrkTaskCountVo> crnTaskCountMap = toTaskCountMap(wrkMastService.selectCrnTaskCountList());
            QueryWrapper<BasCrnp> wrapper = new QueryWrapper<BasCrnp>()
                    .eq("in_enable", "Y")
                    .eq("status", 1);
            List<BasCrnp> basCrnps = basCrnpService.list(wrapper);

            if (currentCircleTaskCrnNo != null) {
                currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
                BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>()
                        .eq("crn_no", currentCircleTaskCrnNo)
                        .eq("in_enable", "Y")
                        .eq("status", 1)
                );
                List<WrkMast> currentCrnTask = wrkMastService.list(new QueryWrapper<WrkMast>()
                        .eq("crn_no", currentCircleTaskCrnNo)
                );
                if (currentCrnTask.size() <= 1) {
                    if (basCrnp != null) {
                        List<List<Integer>> rowList = basCrnp.getControlRows$();
                        for (List<Integer> rows : rowList) {
                            list.addAll(rows);
                Integer nextCrnNo = currentCircleTaskCrnNo + 1;
                WrkTaskCountVo countVo = crnTaskCountMap.get(nextCrnNo);
                if (getTotalCount(countVo) <= 1) {
                    BasCrnp firstBasCrnp = null;
                    for (BasCrnp basCrnp : basCrnps) {
                        if (Objects.equals(nextCrnNo, basCrnp.getCrnNo())) {
                            firstBasCrnp = basCrnp;
                            break;
                        }
                        wrapper.ne("crn_no", currentCircleTaskCrnNo);
                    }
                    if (firstBasCrnp != null) {
                        appendRowList(list, firstBasCrnp.getControlRows$());
                        basCrnps.remove(firstBasCrnp);
                    }
                }
            }

            HashMap<Integer, Integer> map = new HashMap<>();
            List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
            List<BasCrnp> basCrnps = basCrnpService.list(wrapper);

            List<BasCrnp> baseList = new ArrayList<>();
            List<BasCrnp> extraList = new ArrayList<>();
@@ -229,11 +243,6 @@
            }
            baseList.addAll(extraList);

            for (WrkMast wrkMast : wrkMasts) {
                Integer crnNo = wrkMast.getCrnNo();
                map.put(crnNo, map.getOrDefault(crnNo, 0) + 1);
            }

            List<BasCrnp> enabledCrnps = new ArrayList<>();
            for (BasCrnp basCrnp : baseList) {
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
@@ -245,13 +254,11 @@
                    continue;
                }

                List<WrkMast> inWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
                        .eq("crn_no", basCrnp.getCrnNo())
                        .eq("io_type", WrkIoType.IN.id)
                );
                WrkTaskCountVo countVo = crnTaskCountMap.get(basCrnp.getCrnNo());
                int inTaskCount = getInCount(countVo);
                // 检查是否超过最大入库任务数
                if (maxInTaskControl && inWrkMasts.size() >= basCrnp.getMaxInTask()) {
                    News.info("堆垛机:{} 已达最大入库任务数，当前任务数:{}", basCrnp.getCrnNo(), inWrkMasts.size());
                if (maxInTaskControl && inTaskCount >= basCrnp.getMaxInTask()) {
                    News.info("堆垛机:{} 已达最大入库任务数，当前任务数:{}", basCrnp.getCrnNo(), inTaskCount);
                    continue;
                }

@@ -259,14 +266,9 @@
                List<StationObjModel> inStationList = basCrnp.getInStationList$();
                boolean enableGo = false;
                for (StationObjModel stationObjModel : inStationList) {
                    try {
                        List<NavigateNode> navigateNodes = navigateUtils.calcReachablePathByStationId(stationId, stationObjModel.getStationId());
                        if(navigateNodes != null && !navigateNodes.isEmpty()) {
                            enableGo = true;
                            break;
                        }
                    } catch (Exception e) {

                    if (isReachableWithCache(redisUtil, navigateUtils, stationId, stationObjModel.getStationId())) {
                        enableGo = true;
                        break;
                    }
                }

@@ -275,18 +277,15 @@
                }
            }

            enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
            enabledCrnps.sort(Comparator.comparingInt(o -> getTotalCount(crnTaskCountMap.get(o.getCrnNo()))));

            List<Integer> recommendList = new ArrayList<>();
            List<Integer> baseRowList = new ArrayList<>();
            for (BasCrnp basCrnp : enabledCrnps) {
                List<List<Integer>> rowList = basCrnp.getControlRows$();
                for (List<Integer> rows : rowList) {
                    if(allowedCrnNos.contains(basCrnp.getCrnNo())) {
                        recommendList.addAll(rows);
                    }else {
                        baseRowList.addAll(rows);
                    }
                if(allowedCrnNos.contains(basCrnp.getCrnNo())) {
                    appendRowList(recommendList, basCrnp.getControlRows$());
                }else {
                    appendRowList(baseRowList, basCrnp.getControlRows$());
                }
            }

@@ -302,11 +301,11 @@
    public static List<Integer> getDualCrnInTaskEnableRow(Integer stationId, List<Integer> excludeCrnList, boolean maxInTaskControl) {
        List<Integer> list = new ArrayList<>();
        try {
            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
            NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);
            WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
            BasDualCrnpService basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
            BasStationDeviceService basStationDeviceService = SpringUtils.getBean(BasStationDeviceService.class);
            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
            NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);

            List<BasStationDevice> stationDevices = basStationDeviceService.list(new QueryWrapper<BasStationDevice>().eq("station_id", stationId));
            boolean hasConfig = !stationDevices.isEmpty();
@@ -323,8 +322,7 @@
                    .eq("in_enable", "Y")
                    .eq("status", 1);

            HashMap<Integer, Integer> map = new HashMap<>();
            List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<>());
            Map<Integer, WrkTaskCountVo> dualCrnTaskCountMap = toTaskCountMap(wrkMastService.selectDualCrnTaskCountList());
            List<BasDualCrnp> basDualCrnps = basDualCrnpService.list(wrapper);

            List<BasDualCrnp> baseList = new ArrayList<>();
@@ -338,11 +336,6 @@
            }
            baseList.addAll(extraList);

            for (WrkMast wrkMast : wrkMasts) {
                Integer dualCrnNo = wrkMast.getDualCrnNo();
                map.put(dualCrnNo, map.getOrDefault(dualCrnNo, 0) + 1);
            }

            List<BasDualCrnp> enabledCrnps = new ArrayList<>();
            for (BasDualCrnp basDualCrnp : baseList) {
                DualCrnThread dualCrnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, basDualCrnp.getCrnNo());
@@ -354,13 +347,11 @@
                    continue;
                }

                List<WrkMast> inWrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
                        .eq("dual_crn_no", basDualCrnp.getCrnNo())
                        .eq("io_type", WrkIoType.IN.id)
                );
                WrkTaskCountVo countVo = dualCrnTaskCountMap.get(basDualCrnp.getCrnNo());
                int inTaskCount = getInCount(countVo);
                // 检查是否超过最大入库任务数
                if (maxInTaskControl && inWrkMasts.size() >= basDualCrnp.getMaxInTask()) {
                    News.info("双工位堆垛机:{} 已达最大入库任务数，当前任务数:{}", basDualCrnp.getCrnNo(), inWrkMasts.size());
                if (maxInTaskControl && inTaskCount >= basDualCrnp.getMaxInTask()) {
                    News.info("双工位堆垛机:{} 已达最大入库任务数，当前任务数:{}", basDualCrnp.getCrnNo(), inTaskCount);
                    continue;
                }

@@ -368,14 +359,9 @@
                List<StationObjModel> inStationList = basDualCrnp.getInStationList$();
                boolean enableGo = false;
                for (StationObjModel stationObjModel : inStationList) {
                    try {
                        List<NavigateNode> navigateNodes = navigateUtils.calcReachablePathByStationId(stationId, stationObjModel.getStationId());
                        if(navigateNodes != null && !navigateNodes.isEmpty()) {
                            enableGo = true;
                            break;
                        }
                    } catch (Exception e) {

                    if (isReachableWithCache(redisUtil, navigateUtils, stationId, stationObjModel.getStationId())) {
                        enableGo = true;
                        break;
                    }
                }

@@ -384,18 +370,15 @@
                }
            }

            enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
            enabledCrnps.sort(Comparator.comparingInt(o -> getTotalCount(dualCrnTaskCountMap.get(o.getCrnNo()))));

            List<Integer> recommendList = new ArrayList<>();
            List<Integer> baseRowList = new ArrayList<>();
            for (BasDualCrnp basDualCrnp : enabledCrnps) {
                List<List<Integer>> rowList = basDualCrnp.getControlRows$();
                for (List<Integer> rows : rowList) {
                    if(allowedCrnNos.contains(basDualCrnp.getCrnNo())) {
                        recommendList.addAll(rows);
                    }else {
                        baseRowList.addAll(rows);
                    }
                if(allowedCrnNos.contains(basDualCrnp.getCrnNo())) {
                    appendRowList(recommendList, basDualCrnp.getControlRows$());
                }else {
                    appendRowList(baseRowList, basDualCrnp.getControlRows$());
                }
            }

@@ -407,6 +390,87 @@
        return list;
    }

    private static List<Integer> getCachedInTaskEnableRow(Integer stationId) {
        if (stationId == null) {
            return null;
        }
        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
        Object object = redisUtil.get(RedisKeyType.PRECOMPUTE_IN_TASK_ROW_CACHE.key + stationId);
        if (object == null) {
            return null;
        }
        try {
            return JSONArray.parseArray(String.valueOf(object), Integer.class);
        } catch (Exception e) {
            return null;
        }
    }

    private static void cacheInTaskEnableRow(Integer stationId, List<Integer> rowList) {
        if (stationId == null || rowList == null || rowList.isEmpty()) {
            return;
        }
        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
        redisUtil.set(RedisKeyType.PRECOMPUTE_IN_TASK_ROW_CACHE.key + stationId,
                JSON.toJSONString(rowList), PRECOMPUTE_IN_TASK_ROW_CACHE_SECONDS);
    }

    private static boolean isReachableWithCache(RedisUtil redisUtil,
                                                NavigateUtils navigateUtils,
                                                Integer sourceStationId,
                                                Integer targetStationId) {
        if (sourceStationId == null || targetStationId == null) {
            return false;
        }

        String cacheKey = RedisKeyType.STATION_REACHABLE_CACHE.key + sourceStationId + "_" + targetStationId;
        if (redisUtil.get(cacheKey) != null) {
            return true;
        }

        try {
            List<NavigateNode> navigateNodes = navigateUtils.calcReachablePathByStationId(sourceStationId, targetStationId);
            if (navigateNodes != null && !navigateNodes.isEmpty()) {
                redisUtil.set(cacheKey, "1", STATION_REACHABLE_CACHE_SECONDS);
                return true;
            }
        } catch (Exception ignored) {
        }
        return false;
    }

    private static Map<Integer, WrkTaskCountVo> toTaskCountMap(List<WrkTaskCountVo> countVoList) {
        Map<Integer, WrkTaskCountVo> countMap = new HashMap<>();
        if (countVoList == null) {
            return countMap;
        }
        for (WrkTaskCountVo countVo : countVoList) {
            if (countVo != null && countVo.getDeviceNo() != null) {
                countMap.put(countVo.getDeviceNo(), countVo);
            }
        }
        return countMap;
    }

    private static int getTotalCount(WrkTaskCountVo countVo) {
        return countVo == null || countVo.getTotalCount() == null ? 0 : countVo.getTotalCount();
    }

    private static int getInCount(WrkTaskCountVo countVo) {
        return countVo == null || countVo.getInCount() == null ? 0 : countVo.getInCount();
    }

    private static void appendRowList(List<Integer> targetRowList, List<List<Integer>> sourceRowList) {
        if (targetRowList == null || sourceRowList == null) {
            return;
        }
        for (List<Integer> rows : sourceRowList) {
            if (rows != null && !rows.isEmpty()) {
                targetRowList.addAll(rows);
            }
        }
    }

    public static Map<String, Object> convertObjectToMap(Object obj) {
        Map<String, Object> map = new HashMap<>();
        Class<?> clazz = obj.getClass();

 src/main/java/com/zy/core/enums/RedisKeyType.java

@@ -17,6 +17,8 @@
    SYSTEM_CONFIG_MAP("system_config_map"),
    FAKE_TASK_NO_AREA("fake_task_no_area"),
    OUT_STATION_ROUTE_CACHE("out_station_route_cache_"),
    STATION_REACHABLE_CACHE("station_reachable_cache_"),
    PRECOMPUTE_IN_TASK_ROW_CACHE("precompute_in_task_row_cache_"),

    LOC_MAP_BASE("loc_map_base"),
    LOC_MAST_MAP_LIST("loc_mast_map_list"),

 src/main/java/com/zy/core/plugin/FakeProcess.java

@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.domain.param.CreateOutTaskParam;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.entity.FindCrnNoResult;
@@ -236,6 +237,9 @@
                            commonService.getWorkNo(WrkIoType.FAKE_TASK_NO.id), stationId,
                            entity.getBarcodeStation().getStationId(), 0);
                    stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "fake-process", "fake-enable-in");
                    if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
                        Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
                    }
                    redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 5);
                }
            }

 src/main/java/com/zy/core/plugin/GslProcess.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.service.CommonService;
@@ -158,6 +159,9 @@
                ) {
                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                    stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "enable-in");
                    if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
                        Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
                    }
                    redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
                    News.info("{}站点启动入库成功，数据包:{}", stationId, JSON.toJSONString(command));
                }

 src/main/java/com/zy/core/plugin/NormalProcess.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
@@ -137,6 +138,9 @@
                ) {
                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                    stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "normal-process", "enable-in");
                    if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
                        Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
                    }
                    redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
                    News.info("{}站点启动入库成功，数据包:{}", stationId, JSON.toJSONString(command));
                }

 src/main/java/com/zy/core/plugin/XiaosongProcess.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
@@ -172,6 +173,9 @@
                ) {
                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                    stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "xiaosong-process", "enable-in");
                    if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
                        Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
                    }
                    redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
                    News.info("{}站点启动入库成功，数据包:{}", stationId, JSON.toJSONString(command));
                }

 src/main/java/com/zy/core/utils/WmsOperateUtils.java

@@ -107,7 +107,7 @@
            requestParam.put("barcode", request.getBarcode());
            requestParam.put("sourceStaNo", stationNo);
            requestParam.put("locType1", request.getLocType1() == null ? 1 : request.getLocType1());
            requestParam.put("row", Utils.getInTaskEnableRow(request.getSourceStaNo()));
            requestParam.put("row", Utils.getInTaskEnableRowWithCache(request.getSourceStaNo()));
            if (request.getExtraParams() != null && !request.getExtraParams().isEmpty()) {
                requestParam.putAll(request.getExtraParams());
            }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -39,4 +39,24 @@
        limit 0,1
    </select>

    <select id="selectCrnTaskCountList" resultType="com.zy.asrs.domain.vo.WrkTaskCountVo">
        select
            crn_no as deviceNo,
            count(1) as totalCount,
            sum(case when io_type = #{inIoType} then 1 else 0 end) as inCount
        from asr_wrk_mast
        where crn_no is not null
        group by crn_no
    </select>

    <select id="selectDualCrnTaskCountList" resultType="com.zy.asrs.domain.vo.WrkTaskCountVo">
        select
            dual_crn_no as deviceNo,
            count(1) as totalCount,
            sum(case when io_type = #{inIoType} then 1 else 0 end) as inCount
        from asr_wrk_mast
        where dual_crn_no is not null
        group by dual_crn_no
    </select>

</mapper>