#

luxiaotao1123

2020-06-29 a6a9777ce5b1713180c1948b674950aee2eb3b1f

#

 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.setMatNo(locDetl.getMatnr());
                vo.setMatName(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.setMatNo(locDetl.getMatnr());
                vo.setMatName(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);
    }
}

 src/main/webapp/views/pda/stockOut.html

@@ -110,11 +110,11 @@
<header>
    <div class="layui-input-inline">
        <label class="layui-form-label">库位</label>
        <input class="layui-input" type="text" id="locNo" onkeyup="findLocDetl(this)" autocomplete="off">
        <input class="layui-input" type="text" id="locNo" onkeyup="findByLocNo(this)" autocomplete="off">
    </div>
    <div class="layui-input-inline">
        <label class="layui-form-label">物料</label>
        <input class="layui-input" type="text" id="matNo" autocomplete="off">
        <input class="layui-input" type="text" id="matNo" onkeyup="findByMatNo(this)" autocomplete="off">
    </div>
</header>
<!-- 主体 -->
@@ -144,15 +144,31 @@
    /**
     * 根据库位号查找库存明细
     */
    function findLocDetl(el){
    function findByLocNo(el){
        if (isEmpty(el.value)) {
            return;
        }
        $("#matNo").val("");
        find(el.value, null);
    }

    /**
     * 根据物料号查找库存明细
     */
    function findByMatNo(el){
        if (isEmpty(el.value)) {
            return;
        }
        $("#locNo").val("");
        find(null, el.value);
    }
    function find(locNo, matNo) {
        $.ajax({
            url: baseUrl + "/mobile/locDetl",
            headers: {'token': localStorage.getItem('token')},
            data: {
                locNo: el.value
                locNo: locNo,
                matNo: matNo
            },
            method: 'POST',
            success: function (res) {