#

luxiaotao1123

2020-07-03 3fe0d694aff302768450259745f207a739f11555

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

@@ -52,24 +52,40 @@
     */
    @RequestMapping("/locDetl")
    @ManagerAuth
    public R getLocDetl(@RequestParam(required = false)String locNo){
        if (Cools.isEmpty(locNo)) {
            return R.parse(BaseRes.PARAM);
    public R getLocDetl(@RequestParam(required = false)String locNo,
                        @RequestParam(required = false)String matNo){
        if (!Cools.isEmpty(locNo)) {
            LocMast locMast = locMastService.selectById(locNo);
            if (null == locMast || !"F".equals(locMast.getLocType())) {
                return R.parse(BaseRes.EMPTY);
            }
            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                    .eq("loc_no", locNo).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);
        }
        LocMast locMast = locMastService.selectById(locNo);
        if (null == locMast || !"F".equals(locMast.getLocType())) {
            return R.parse(BaseRes.EMPTY);
        if (!Cools.isEmpty(matNo)) {
            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                    .eq("matnr", matNo).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);
        }
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
        List<MobileLocDetlVo> res = new ArrayList<>();
        locDetls.forEach(locDetl -> {
            MobileLocDetlVo vo = new MobileLocDetlVo();
            vo.setLocNo(locNo);
            vo.setMatNo(locDetl.getMatnr());
            vo.setMatName(locDetl.getMaktx());
            vo.setCount(locDetl.getAnfme());
            res.add(vo);
        });
        return R.ok().add(res);
        return R.parse(BaseRes.PARAM);
    }
}