From b93887bd221deb1d0a4f6379401ff3b992594d8c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 07 八月 2021 16:52:35 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 be082ee..70c85fd 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -14,7 +14,9 @@
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.LocDetl;
+import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.service.LocDetlService;
+import zy.cloud.wms.manager.service.MatService;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,6 +28,19 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
+
+ @RequestMapping(value = "/locDetl/queryDetl/auth")
+ @ManagerAuth
+ public R queryDetl(@RequestParam(required = false) String uuid) {
+ if (Cools.isEmpty(uuid)) {
+ return R.ok();
+ }
+ List<LocDetl> locDetls = locDetlService.findByNodeUuid(uuid);
+ return R.ok().add(locDetls);
+ }
+
@RequestMapping(value = "/locDetl/{id}/auth")
@ManagerAuth
@@ -43,13 +58,23 @@
Object nodeId = param.get("node_id");
if (Cools.isEmpty(nodeId)) {
nodeId = getOriginNode().getId();
+ param.put("node_id", String.valueOf(nodeId));
}
- return R.ok(locDetlService.getPage(new Page<>(curr, limit)
- , String.valueOf(nodeId)
- , param.get("loc_no")
- , param.get("matnr")
- , param.get("maktx"))
- );
+ Object tagId = param.get("tag_id");
+ if (Cools.isEmpty(tagId)) {
+ tagId = getOriginTag().getId();
+ param.put("tag_id", String.valueOf(tagId));
+ }
+ 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("update_time");
+ }
+ }
+ return R.ok(locDetlService.getPage(toPage(curr, limit, param, LocDetl.class)));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -132,4 +157,12 @@
return R.ok();
}
+ @RequestMapping(value = "/locDetl/chart/auth", method = RequestMethod.POST)
+ @ManagerAuth
+ public R chart(@RequestParam String matnr) {
+ Mat mat = matService.selectByMatnr(matnr);
+ List<LocDetl> locDetls = locDetlService.findOfSort(matnr);
+ return R.ok(matnr + (mat==null?"": " - " + mat.getMaktx())).add(locDetls);
+ }
+
}
--
Gitblit v1.9.1