Changes

tzsk

2024-02-07 97c6a268766387d9c6834c23c9da3fdf63f3dc3f

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

@@ -45,9 +45,6 @@
    @Value("${agv.containerArrivedPath}")
    private String containerArrivedPath;

    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;

    @Autowired
    AgvWrkMastMapper agvWrkMastMapper;
    @Autowired
@@ -76,9 +73,6 @@
    }

    public int startWrk(List<AgvWrkMast> agvWrkMastList, String taskType) throws IOException {

        //任务过滤，过滤掉已存在相同目标库位的工作档
        agvWrkMastList = filter(agvWrkMastList);

        AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
        agvTaskCreateParam.setTaskType(taskType);
@@ -154,13 +148,6 @@
        return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode));
    }

    private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList){
        return agvWrkMastList.stream().filter(agvWrkMast -> {
            int num = this.selectCount(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvWrkMast.getLocNo()));
            return num <= maxWrokNum;
        }).collect(Collectors.toList());
    }

    private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
        //往容器入场参数中放入源站点位置
        for(AgvWrkMast agvWrkMast : agvWrkMastList){
@@ -192,7 +179,12 @@
            if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            }
            agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());

            if(agvWrkMast.getLocNo().contains("SK")){
                agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
            }else {
                agvTaskkDescribeParam.setToStationCode(agvWrkMast.getLocNo());
            }
            agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
            return agvTaskParam;
        }).collect(Collectors.toList());