Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

9 天以前 f2b48ce0cfdf9b68ecc7c9d84937d69500590f81

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

@@ -35,6 +35,51 @@
    @Autowired
    private TaskService taskService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R AGVBindAndInTaskStart(Map<String, Object> params, Long loginUserId) {
        //先绑定
        getAGVStaBind(params);
        //生成任务
        AGVInTaskStart(params, loginUserId);
        return R.ok();
    }

    @Override
    public R getStaMsgSelect(Map<String, Object> params) {
        String sta = params.get("sta").toString();
        if (Cools.isEmpty(sta)){
            throw new CoolException("接驳位条码不能为空");
        }
        BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                .eq(BasStation::getStationName, sta)
                .eq(BasStation::getUseStatus,StaUseStatusType.TYPE_O.type)
        );
        if (Cools.isEmpty(basStation)){
            throw new CoolException("未找到接驳站点信息，请检查站点状态");
        }
        List<Long> ids =  new ArrayList<>();
        ids.add(basStation.getArea());
        if (basStation.getIsCrossZone() == 1){
            String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1);
            String[] parts = content.split(",");
            for (int i = 0; i < parts.length; i++) {
                ids.add(Long.parseLong(parts[i].trim()));
            }
        }
        List<WarehouseAreas> warehouseAreasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                .in(WarehouseAreas::getId, ids)
        );

        return R.ok(Cools
                .add("barcode", basStation.getBarcode())
                .add("warehouseAreasList", warehouseAreasList)
                .add("area", basStation.getArea())
        );
    }




    @Override
    public R AGVInTaskStart(Map<String, Object> params,Long loginUserId ) {
@@ -70,6 +115,8 @@
        return R.ok();
    }



    @Override
    public R AGVStaUnBind(Map<String, Object> params) {
        String sta = params.get("sta").toString();