From 97917f3fd0e1ab80e8d864576926df22507e222a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 26 May 2025 16:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E8=AE=B0=E5=BD=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E6=AC=A1=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/jcsj/YdjhzzController.java  |  4 ++--
 .../com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java |  2 +-
 src/main/resources/mappers/jhgk/DmYdjhMapper.xml  | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
index 9341f71..4b5bcf0 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
@@ -34,8 +34,8 @@ public class YdjhzzController {
 
     @ApiOperation(value = "查询")
     @PostMapping(value = "/getList")
-    public ResultBean getList(@RequestParam String ch) {
-        List<Ydjhzz> list=mapper.getYdjhzz(ch);
+    public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1) {
+        List<Ydjhzz> list=mapper.getYdjhzz(ch,dcpl,dcpl1);
         return new ResultBean(list);
     }
 
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
index fac2582..bf04e46 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
@@ -87,7 +87,7 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
     void updatezyq(String dcch,String dcpl);
 
     Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh);
-    List<Ydjhzz> getYdjhzz(String ch);
+    List<Ydjhzz> getYdjhzz(String ch,String dcpl,String dcpl1);
     RjhDto getRjh(String date);
     RjhDto getSyRwc(String yf,Double num);
     RjhDto getByRjh(String yf,Double num);
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index fdcfce3..cc49ed1 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -1347,8 +1347,6 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
         <result column="bcshzl_dflj" property="bcshzl_dflj"/>
     </resultMap>
     <select id="getYdjhzz" resultMap="ZZResultMap">
-
-
         SELECT
             RTRIM(DM_BCLQJBP.DC_CH) AS dc_ch,
             RTRIM(DM_BCLQJBP.DC_PL) AS dc_pl,
@@ -1542,11 +1540,22 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
             CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X'  and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 方钢零件重量
 
         FROM DM_BCLQJBP,DM_BCLQMXP  left join DM_WPJBP  on  DM_BCLQMXP.WPH = DM_WPJBP.WPH
-        WHERE 			DM_BCLQMXP.LQBH = DM_BCLQJBP.LQBH	and DM_BCLQJBP.DC_CH=#{ch}
+        WHERE
+            DM_BCLQMXP.LQBH = DM_BCLQJBP.LQBH	and DM_BCLQJBP.DC_CH=#{ch}
+            <if test=" dcpl!=null and dcpl!='' and (dcpl1==null or dcpl1=='')">
+                and   DM_BCLQJBP.dc_pl=#{dcpl}
+            </if>
+            <if test=" dcpl!=null and dcpl!='' and dcpl1!=null and dcpl1!=''">
+                and   DM_BCLQJBP.dc_pl>=#{dcpl} and DM_BCLQJBP.dc_pl&lt;=#{dcpl1}
+            </if>
+            <if test=" (dcpl==null or dcpl=='') and dcpl1!=null and dcpl1!=''">
+                and DM_BCLQJBP.dc_pl&lt;=#{dcpl1}
+            </if>
         GROUP BY DM_BCLQJBP.DC_CH,DM_BCLQJBP.DC_PL,DM_BCLQJBP.DC_FD
         ORDER BY DM_BCLQJBP.DC_CH,DM_BCLQJBP.DC_PL
 
     </select>
+
     <select id="getYdjhzz1" resultMap="ZZResultMap">
 
         SELECT