From c6fc22023760e3237d082854bac8c2c7b0d43110 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 15 三月 2024 14:35:55 +0800
Subject: [PATCH] 增加按批号筛选
---
src/main/resources/mapper/ManLocDetlMapper.xml | 3 +++
src/main/webapp/views/ioWorks/matQuery.html | 5 +++++
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 5 +++++
src/main/webapp/views/ioWorks/locDetlQuery.html | 5 +++++
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/java/com/zy/asrs/mapper/MatMapper.java | 3 ++-
src/main/resources/mapper/MatMapper.xml | 8 ++++++--
src/main/webapp/views/pakStore/locDetlQuery.html | 5 +++++
src/main/java/com/zy/asrs/controller/MatController.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/MatService.java | 2 +-
11 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 7e09475..62f533e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -113,7 +113,8 @@
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("batch"))
);
}
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 22e0d28..4502992 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -13,7 +13,8 @@
@Repository
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> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,
+ @Param("maktx") Object maktx, @Param("batch") Object batch);
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..ab669cd 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -6,7 +6,7 @@
public interface MatService extends IService<Mat> {
- Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
+ Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object batch);
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..95654f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -11,8 +11,8 @@
public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
@Override
- public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
- return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
+ public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx,Object batch) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx, batch));
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b188922..b5cf37c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -100,6 +100,9 @@
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
</if>
+ <if test="batch!=null and batch!='' ">
+ and a.batch=#{batch}
+ </if>
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
</if>
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index d4ae055..0d40356 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -49,6 +49,9 @@
<if test="maktx != null and maktx != ''">
and mld.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="batch != null and batch != ''">
+ and mld.batch like concat('%',#{batch},'%')
+ </if>
<if test="startTime!=null and endTime!=null">
and mld.update_time between #{startTime} and #{endTime}
</if>
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 5f89c82..28a995c 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -55,9 +55,10 @@
LEFT JOIN (
select
matnr,
- sum(anfme) as amount
+ sum(anfme) as amount,
+ batch
from man_loc_detl
- group by matnr
+ group by matnr,batch
) as mld on mld.matnr = mm.matnr
WHERE 1=1
and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
@@ -68,6 +69,9 @@
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="batch != null and batch != ''">
+ and mld.batch like concat('%',#{batch},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
diff --git a/src/main/webapp/views/ioWorks/locDetlQuery.html b/src/main/webapp/views/ioWorks/locDetlQuery.html
index dd61a33..1887e22 100644
--- a/src/main/webapp/views/ioWorks/locDetlQuery.html
+++ b/src/main/webapp/views/ioWorks/locDetlQuery.html
@@ -60,6 +60,11 @@
<input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<!-- <div class="layui-inline" style="width: 300px">-->
<!-- <div class="layui-input-inline">-->
diff --git a/src/main/webapp/views/ioWorks/matQuery.html b/src/main/webapp/views/ioWorks/matQuery.html
index 351d3d1..61fd48d 100644
--- a/src/main/webapp/views/ioWorks/matQuery.html
+++ b/src/main/webapp/views/ioWorks/matQuery.html
@@ -36,6 +36,11 @@
<input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index c17c59a..a6bf5e0 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -81,6 +81,11 @@
<input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index de79d02..9d00cfc 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -72,6 +72,11 @@
<input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
--
Gitblit v1.9.1