blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhou zhou
3 天以前 03c3e3cfc1262e26a218a4b8340c0a53ca3065c6 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java


@@ -15,6 +15,7 @@


import com.vincent.rsf.server.common.domain.PageParam;


import com.vincent.rsf.server.common.utils.ExcelUtil;


import com.vincent.rsf.server.common.utils.FieldsUtils;


import com.vincent.rsf.server.common.utils.OptimisticLockUtils;


import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;


import com.vincent.rsf.server.manager.controller.params.GenWaveParams;


import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;


@@ -28,6 +29,7 @@


import com.vincent.rsf.server.manager.service.OutStockService;


import com.vincent.rsf.server.manager.service.TaskService;


import com.vincent.rsf.server.system.constant.SerialRuleCode;


import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;


import com.vincent.rsf.server.system.controller.BaseController;


import com.vincent.rsf.server.system.utils.SerialRuleUtils;


import io.swagger.annotations.Api;


@@ -61,7 +63,9 @@


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


        PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);


        buildPageRowsUtils.userNameMap(page.getRecords());


        return R.ok().add(page);


    }




    @PreAuthorize("hasAuthority('manager:outStock:list')")


@@ -72,7 +76,9 @@


        QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);


        List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);


        queryWrapper.in("type", list);


        return R.ok().add(outStockService.page(pageParam, queryWrapper));


        PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);


        buildPageRowsUtils.userNameMap(page.getRecords());


        return R.ok().add(page);


    }




    @PreAuthorize("hasAuthority('manager:outStock:list')")


@@ -120,6 +126,7 @@


    @PostMapping("/preparation/update")


    @ApiOperation("更新")


    public R update(@RequestBody WkOrder wkOrder) {


        OptimisticLockUtils.requireVersion("备料单", wkOrder.getVersion());


        wkOrder.setType(OrderType.ORDER_OUT.type)


                .setUpdateBy(getLoginUserId())


                .setUpdateTime(new Date());