diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java
index 4f684f8..6e1c0dd 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java
@@ -268,6 +268,76 @@ public class Ydjhzz implements Serializable {
     private Double lqhj_dz;
     private Double shhj_xz;
     private Double shhj_dz;
+    private Double 龙门1余料重量;
+    private Double 龙门1前批余料代;
+    private Double 龙门1零件重量;
+    private Double 数1余料重量;
+    private Double 数1前批余料代;
+    private Double 数1零件重量;
+    private Double 数小2余料重量;
+    private Double 数小2前批余料代;
+    private Double 数小2零件重量;
+    private Double 数中大2余料重量;
+    private Double 数中大2前批余料代;
+    private Double 数中大2零件重量;
+    private Double 小腹余料重量;
+    private Double 小腹前批余料代;
+    private Double 小腹零件重量;
+    private Double 大腹余料重量;
+    private Double 大腹前批余料代;
+    private Double 大腹零件重量;
+    private Double 小组厚板余料重量;
+    private Double 小组厚板前批余料代;
+    private Double 小组厚板零件重量;
+    private Double 大组厚板余料重量;
+    private Double 大组厚板前批余料代;
+    private Double 大组厚板零件重量;
+    private Double 数小4余料重量;
+    private Double 数小4前批余料代;
+    private Double 数小4零件重量;
+    private Double 机肘4余料重量;
+    private Double 机肘4前批余料代;
+    private Double 机肘4零件重量;
+    private Double 小面余料重量;
+    private Double 小面前批余料代;
+    private Double 小面零件重量;
+    private Double 大面余料重量;
+    private Double 大面前批余料代;
+    private Double 大面零件重量;
+    private Double 手小3余料重量;
+    private Double 手小3前批余料代;
+    private Double 手小3零件重量;
+    private Double 手机3余料重量;
+    private Double 手机3前批余料代;
+    private Double 手机3零件重量;
+    private Double 手中大3余料重量;
+    private Double 手中大3前批余料代;
+    private Double 手中大3零件重量;
+    private Double 小组型材余料重量;
+    private Double 小组型材前批余料代;
+    private Double 小组型材零件重量;
+    private Double 大组型材余料重量;
+    private Double 大组型材前批余料代;
+    private Double 大组型材零件重量;
+    private Double 数中大4余料重量;
+    private Double 数中大4前批余料代;
+    private Double 数中大4零件重量;
+    private Double 数曲2小余料重量;
+    private Double 数曲2小前批余料代;
+    private Double 数曲2小零件重量;
+    private Double 数曲2大余料重量;
+    private Double 数曲2大前批余料代;
+    private Double 数曲2大零件重量;
+    private Double 小曲3余料重量;
+    private Double 小曲3前批余料代;
+    private Double 小曲3零件重量;
+    private Double 大曲3余料重量;
+    private Double 大曲3前批余料代;
+    private Double 大曲3零件重量;
+    private Double 光电余料重量;
+    private Double 光电前批余料代;
+    private Double 光电零件重量;
+
     public Double getXchdw(){
         Double[] d= {xzdw,dzdw,fgdw};
         return add(d);
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index eebf942..6dde265 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -1352,6 +1352,180 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
     </resultMap>
     <select id="getYdjhzz" resultMap="ZZResultMap">
 
+
+        SELECT
+            RTRIM(DM_BCLQJBP.DC_CH) AS dc_ch,
+            RTRIM(DM_BCLQJBP.DC_PL) AS dc_pl,
+            RTRIM(DM_BCLQJBP.DC_FD) AS dc_fd,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN 1 ELSE 0 END) as lm1,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_lm1,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_lm1,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 龙门1余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 龙门1前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 龙门1零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN 1 ELSE 0 END) as s1,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='8' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_s1,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_s1,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数1余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数1前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数1零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN 1 ELSE 0 END) as sx2,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sx2,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sx2,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数小2余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数小2前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数小2零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN 1 ELSE 0 END) as szd2,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_szd2,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bclqzl_szd2,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数中大2余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数中大2前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数中大2零件重,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN 1 ELSE 0 END) as xf,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xf,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xf,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小腹余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小腹前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小腹零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN 1 ELSE 0 END) as df,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_df,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_df,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大腹余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大腹前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大腹零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN 1 ELSE 0 END) as xzhb,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xzhb,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xzhb,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小组厚板余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小组厚板前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小组厚板零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN 1 ELSE 0 END) as dzhb,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dzhb,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dzhb,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大组厚板余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大组厚板前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大组厚板零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN 1 ELSE 0 END) as sx4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sx4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sx4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数小4余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数小4前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数小4零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN 1 ELSE 0 END) as jz4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_jz4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_jz4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 机肘4余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 机肘4前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 机肘4零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN 1 ELSE 0 END) as xm,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xm,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xm,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小面余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小面前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小面零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN 1 ELSE 0 END) as dm,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dm,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dm,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大面余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大面前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大面零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as sx3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sx3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sx3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 手小3余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 手小3前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 手小3零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as sj3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sj3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sj3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 手机3余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 手机3前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 手机3零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as szd3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_szd3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_szd3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 手中大3余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 手中大3前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 手中大3零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN 1 ELSE 0 END) as xzgs,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.delx!='B' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xz,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xz,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小组型材余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小组型材前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小组型材零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN 1 ELSE 0 END) as dzgs,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.delx!='B' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dz,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dz,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大组型材余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大组型材前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大组型材零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as szd4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and  DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_szd4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_szd4,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数中大4余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数中大4前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数中大4零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN 1 ELSE 0 END) as sq2x,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='10' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sq2x,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sq2x,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数曲2小余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数曲2小前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数曲2小零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN 1 ELSE 0 END) as sq2d,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='10' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sq2d,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sq2d,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数曲2大余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数曲2大前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数曲2大零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='13' THEN 1 ELSE 0 END) as xq3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='13' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xq3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xq3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小曲3余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小曲3前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小曲3零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='13' THEN 1 ELSE 0 END) as dq3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dq3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dq3,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大曲3余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大曲3前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大曲3零件重量,
+
+            SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN 1 ELSE 0 END) as gd,
+            SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_gd,
+            SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_gd,
+            SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 光电余料重量,
+            SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 光电前批余料代,
+            SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) 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}
+        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
             dc_ch,
             dc_pl,
@@ -1370,6 +1544,9 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
                 END) as decimal(18,1)) as lmdw,
             CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bclqzl ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_lm1,
             CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bcshzl ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_lm1,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bcylzl ELSE 0 END)/1000 as decimal(18,1)) as 龙门1余料重量,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bcqpyld ELSE 0 END)/1000 as decimal(18,1)) as 龙门1前批余料代,
+            CAST(SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='7' THEN dm_ydjh.bcljtlzl ELSE 0 END)/1000 as decimal(18,1)) as 龙门1零件重量,
             SUM(CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='8' THEN 1 ELSE 0 END) as s1,
             CAST(SUM( CASE WHEN dm_ydjh.zl= '1110' and dm_ydjh.kw='8'
                                THEN
@@ -1582,6 +1759,7 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
         GROUP BY dc_ch,dc_pl
         ORDER BY dc_pl
     </select>
+
     <select id="getRjh" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
         SELECT
             SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' and substring(pwfkrq,0,11)=#{date}  THEN 1 ELSE 0 END) AS pwnum,