From 1d3bb76d19961a6e165a7e234ccf17b5eb3a84d9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 01 六月 2021 13:02:57 +0800
Subject: [PATCH] 宏挺补仓功能(未完

---
 src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 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 2ff8b0b..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
@@ -44,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"));
@@ -137,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