#

zhou zhou

昨天 78a4c3f8f157b7ff8b6003847685b50ccb73a9c4

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

@@ -58,8 +58,9 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
        QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
//        List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
//        queryWrapper.in("type", list);
        List<String> list = Arrays.asList(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type, OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type, OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type);
        queryWrapper.in("type", OrderType.ORDER_PRE.type,OrderType.ORDER_PRE_NOT_OUT.type);
        queryWrapper.in("wk_type",list);
        return R.ok().add(outStockService.page(pageParam, queryWrapper));
    }

@@ -115,7 +116,7 @@
    }

    @PreAuthorize("hasAuthority('manager:outStock:update')")
    @OperationLog("Update ；出库单据")
    @OperationLog("Update 出库单据")
    @PostMapping("/preparation/update")
    @ApiOperation("更新")
    public R update(@RequestBody WkOrder wkOrder) {