1.炼钢数据日产量

src/main/java/com/steerinfo/product/dzmaterialsf/mapper/DzMaterialSfMapper.xml

@@ -19,14 +19,17 @@
     <result column="UPDATEMAN" jdbcType="VARCHAR" property="updateman" />
     <result column="UPDATETIME" jdbcType="VARCHAR" property="updatetime" />
     <result column="READTIME" jdbcType="VARCHAR" property="readtime" />
+    <result column="DJLX" jdbcType="VARCHAR" property="djlx" />
+    <result column="PZDL" jdbcType="VARCHAR" property="pzdl" />
   </resultMap>
   <sql id="columns">
     GBSJ, CINVCCODE, CINVCNAME, CINVCODE, CINVNAME, CINVSTD, CWHCODE, CWHNAME, MZ, PZ, 
-    JZ, TAB, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME
+    JZ, TAB, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME, DJLX, PZDL
   </sql>
   <sql id="columns_alias">
     t.GBSJ, t.CINVCCODE, t.CINVCNAME, t.CINVCODE, t.CINVNAME, t.CINVSTD, t.CWHCODE, t.CWHNAME, 
-    t.MZ, t.PZ, t.JZ, t.TAB, t.CREATEMAN, t.CREATETIME, t.UPDATEMAN, t.UPDATETIME, t.READTIME
+    t.MZ, t.PZ, t.JZ, t.TAB, t.CREATEMAN, t.CREATETIME, t.UPDATEMAN, t.UPDATETIME, t.READTIME,
+    t.DJLX, t.PZDL
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM DZ_MATERIAL_SF
@@ -514,18 +517,17 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+<!--  &#45;&#45;cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')-->
   <select id="getDzMaterialSf" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select * from (
-     SELECT CONVERT(varchar(100), gbsj, 23) as gbsj, cInvCCode, cInvCName, cInvCode, cInvName,
-     cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, 'sh' as tab
-    FROM v_nyjk_sh where gbsj >= #{gbsj,jdbcType=VARCHAR} and
-     cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
-    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), gbsj, 23)
-     ) as sh union all (
-     SELECT CONVERT(varchar(100), gbsj, 23) as gbsj, cInvCCode, cInvCName, cInvCode, cInvName,
-     cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, 'fh' as tab
-    FROM v_nyjk_fh where gbsj >= #{gbsj,jdbcType=VARCHAR} and
-      cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
-    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), [gbsj], 23))
+    SELECT CONVERT(varchar(100), gbsj, 23) as gbsj, cInvCCode, cInvCName, cInvCode, cInvName,
+    cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, djlx, pzdl, 'sh' as tab
+    FROM v_nyjk_sh where gbsj >= #{gbsj,jdbcType=VARCHAR} and pzdl IS NOT NULL
+    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), gbsj, 23),djlx, pzdl
+    ) as sh union all (
+    SELECT CONVERT(varchar(100), gbsj, 23) as gbsj, cInvCCode, cInvCName, cInvCode, cInvName,
+    cInvStd, cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, djlx, pzdl, 'fh' as tab
+    FROM v_nyjk_fh where gbsj >= #{gbsj,jdbcType=VARCHAR} and pzdl IS NOT NULL
+    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), [gbsj], 23),djlx, pzdl)
   </select>
 </mapper>

src/main/java/com/steerinfo/product/dzmaterialsf/model/DzMaterialSf.java

@@ -90,6 +90,16 @@ public class DzMaterialSf {
      */
     private String readtime;
 
+    /**
+     * 单据类型(READTIME,VARCHAR,50)
+     */
+    private String djlx;
+
+    /**
+     * 品种(READTIME,VARCHAR,50)
+     */
+    private String pzdl;
+
     private static final long serialVersionUID = 1L;
 
     public Map<String, Object> getId() {
@@ -99,6 +109,7 @@ public class DzMaterialSf {
         params.put("cinvcode",this.cinvcode);
         params.put("cwhcode",this.cwhcode);
         params.put("tab",this.tab);
+        params.put("djlx",this.djlx);
         return params;
     }
 
@@ -108,6 +119,7 @@ public class DzMaterialSf {
         this.cinvcode = dzMaterialSf.getCinvcode();
         this.cwhcode = dzMaterialSf.getCwhcode();
         this.tab = dzMaterialSf.getTab();
+        this.djlx = dzMaterialSf.getDjlx();
     }
 
     public String getGbsj() {
@@ -246,6 +258,19 @@ public class DzMaterialSf {
         this.readtime = readtime == null ? null : readtime.trim();
     }
 
+    public String getDjlx() { return djlx; }
+
+    public void setDjlx(String djlx) {
+        this.djlx = djlx;
+    }
+
+    public String getPzdl() {
+        return pzdl;
+    }
+
+    public void setPzdl(String pzdl) {
+        this.pzdl = pzdl;
+    }
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -269,6 +294,8 @@ public class DzMaterialSf {
         sb.append(", updateman=").append(updateman);
         sb.append(", updatetime=").append(updatetime);
         sb.append(", readtime=").append(readtime);
+        sb.append(", djlx=").append(djlx);
+        sb.append(", pzdl=").append(pzdl);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/weight/lgmes/mapper/LgReportMapper.xml

@@ -21,6 +21,7 @@
 <!--        <id column="TSYLJ" jdbcType="VARCHAR" property="tsYlj"/>-->
 <!--        <id column="TSNLJ" jdbcType="VARCHAR" property="tsYlj"/>-->
         <id column="JS" jdbcType="VARCHAR" property="memo"/>
+        <id column="GSRCL" jdbcType="VARCHAR" property="gsrcl"/>
     </resultMap>
     <select id="QueryReportByTime"  resultMap="BaseResultMap" parameterType="java.lang.String">
         select * from table(jymes.IMP_EMS_REPORT(#{clock}))

src/main/java/com/steerinfo/weight/lgmes/model/EmsScqkLg.java

@@ -115,4 +115,9 @@ public class EmsScqkLg {
      */
     private Short llb;
 
+    /**
+     * 钢水日产量(GSRCL,DECIMAL,0)
+     */
+    private Short gsrcl;
+
 }