# 并板出库

whycq

2024-07-04 09a482e8fb4d4dac63aed1503fd91e738ddb070d

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -106,6 +106,23 @@
        return R.ok().add(orderDetls);
    }

    @RequestMapping("/check/mergeStore/barcode")
    @ManagerAuth
    public R mergeStoreBarcode(@RequestParam String barcode){
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("当前托盘码" + barcode + "没有任务，请检查！");
        }
        if (wrkMast.getIoType() != 104) {
            throw new CoolException("当前托盘码" + barcode + "非并板出库");
        }
        if (wrkMast.getWrkSts() != 14L) {
            throw new CoolException("当前托盘码" + barcode + "出库未完成");
        }
        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        return R.ok().add(wrkDetl.getBomCode());
    }

    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
@@ -117,6 +134,13 @@
    @ManagerAuth(memo = "组托")
    public R comb2(@RequestBody CombParam combParam){
        mobileService.comb2(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/merge/comb/auth")
    @ManagerAuth(memo = "组托")
    public R mergeComb(@RequestBody CombParam combParam){
        mobileService.mergeComb(combParam, getUserId());
        return R.ok("组托成功");
    }

@@ -133,7 +157,7 @@
            return R.ok().add(bomMat);
        } else {
            // 检查是否在bom清单内
            bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
            bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("bom_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
            if (Cools.isEmpty(bomMat)) {
                throw new CoolException("当前物料" + checkBom.getMatnr() + "不在Bom清单内");
            } else {