From 746bc3009489b5fe644666cbed138582726f498a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 08:13:59 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 1d9eb87..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,8 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/locDetl/queryDetl/auth")
@ManagerAuth
@@ -55,6 +59,11 @@
if (Cools.isEmpty(nodeId)) {
nodeId = getOriginNode().getId();
param.put("node_id", String.valueOf(nodeId));
+ }
+ 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"));
@@ -148,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