#

luxiaotao1123

2021-04-22 e2544894b3b10187a838e16af6dff02166658511

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -36,7 +36,7 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private CustOrderService custOrderService;
    private OrderService orderService;

    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
@@ -62,10 +62,10 @@
        return workService.stockOutPreview(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "拣货")
    @RequestMapping("/stock/out/create")
    @ManagerAuth(memo = "生成拣货单")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOut(stockOutParam, getUserId());
        return workService.stockOutCreate(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out/print")
@@ -125,18 +125,18 @@
    }

    @RequestMapping("/orderNo/init")
    @ManagerAuth(memo = "生成销售订单编号")
    @ManagerAuth(memo = "生成单据编号")
    public R initOrderNo() {
        long nextId = snowflakeIdWorker.nextId();
        String number = "PR-" + String.valueOf(nextId).substring(0, 15);
        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
            return R.error("抱歉单号已存在，请再生成一次");
        String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
        if (orderService.selectByOrderNo(orderNo) != null) {
            return R.error("抱歉，单据编号已存在");
        }
        return R.ok().add(number);
        return R.ok().add(orderNo);
    }

    @RequestMapping("/order/init")
    @ManagerAuth(memo = "生成销售订单")
    @ManagerAuth(memo = "生成订单")
    public R initOrder(@RequestBody InitOrderParam param) {
        return workService.initOrder(param, getUserId());
    }
@@ -144,7 +144,7 @@
    @RequestMapping("/stock/transfer")
    @ManagerAuth(memo = "库存调拨")
    public R stockTransfer(@RequestBody AsrsTransferParam number) {
        return R.error();
        return workService.asrsStockTransfer(number, getUserId());
    }

    @RequestMapping("/stock/check")