Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud

luxiaotao1123

2021-04-07 8976457876d817ae1e00b721fce595a376d34435

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

@@ -41,6 +41,12 @@
    @Autowired
    private CustOrderService custOrderService;

    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
    public R stockPakin(@RequestBody PakinParam number) {
        return workService.stockPakin(number, getUserId());
    }

    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
    public R stockIn(@RequestBody StockInParam stockInParam) {