From 9446f5a0bb5a578f50046046d2b735a7b13b53ce Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 22 十二月 2023 16:23:47 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/tagTree.js | 2 +-
zy-asrs-wms/src/main/webapp/static/js/mat/mat.js | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java | 20 --------------------
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
index 4576e75..07169b2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -211,24 +211,4 @@
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
}
- /*************************************** xm-select ***********************************************/
-
- // xm-select 鎼滅储鍟嗗搧鍒楄〃
- @RequestMapping("/mat/all/get/kv")
- @ManagerAuth
- public R getMatDataKV(@RequestParam(required = false) String condition) {
- LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<Mat>()
- .like(Mat::getMatnr, condition).or().like(Mat::getMaktx, condition)
- .orderByAsc(Mat::getCreateTime);
- List<Mat> mats = matService.page(new Page<>(1, 30), wrapper).getRecords();
- List<KeyValueVo> valueVos = new ArrayList<>();
- for (Mat mat : mats) {
- KeyValueVo vo = new KeyValueVo();
- vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
- vo.setValue(mat.getId());
- valueVos.add(vo);
- }
- return R.ok().add(valueVos);
- }
-
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
index a18decc..2d105b1 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
@@ -30,7 +30,7 @@
// 鍟嗗搧鍒嗙被鏁版嵁
var insTb = treeTable.render({
elem: '#tag',
- url: baseUrl+'/manTag/page/auth',
+ url: baseUrl+'/tag/page/auth',
headers: {token: localStorage.getItem('token')},
tree: {
iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
diff --git a/zy-asrs-wms/src/main/webapp/static/js/tagTree.js b/zy-asrs-wms/src/main/webapp/static/js/tagTree.js
index a7c2ae1..dcbbca5 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/tagTree.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/tagTree.js
@@ -19,7 +19,7 @@
window.loadTree = function(condition){
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/manTag/tree/auth",
+ url: baseUrl+"/tag/tree/auth",
headers: {'token': localStorage.getItem('token')},
data: {
'condition': condition
--
Gitblit v1.9.1