修改备料功能

lbq

1 天以前 c2850e1679353a3978db169d965ef5fce6158677

修改备料功能

 rsf-admin/src/page/orders/preparation/PreparationOrderList.jsx

@@ -219,7 +219,7 @@
        title={"menu.outStock"}
        empty={false}
        filters={filters}
        filter={{ deleted: 0, type: 'out', wkType: 23 }}
        filter={{ deleted: 0 }}
        sort={{ field: "create_time", order: "desc" }}
        actions={(
          <TopToolbar>

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java

@@ -61,7 +61,7 @@
        try {
            WkOrder order = new WkOrder();
            String orderNo = params.getString("orderNo");
            order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_OUT.type)
            order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_Pre.type)
//                    .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
                    .setCreateBy(getLoginUserId())
                    .setUpdateBy(getLoginUserId());

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java

@@ -125,7 +125,7 @@

        Page<WkOrder> page = new Page<>(curr, limit);
        LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
        wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
//        wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
        wkOrderLambdaQueryWrapper.eq(WkOrder::getWkType, orderType);
        wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
        Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);

 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.eq("type", OrderType.ORDER_Pre.type);
        queryWrapper.in("wk_type",list);
        return R.ok().add(outStockService.page(pageParam, queryWrapper));
    }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java

@@ -13,7 +13,8 @@
    ORDER_IN("in", "入库单"),
    ORDER_TRANSFER("transfer", "调拔单"),
    ORDER_REVISE("revise", "库存调整"),
    ORDER_CHECK("check", "盘点单");
    ORDER_CHECK("check", "盘点单"),
    ORDER_Pre("pre","备货单");


    OrderType(String type, String desc) {

 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.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
                Short type = wkOrder.getType().equals(OrderType.ORDER_Pre.type)
                        ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
                        :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
                try {