From 21efa735d706b4d7d0cbcc94bcd21ac1533881d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 二月 2021 10:02:13 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/webapp/views/locDetl/locDetl.html | 34 ++---------------
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 20 ++++++---
src/main/java/zy/cloud/wms/manager/service/MatService.java | 5 ++
src/main/resources/mapper/MatMapper.xml | 6 +-
src/main/webapp/views/mat/mat.html | 4 ++
src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java | 6 +++
src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java | 5 ++
8 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index f0827b3..38a4018 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -46,15 +46,21 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){
+// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// }
+// Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
+//
+// return R.ok().add(page);
+ Object tagId = param.get("tag_id");
+ if (Cools.isEmpty(tagId)) {
+ tagId = getOriginTag().getId();
}
- Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(matService.getPage(new Page<>(curr, limit), String.valueOf(tagId)));
- return R.ok().add(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java
index 885d10e..92a17ca 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java
@@ -1,15 +1,20 @@
package zy.cloud.wms.manager.mapper;
+import com.baomidou.mybatisplus.plugins.Page;
import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.Mat;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface MatMapper extends BaseMapper<Mat> {
+ List<Mat> listByPage(Page page, @Param("tagId") String tagId);
+
Mat selectByMatnr(@Param("matnr")String matnr);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/MatService.java b/src/main/java/zy/cloud/wms/manager/service/MatService.java
index 14cffbc..92b289b 100644
--- a/src/main/java/zy/cloud/wms/manager/service/MatService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/MatService.java
@@ -1,10 +1,13 @@
package zy.cloud.wms.manager.service;
-import zy.cloud.wms.manager.entity.Mat;
+import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import zy.cloud.wms.manager.entity.Mat;
public interface MatService extends IService<Mat> {
+ Page<Mat> getPage(Page page, String tagId);
+
Mat selectByMatnr(String matnr);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java
index 3cf1e24..b6cc72d 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.service.impl;
+import com.baomidou.mybatisplus.plugins.Page;
import zy.cloud.wms.manager.mapper.MatMapper;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.service.MatService;
@@ -9,6 +10,11 @@
@Service("matService")
public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
+ @Override
+ public Page<Mat> getPage(Page page, String tagId) {
+ return page.setRecords(baseMapper.listByPage(page, tagId));
+ }
+
@Override
public Mat selectByMatnr(String matnr) {
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index aa1dd26..053f1d2 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -31,13 +31,13 @@
</resultMap>
- <select id="listByPageByArea" resultMap="BaseResultMap">
+ <select id="listByPage" resultMap="BaseResultMap">
SELECT
mm.*
FROM man_mat mm
- LEFT JOIN man_tag mt ON mm.`tag_id` = mt.`id`
+ LEFT JOIN man_tag mt ON mm.tag_id = mt.id
WHERE 1=1
- AND (FIND_IN_SET(#{tagId}, mt.`path`) OR mt.`id` = #{tagId})
+ AND (CHARINDEX(',' + '#{tagId}' + ',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
ORDER BY mm.create_time DESC
</select>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index c1faa6d..7c8387e 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -43,7 +43,7 @@
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 2487450..3c9366f 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -29,6 +29,10 @@
.layui-form.layui-border-box.layui-table-view {
margin: 0;
}
+ #search-box {
+ padding: 30px 30px 10px 0px;
+ margin-left: 0px;
+ }
</style>
</head>
<body>
@@ -92,36 +96,6 @@
</div>
</div>
-<!--<!– 鎼滅储鏍� –>-->
-<!--<div id="search-box" class="layui-form layui-card-header">-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="loc_no" placeholder="璐т綅缂栧彿" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <!– 寰呮坊鍔� –>-->
-<!-- <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-<!-- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-<!-- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
-<!-- </div>-->
-<!--</div>-->
-
-<!--<!– 琛ㄦ牸 –>-->
-<!--<div class="layui-form">-->
-<!-- <table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>-->
-<!--</div>-->
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index d5fcad5..ac87ff6 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -29,6 +29,10 @@
.layui-form.layui-border-box.layui-table-view {
margin: 0;
}
+ #search-box {
+ padding: 30px 30px 10px 0px;
+ margin-left: 0px;
+ }
</style>
</head>
<body>
--
Gitblit v1.9.1