From ec030db3863efdb498404ea8af412cd28478eba7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 04 三月 2021 14:33:49 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
index b26e1d8..be082ee 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -40,11 +40,16 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ Object nodeId = param.get("node_id");
+ if (Cools.isEmpty(nodeId)) {
+ nodeId = getOriginNode().getId();
+ }
+ return R.ok(locDetlService.getPage(new Page<>(curr, limit)
+ , String.valueOf(nodeId)
+ , param.get("loc_no")
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
--
Gitblit v1.9.1