#

zhou zhou

2 天以前 ae6e7a7090f3871f51f319f0ad3a72ee4a259e83

 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));
    }