波次下髮優化 堆垛機移庫任務優化

zc

7 天以前 e4a2bc817e830611f7187ba8cb62875842b79d3f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java

@@ -40,8 +40,6 @@
    private DeliveryItemService deliveryItemService;
    @Autowired
    private CompanysService companysService;
    @Autowired
    private DeliveryServiceImpl deliveryService;

    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
    @PostMapping("/deliveryItem/page")
@@ -49,10 +47,42 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
        QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
        return R.ok().add(deliveryItemService.page(pageParam, wrapper));
    }

    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
    @PostMapping("/deliveryItem/filters/page")
    public R filter(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
        QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
        wrapper.apply("anfme > work_qty + qty ");
        return R.ok().add(deliveryItemService.page(pageParam, wrapper));
    }


    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
    @ApiOperation("分页获取列表")
    @PostMapping("/deliveryItem/edit/page")
    public R byPoIdspage(@RequestBody Map<String, Object> map) {
        List<Long> poDetlIds = new ArrayList<>();
        if (!Objects.isNull(map.get("ids"))) {
            poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("ids")), Long.class);
            map.remove("ids");
        }
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
        QueryWrapper<DeliveryItem> queryWrapper = pageParam.buildWrapper(true);
        if (!poDetlIds.isEmpty()) {
            queryWrapper.in("id", poDetlIds);
        } else {
            return R.ok();
        }
        return R.ok().add(deliveryItemService.page(pageParam, queryWrapper));
    }



    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
    @PostMapping("/deliveryItem/list")
    public R list(@RequestBody Map<String, Object> map) {