From 15c1245e328a589fe1998e1c40119821c0c6eb28 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 三月 2021 12:42:21 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 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..b9ddade 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -40,13 +40,35 @@
@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"))
+ );
}
+// @RequestMapping(value = "/stock/out/list/auth")
+// @ManagerAuth
+// public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
+// @RequestParam(defaultValue = "10")Integer limit,
+// @RequestParam Map<String, Object> param){
+// if (!Cools.isEmpty(param.get("update_time"))){
+// String val = String.valueOf(param.get("update_time"));
+// if (val.contains(RANGE_TIME_LINK)) {
+// String[] dates = val.split(RANGE_TIME_LINK);
+// param.put("startTime", DateUtils.convert(dates[0]));
+// param.put("endTime", DateUtils.convert(dates[1]));
+// param.remove("modi_time");
+// }
+// }
+// return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+// }
+
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1