#

luxiaotao1123

2021-05-21 8b0764c6bc0f232d0ffce04644f3f65201890dac

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

@@ -56,7 +56,7 @@
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        if (Cools.isEmpty(param.get("state"))) {
            wrapper.eq("state", "1").or().eq("state", "2");
            wrapper.in("state", "1,2");
        }
        return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -166,9 +166,9 @@
    @RequestMapping(value = "/locNormal/pda/out/query")
    @ManagerAuth(memo = "pda出库查询")
    @Transactional
    public R locNormalPdaOutQuery(String matnr, String warehouse) {
    public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
        List<LocNormal> list = new ArrayList<>();
        list  = locNormalService.pdaLocNormalQuery(matnr, warehouse);
        list  = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
        return R.ok(list);
    }