#

zhou zhou

昨天 78a4c3f8f157b7ff8b6003847685b50ccb73a9c4

#

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

@@ -59,7 +59,7 @@
        PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
        QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
        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.eq("type", OrderType.ORDER_Pre.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));
    }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java

@@ -704,7 +704,7 @@
                        .setSourceId(outId)
                        .setSiteNo(param.getSiteNo());
                //增加备货出库类型判断
                Short type = wkOrder.getType().equals(OrderType.ORDER_Pre.type)
                Short type = wkOrder.getType().equals(OrderType.ORDER_PRE.type) || wkOrder.getType().equals(OrderType.ORDER_PRE_NOT_OUT.type)
                        ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
                        :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
                try {