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 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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();
 

--
Gitblit v1.9.1