Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-09 aa21112291b04d0d3d53d75104a348f019f935a1

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

@@ -52,6 +52,16 @@
        return R.ok();
    }

    /**
     * 组托-批量
     */
    @RequestMapping("/comb/auth/batch")
    @ManagerAuth(memo = "组托-批量")
    public R combBatch(@RequestBody CombParam combParam){
        mobileService.combBatch(combParam, getUserId());
        return R.ok();
    }


    /**
     * 组托
@@ -69,7 +79,9 @@
    @RequestMapping("/locDetl")
    @ManagerAuth
    public R getLocDetl(@RequestParam(required = false)String locNo,
                        @RequestParam(required = false)String matNo){
                        @RequestParam(required = false)String matNo,
                        @RequestParam(required = false)String supplier
                        ){
        if (!Cools.isEmpty(locNo)) {
            LocMast locMast = locMastService.selectById(locNo);
            if (null == locMast || !"F".equals(locMast.getLocSts())) {
@@ -102,6 +114,20 @@
            });
            return R.ok().add(res);
        }
        if (!Cools.isEmpty(supplier)) {
            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                    .eq("supplier", supplier).orderBy("appe_time", false));
            List<MobileLocDetlVo> res = new ArrayList<>();
            locDetls.forEach(locDetl -> {
                MobileLocDetlVo vo = new MobileLocDetlVo();
                vo.setLocNo(locDetl.getLocNo());
                vo.setMatnr(locDetl.getMatnr());
                vo.setMaktx(locDetl.getMaktx());
                vo.setCount(locDetl.getAnfme());
                res.add(vo);
            });
            return R.ok().add(res);
        }
        return R.parse(BaseRes.PARAM);
    }

@@ -120,6 +146,10 @@
                vo.setMatName(waitPakin.getMaktx());
                vo.setCount(waitPakin.getAnfme());
                vo.setMnemonic(waitPakin.getMnemonic());
                vo.setSupplier(waitPakin.getSupplier());
                vo.setAltme(waitPakin.getAltme());
                vo.setType(waitPakin.getType());
                vo.setLgnum(waitPakin.getLgnum());
                vos.add(vo);
            }
        }