物料导入更新 任务完成不解绑站点和容器 组托入库时增加判断是否容器和接驳位已经绑定

zyx

2024-03-30 2c945116a7d4dccac387930e40980ae1ba32f05c

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

@@ -10,7 +10,6 @@
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.AgvTaskCreateParam;
import com.zy.asrs.entity.param.AgvTaskParam;
import com.zy.asrs.entity.param.AgvTaskkDescribeParam;
import com.zy.asrs.mapper.AgvWrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.utils.HttpHandler;
@@ -20,11 +19,7 @@
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.*;

@Service
@Slf4j
@@ -44,9 +39,6 @@

    @Value("${agv.containerArrivedPath}")
    private String containerArrivedPath;

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

    @Autowired
    AgvWrkMastMapper agvWrkMastMapper;
@@ -75,15 +67,12 @@
        return true;
    }

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

        //任务过滤，过滤掉已存在相同目标库位的工作档
        agvWrkMastList = filter(agvWrkMastList);
    public int startWrk(AgvWrkMast agvWrkMast) throws IOException {

        AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
        agvTaskCreateParam.setTaskType(taskType);
        //agvTaskCreateParam.setTaskType(taskType);

        getRequestParam(agvTaskCreateParam,agvWrkMastList);
        getRequestParam(agvTaskCreateParam,agvWrkMast);

        return doHttpRequest(agvTaskCreateParam,"搬运任务下发",url, taskCreatePath,null,"127.0.0.1");

@@ -154,13 +143,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){
@@ -174,30 +156,23 @@
        }
    }

    private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam,List<AgvWrkMast> agvWrkMastList){
        List<AgvTaskParam> agvTaskParamList = agvWrkMastList.stream().map(agvWrkMast -> {
            AgvTaskParam agvTaskParam = new AgvTaskParam();
            AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
            agvTaskParam.setTaskDescribe(agvTaskkDescribeParam);
            //AgvTaskParam
            if(agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57){
                agvTaskParam.setTaskCode(-agvWrkMast.getWrkNo() + "");
            }else{
                agvTaskParam.setTaskCode(agvWrkMast.getWrkNo() + "");
            }
    private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam,AgvWrkMast agvWrkMast){

            agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
        List<AgvTaskParam> agvTaskParamList = Arrays.asList(
                //起始位
                new AgvTaskParam(agvWrkMast.getSourceLocNo()),
                //目标位
                new AgvTaskParam(agvWrkMast.getLocNo()));

            //AgvTaskkDescribeParam
            if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            }
            agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
            agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
            return agvTaskParam;
        }).collect(Collectors.toList());
//        //起始位
//        agvTaskParamList.add(new AgvTaskParam(agvWrkMast.getSourceLocNo()));
//        //目标位
//        agvTaskParamList.add(new AgvTaskParam(agvWrkMast.getLocNo()));

        agvTaskCreateParam.setTasks(agvTaskParamList);
        agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
        agvTaskCreateParam.setTaskTyp("F01");
        agvTaskCreateParam.setPositionCodePath(agvTaskParamList);

    }

    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
@@ -213,7 +188,7 @@
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);

            int code = (int) jsonObject.get("code");
            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                throw new CoolException("调用AGV响应错误");
            }