zjj
2025-05-15 55179dccab63dcd201808000b761008c0b0f25e3
#收货区动态字段搜索,pda绑定入库
5个文件已修改
84 ■■■■■ 已修改文件
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -209,6 +209,16 @@
                <TextField source="memo" label="common.field.memo" sortable={false} />,
            ]
            setColumns([...arr, ...fields, ...lastArr]);
            //filters添加过滤字段
            data.map(el => {
                var i =0;
                filters.map((item) =>{
                    if(item.key === el.fields){
                      i = 1;
                    }
                })
                i===0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
            })
        } else {
            notify(msg);
        }
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -34,6 +34,16 @@
        return agvService.getStaBindList(params);
    }
    @ApiOperation("站点查询")
    @PreAuthorize("hasAuthority('manager:basStation:list')")
    @PostMapping("/staMsg/select")
    public R getStaMsgSelect(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return agvService.getStaMsgSelect(params);
    }
    @PreAuthorize("hasAuthority('manager:basStation:list')")
    @ApiOperation("站点绑定")
    @PostMapping("/AGV/staBind")
@@ -63,4 +73,14 @@
        }
        return agvService.AGVInTaskStart(params, getLoginUserId());
    }
    @PreAuthorize("hasAuthority('manager:basStation:list')")
    @ApiOperation("AGV绑定&入库")
    @PostMapping("/AGV/bindAndIn/start")
    public R AGVBindAndInTaskStart(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return agvService.AGVBindAndInTaskStart(params, getLoginUserId());
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java
@@ -12,4 +12,8 @@
    R AGVStaUnBind(Map<String, Object> params);
    R AGVInTaskStart(Map<String, Object> params ,Long loginUserId);
    R getStaMsgSelect(Map<String, Object> params);
    R AGVBindAndInTaskStart(Map<String, Object> params, Long loginUserId);
}
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();
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -37,6 +38,8 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
        QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
        /**拼接扩展字段过滤*/
        FieldsUtils.setFieldsFilters(queryWrapper,pageParam, WarehouseAreasItem.class);
        /**拼接扩展字段*/
        PageParam<WarehouseAreasItem, BaseParam> page = warehouseAreasItemService.page(pageParam, queryWrapper);
        List<WarehouseAreasItem> records = page.getRecords();