From 98bcd061526cad604a83241cc94994e1e225982a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 09:21:03 +0800
Subject: [PATCH] 库存明细统计增加车间，树脂类型搜索框，默认统计库存状态为(已入库+部分出库+待出库),库存重量为0不显示记录
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 5 ++++-
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 15 +++++++++++++++
src/main/java/com/zy/asrs/mapper/PlaMapper.java | 3 ++-
src/main/resources/mapper/PlaMapper.xml | 11 ++++++++++-
4 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
index 7c03a65..04c1a1f 100644
--- a/src/main/java/com/zy/asrs/mapper/PlaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -19,7 +19,8 @@
List<Pla> getStockStatisAllByBrand(@Param("brand") String brand);
// @Select("select brand, matnr,workshop , sum(weight_anfme) as weight from asr_pla_detl GROUP BY brand,matnr,workshop ORDER BY matnr,workshop desc")
- List<Pla> getStockStatisAll(@Param("brand") String brand,@Param("status") String status,@Param("stime") Date stime, @Param("etime") Date etime);
+ List<Pla> getStockStatisAll(@Param("brand") String brand,@Param("status") String status,@Param("stime") Date stime, @Param("etime") Date etime,
+ @Param("type") String type,@Param("workshop") String workshop);
Integer getStockStatisCountAll(Map<String, Object> map);
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 6aa415c..bd496c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -163,13 +163,16 @@
Object create_time = page.getCondition().get("create_time");
Object brand = page.getCondition().get("brand");
Object status = page.getCondition().get("status");
+ String type = (String) page.getCondition().get("type");
+ String workshop = (String) page.getCondition().get("workshop");
+
String createTime = create_time == null ? null : create_time.toString();
if(!Cools.isEmpty(createTime)){
String[] dates = createTime.split(" - ");
stime = DateUtils.convert(dates[0]);
etime = DateUtils.convert(dates[1]);
}
- plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime);
+ plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime, type, workshop);
double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();
diff --git a/src/main/resources/mapper/PlaMapper.xml b/src/main/resources/mapper/PlaMapper.xml
index 7aa3286..25f26c3 100644
--- a/src/main/resources/mapper/PlaMapper.xml
+++ b/src/main/resources/mapper/PlaMapper.xml
@@ -25,10 +25,19 @@
<if test="etime != null">
and pakin_time <= #{etime}
</if>
+ <if test="status == null or status.trim() == ''">
+ and status in ('宸插叆搴�','閮ㄥ垎鍑哄簱','寰呭嚭搴�')
+ </if>
<if test="status != null and status != ''">
and status = #{status}
</if>
+ <if test="type != null and type != ''">
+ and type = #{type}
+ </if>
+ <if test="workshop != null and workshop != ''">
+ and workshop = #{workshop}
+ </if>
</where>
- GROUP BY brand,matnr,workshop ORDER BY matnr,workshop
+ GROUP BY brand,matnr,workshop HAVING SUM(weight_anfme) > 0 ORDER BY matnr,workshop
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index e42b23f..b363ec5 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -33,6 +33,21 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="type">
+ <option value="">鏍戣剛绫诲瀷</option>
+ <option value="绾爲鑴�">绾爲鑴�</option>
+ <option value="鏀规�ф爲鑴�">鏀规�ф爲鑴�</option>
+ <option value="鍓骇鐗�">鍓骇鐗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="workshop" placeholder="杞﹂棿" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
--
Gitblit v1.9.1