From 85144a78e0dab5ccf7ac98682e03f953febe3d9e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 25 十二月 2024 13:55:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 32 ++++++++++++++++++++++++++++++++
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2 +-
2 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 6663229..178eef4 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
@@ -17,6 +18,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
@RestController
@@ -122,4 +124,34 @@
}
}
+ @RequestMapping(value = "/manLocDetl/export/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+ if (!row.equals("")){
+ wrapper.and()
+ .where("loc_no like '" +row +"%'");
+ }
+ List<ManLocDetl> list = manLocDetlService.selectList(wrapper);
+ list.forEach(m -> {
+ m.setMatnr(m.getMatnr() + " ");
+ });
+
+ return R.ok(exportSupport(list, fields));
+ }
+
}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index fac3893..6d8c8cf 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -179,7 +179,7 @@
};
var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/locDetl/export/auth",
+ url: baseUrl+"/manLocDetl/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
--
Gitblit v1.9.1