Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -11,10 +12,7 @@
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.AgvLocMastService;
import com.zy.asrs.service.AgvWrkDetlService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.*;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +53,8 @@
    AgvLocMastService agvLocMastService;
    @Autowired
    ApiLogService apiLogService;
    @Autowired
    AgvBasDevpService agvBasDevpService;

    public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
        AgvWrkMast agvWrkMast = this.selectById(wrkNo);
@@ -128,11 +128,24 @@
    public int containerArrived(AgvWrkMast agvWrkMast) {

        Map<String,String> containerArrivedParam = new HashMap<>();
        String slotCode = agvWrkMast.getSourceLocNo().substring(3, 6) + "-1";
        containerArrivedParam.put("slotCode",slotCode);
        containerArrivedParam.put("slotCode",agvWrkMast.getSourceLocNo());
        containerArrivedParam.put("containerCode",agvWrkMast.getBarcode());

        return doHttpRequest(containerArrivedParam,"容器达到通知",url, containerArrivedPath,null,"127.0.0.1");
    }

    @Override
    public List<AgvWrkMast> selectReadyAgvWrkMast() {
        List<String> stationCodes = agvBasDevpService.selectAllStationCode();
        Wrapper<AgvWrkMast> wrapper = new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 21L).like(false, "loc_no", "@");
        wrapper.in("loc_no",stationCodes);
        return this.selectList(wrapper);
        //return this.baseMapper.selectReadyAgvWrkMast();
    }

    @Override
    public AgvWrkMast selectByContainerCode(String containerCode) {
        return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode));
    }

    private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
@@ -163,8 +176,15 @@
            agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());

            //AgvTaskkDescribeParam
            agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
            if(agvWrkMast.getSourceLocNo().contains("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
            }

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