From 392e0fb335d40914c090369569e71db96ca04e53 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期日, 08 一月 2023 09:45:30 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 5 +++++
src/main/java/com/zy/asrs/mapper/MatMapper.java | 1 +
src/main/resources/mapper/MatMapper.xml | 28 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/MatController.java | 5 +++--
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/service/MatService.java | 1 +
6 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index a9932c6..e1fb0d2 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -93,10 +93,11 @@
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
}
- return R.ok(matService.getPage(new Page<>(curr, limit)
+ return R.ok(matService.getPage2(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("specs"))
);
}
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 22e0d28..d20c5fe 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -14,6 +14,7 @@
public interface MatMapper extends BaseMapper<Mat> {
List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
+ List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs);
Mat selectByMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index 3b4b655..2fe0893 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -7,6 +7,7 @@
public interface MatService extends IService<Mat> {
Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
+ Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs);
Mat selectByMatnr(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 8abf584..0e6142f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -14,6 +14,10 @@
public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
}
+ @Override
+ public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
+ return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs));
+ }
@Override
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 5f89c82..875bb6a 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -71,6 +71,34 @@
ORDER BY mm.create_time DESC
</select>
+ <select id="listByPage2" resultMap="BaseResultMap">
+ SELECT
+ isnull(mld.amount,0) as stock,
+ mm.*
+ FROM man_mat mm
+ LEFT JOIN man_tag mt ON mm.tag_id = mt.id
+ LEFT JOIN (
+ select
+ matnr,
+ sum(anfme) as amount
+ from man_loc_detl
+ group by matnr
+ ) as mld on mld.matnr = mm.matnr
+ WHERE 1=1
+ and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
+ AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
+ <if test="matnr != null and matnr != ''">
+ and mm.matnr like concat('%',#{matnr},'%')
+ </if>
+ <if test="maktx != null and maktx != ''">
+ and mm.maktx like concat('%',#{maktx},'%')
+ </if>
+ <if test="specs != null and specs != ''">
+ and mm.specs like concat('%',#{specs},'%')
+ </if>
+ ORDER BY mm.create_time DESC
+ </select>
+
<select id="selectByMatnr" resultMap="BaseResultMap">
select top 1 * from man_mat where 1=1 and matnr = #{matnr}
</select>
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 6248d71..174bb0f 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -29,6 +29,11 @@
<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="specs" placeholder="瑙勬牸" autocomplete="off">
+ </div>
+ </div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
--
Gitblit v1.9.1