完善AGV相关功能

zyx

2023-07-14 525cf3d9714352284b70c29f81fa73bff71cf683

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

@@ -1,34 +1,22 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesCombParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;

/**
@@ -53,7 +41,7 @@

    @Override
    @Transactional
    public void comb(CombParam param, Long userId) {
    public String comb(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
@@ -99,6 +87,7 @@
                }
            });
        }else {
            //关联组托
            Order order = orderService.selectByNo(param.getOrderNo());
            if (order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
@@ -150,7 +139,12 @@
            orderService.updateSettle(order.getId(), 2L, userId);
        }

        //关联组托
        if(StringUtils.isEmpty(param.getLocno())){
            return "组托成功";
        }else {
            combBinding(param.getBarcode(),param.getLocno());
            return "组托成功，绑定站点成功";
        }

    }

@@ -171,8 +165,11 @@
        EntityWrapper<AgvBasDevp> wrapper = new EntityWrapper<>();
        wrapper.eq("dev_no",stationCode);
        AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(wrapper);
        if(agvBasDevp == null){
            throw new CoolException(stationCode + "站点信息错误");
        }
        if(!"O".equals(agvBasDevp.getLocSts())){
            throw new CoolException(barcode + "该站点非空");
            throw new CoolException(stationCode + "该站点货位状态非空");
        }

        agvBasDevp.setBarcode(barcode);
@@ -180,4 +177,10 @@
        agvBasDevpService.update(agvBasDevp,wrapper);
    }

    public List<AgvBasDevp> getAgvBasDevpByFloor(int floor) {
        EntityWrapper<AgvBasDevp> wrapper = new EntityWrapper<>();
        wrapper.eq("floor",floor).eq("cache_shelves","Y");
        return agvBasDevpService.selectList(wrapper);
    }

}