lsh#

1

19 小时以前 6721cc29306aa5f8b2308bf40beb3c9c50abc27f

lsh#

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java

@@ -1,6 +1,8 @@
package com.vincent.rsf.server.api.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.generator.config.IFileCreate;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -13,6 +15,7 @@
import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +44,10 @@
    private WaveOrderRelaService waveOrderRelaService;
    @Autowired
    private BasStationService basStationService;
    @Autowired
    private LocService locService;
    @Autowired
    private BasContainerServiceImpl basContainerService;

    @Override
    public R getOutStockTaskItem(String barcode) {
@@ -239,22 +246,47 @@
        if (!basStation.getUseStatus().equals("O")) {
            throw new CoolException("站点状态不为空闲");
        }
        //容器类型查询  起点
        if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
            //光电站点：
            Long area = basStation.getArea();
            //是否需要转非光电站点
            //立库出库==》结束
            //AGV==》立库==》结束
        } else {
            //非光电站点
            //是否需要转光电站点
            //AGV==》结束
            //立库出库==》AGV==》结束

        List<Long> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), Long.class);
        if (Cools.isEmpty(areaList)){
            throw new CoolException("当前站点库区未配置");
        }

        return R.ok();
        BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()
                        .in(BasContainer::getContainerType, containerWaveParam.getType(), false));
        if (Cools.isEmpty(basContainer)){
            throw new CoolException("未查询到相关容器规则");
        }
        String barcodeType = "barcode REGEXP "+basContainer.getCodeType();
        //容器类型查询  起点
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
                        .apply(barcodeType)
                        .eq(Loc::getDeleted, 0)
                        .eq(Loc::getStatus, 1)
                        .in(Loc::getAreaId, areaList)
                        .eq(Loc::getUseStatus, "O")
                        .orderByDesc(Loc::getId)
                        .last("LIMIT 1"),
                false);

        if (Cools.isEmpty(loc)){
            throw new CoolException("未查询到符合条件的托盘");
        }
//        if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
//            //光电站点：
//            Long area = basStation.getArea();
//            //是否需要转非光电站点
//            //立库出库==》结束
//            //AGV==》立库==》结束
//        } else {
//            //非光电站点
//            //是否需要转光电站点
//            //AGV==》结束
//            //立库出库==》AGV==》结束
//
//        }

        return R.ok().add(loc);
    }