lsh#

1

18 小时以前 d91fae31f20fa81081fe1b0769437be66470175d

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

@@ -10,10 +10,10 @@
import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import lombok.Synchronized;
@@ -48,12 +48,14 @@
    private LocService locService;
    @Autowired
    private BasContainerServiceImpl basContainerService;
    @Autowired
    private LocItemService locItemService;

    @Override
    public R getOutStockTaskItem(String barcode) {
        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Task::getBarcode, barcode);
        Task task = taskService.getOne(lambdaQueryWrapper);
        Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
        if (null == task) {
            return R.error("未查询到相关任务");
        }
@@ -70,7 +72,7 @@
    public R saveOutTaskSts(String barcode) {
        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Task::getBarcode, barcode);
        Task task = taskService.getOne(lambdaQueryWrapper);
        Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
        if (null == task) {
            throw new CoolException("未找到容器号对应任务");
        }
@@ -108,7 +110,7 @@
        if (Cools.isEmpty(barcode)) {
            throw new CoolException("参数有误");
        }
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode));
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode).last("limit 1"));
        if (null == task) {
            throw new CoolException("未找到容器号对应任务");
        }
@@ -155,7 +157,7 @@
        if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0) {
            return R.error("参数错误");
        }
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()));
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()).last("limit 1"));
        if (null == task) {
            return R.error("未找到托盘对应的任务");
        }
@@ -238,7 +240,7 @@
        BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                .eq(BasStation::getStationName, containerWaveParam.getStaNo())
                .orderByDesc(BasStation::getId)
                .last("LIMIT 1"), false);
                .last("LIMIT 1"));

        if (Objects.isNull(basStation)) {
            throw new CoolException(containerWaveParam.getStaNo() + "站点不存在！！");
@@ -253,18 +255,18 @@
        }

        BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()
                        .in(BasContainer::getContainerType, containerWaveParam.getType(), false));
                        .in(BasContainer::getContainerType, containerWaveParam.getType(), false).last("limit 1"));
        if (Cools.isEmpty(basContainer)){
            throw new CoolException("未查询到相关容器规则");
        }
        String barcodeType = "barcode REGEXP "+basContainer.getCodeType();
        String barcodeType = "barcode REGEXP '"+basContainer.getCodeType()+"'";
        //容器类型查询  起点
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
                        .apply(barcodeType)
                        .eq(Loc::getDeleted, 0)
                        .eq(Loc::getStatus, 1)
                        .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type)
                        .in(Loc::getAreaId, areaList)
                        .eq(Loc::getUseStatus, "O")
                        .orderByDesc(Loc::getId)
                        .last("LIMIT 1"),
                false);
@@ -272,21 +274,17 @@
        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);
        //生成任务参数
        LocToTaskParams locToTaskParams = new LocToTaskParams();
        locToTaskParams.setType(Constants.TASK_TYPE_OUT_STOCK_EMPTY)
                .setSiteNo(basStation.getStationName())
                .setOrgLoc(loc.getId().toString());
        try{
            locItemService.generateTaskEmpty(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val,locToTaskParams,loginUserId, containerWaveParam.getTaskNo());
        } catch (Exception e){
            throw new CoolException(e.getMessage());
        }
        return R.ok();
    }