| | |
|---|
| | | // } |
|---|
| | | excludeTrash(param); |
|---|
| | | String locNo = convert(param, wrapper); |
|---|
| | | String zpallet = String.valueOf( param.get("zpallet")); |
|---|
| | | String matnr = String.valueOf( param.get("matnr")); |
|---|
| | | if (!Cools.isEmpty(zpallet) && zpallet.equals("null")) { |
|---|
| | | zpallet = null; |
|---|
| | | } |
|---|
| | | if (!Cools.isEmpty(matnr) && matnr.equals("null")) { |
|---|
| | | matnr = null; |
|---|
| | | } |
|---|
| | | allLike(LocDetl.class, param.keySet(), wrapper, condition); |
|---|
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
|---|
| | | Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper); |
|---|
| | | if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){ |
|---|
| | | List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo); |
|---|
| | | List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo,zpallet,matnr); |
|---|
| | | return R.ok(locDetlPage.setRecords(locDetls)); |
|---|
| | | }else { |
|---|
| | | return R.ok(locDetlPage); |
|---|
