| | |
|---|
| | | 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)); |
|---|
| | | } |
|---|
| | |
|---|
| | | @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); |
|---|
| | | } |
|---|
| | | |
|---|
