#

luxiaotao1123

2021-03-25 c923a3aca3cfb4da23eca4666ad7367b8aa3f217

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

@@ -15,10 +15,7 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.param.InitPakoutParam;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
@@ -56,6 +53,12 @@
        return workService.stockOutCheck(number, getUserId());
    }

    @RequestMapping("/stock/out/preview")
    @ManagerAuth(memo = "拣货预览")
    public R stockOutPreview(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPreview(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "拣货")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
@@ -83,7 +86,7 @@
        }
        Long sts = pakouts.get(0).getWrkSts();
        if (sts == 1) {
            sts =2L;
            sts = 2L;
        }
        WrkSts wrkSts = wrkStsService.selectById(sts);
        return R.ok().add(Cools
@@ -122,10 +125,35 @@
    @ManagerAuth(memo = "生成销售订单编号")
    public R initOrderNo() {
        long nextId = snowflakeIdWorker.nextId();
        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
            return R.error("抱歉运气不好，请再生成一次");
        String number = "PR-" + String.valueOf(nextId).substring(0, 15);
        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
            return R.error("抱歉单号已存在，请再生成一次");
        }
        return R.ok().add(String.valueOf(nextId));
        return R.ok().add(number);
    }

    @RequestMapping("/order/init")
    @ManagerAuth(memo = "生成销售订单")
    public R initOrder(@RequestBody InitOrderParam param) {
        return workService.initOrder(param, getUserId());
    }

    @RequestMapping("/stock/transfer")
    @ManagerAuth(memo = "库存调拨")
    public R stockTransfer(@RequestParam String number) {
        return workService.stockTransfer(number, getUserId());
    }

    @RequestMapping("/stock/check")
    @ManagerAuth(memo = "库存盘点")
    public R stockCheck(@RequestBody StoCheckParam param) {
        return workService.stockCheck(param, getUserId());
    }

    @RequestMapping("/stock/check/auditing")
    @ManagerAuth(memo = "盘点记录审核")
    public R checkAuditing(@RequestParam Long checkId) {
        return workService.stockCheckAuditing(checkId, getUserId());
    }

}