#

luxiaotao1123

2021-03-11 469be99743f499c38d710056d17609f384b6e66d

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

@@ -13,6 +13,7 @@
import zy.cloud.wms.common.web.BaseController;
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;
@@ -49,9 +50,15 @@
    }

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

    @RequestMapping("/stock/out/print")
    @ManagerAuth(memo = "拣货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/allot")
@@ -63,7 +70,7 @@
    @RequestMapping("/pakout/get")
    @ManagerAuth(memo = "获取出库单")
    public R getPakout(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1,2));
        if (Cools.isEmpty(pakouts)) {
            return R.parse(BaseRes.EMPTY);
        }
@@ -82,9 +89,27 @@
    }

    @RequestMapping("/stock/out/confirm")
    @ManagerAuth(memo = "捡货确认")
    @ManagerAuth(memo = "拣货确认")
    public R stockOutConfirm(@RequestBody StockConfirmParam param) {
        return workService.stockOutComplete(param, getUserId());
    }

    @RequestMapping("/pakout/init")
    @ManagerAuth(memo = "生成拣货单")
    public R initPakout(@RequestBody List<InitPakoutParam> params) {
        return workService.initPakout(params, getUserId());
    }


    @RequestMapping("/hand/control/pakout")
    @ManagerAuth(memo = "手动处理拣货单")
    public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
        if (type == 1) {
            return workService.completePakout(wrkNo, getUserId());
        } else if (type == 2) {
            return workService.cancelPakout(wrkNo, getUserId());
        }
        return R.ok();
    }

}