zhou zhou
1 天以前 1dcfa3702505f0c431757312b5304531029f90f6
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -22,12 +22,14 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
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;
@@ -60,7 +62,8 @@
        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);
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }
    @PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -71,26 +74,27 @@
        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);
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    @PostMapping("/outStock/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(outStockService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getType, OrderType.ORDER_OUT.type)));
        return R.ok().add(buildPageRowsUtils.rowsMap(outStockService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getType, OrderType.ORDER_OUT.type))));
    }
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    @PostMapping({"/outStock/many/{ids}", "/asnOrders/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(outStockService.listByIds(Arrays.asList(ids)));
        return R.ok().add(buildPageRowsUtils.rowsMap(outStockService.listByIds(Arrays.asList(ids))));
    }
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    @OperationLog("表单查询")
    @GetMapping("/outStock/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(outStockService.getById(id));
        return R.ok().add(buildPageRowsUtils.rowsMap(outStockService.getById(id)));
    }
    @PreAuthorize("hasAuthority('manager:outStock:save')")
@@ -111,7 +115,7 @@
        if (!outStockService.save(wkOrder)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(wkOrder);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(wkOrder));
    }
    @PreAuthorize("hasAuthority('manager:outStock:update')")
@@ -119,6 +123,7 @@
    @PostMapping("/outStock/update")
    @ApiOperation("更新")
    public R update(@RequestBody WkOrder wkOrder) {
        OptimisticLockUtils.requireVersion("出库单", wkOrder.getVersion());
        wkOrder.setType(OrderType.ORDER_OUT.type)
                .setUpdateBy(getLoginUserId())
                .setUpdateTime(new Date());
@@ -129,7 +134,7 @@
        if (!outStockService.updateById(wkOrder)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(wkOrder);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(wkOrder));
    }
    @PreAuthorize("hasAuthority('manager:outStock:remove')")
@@ -139,7 +144,7 @@
        if (!outStockService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
    }
    @PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -154,7 +159,7 @@
        outStockService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }
    @PreAuthorize("hasAuthority('manager:outStock:update')")
@@ -221,7 +226,7 @@
                orderTemplates.add(template);
            }
        }
        ExcelUtil.build(ExcelUtil.create(orderTemplates, AsnOrderTemplate.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orderTemplates), AsnOrderTemplate.class), response);
    }