新增扣杂数据

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

@@ -22,15 +22,18 @@
     <result column="UPDATEMAN" jdbcType="VARCHAR" property="updateman" />
     <result column="UPDATETIME" jdbcType="VARCHAR" property="updatetime" />
     <result column="READTIME" jdbcType="VARCHAR" property="readtime" />
+    <result column="BFSFCL_WATER" jdbcType="DECIMAL" property="bfsfclWater" />
+    <result column="BFSFCL_ZAZHI" jdbcType="DECIMAL" property="bfsfclZazhi" />
+    <result column="BFSFCL_KZ" jdbcType="DECIMAL" property="bfsfclKz" />
   </resultMap>
   <sql id="columns">
     GBSJ, CINVCCODE, CINVCODE, CINVSTD, CWHCODE, TAB, DJLX, PZDL, PLACE, CINVCNAME, CINVNAME,
-    CWHNAME, MZ, PZ, JZ, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME
+    CWHNAME, MZ, PZ, JZ, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME,BFSFCL_WATER,BFSFCL_ZAZHI,BFSFCL_KZ
   </sql>
   <sql id="columns_alias">
     t.GBSJ, t.CINVCCODE, t.CINVCODE, t.CINVSTD, t.CWHCODE, t.TAB, t.DJLX, t.PZDL, t.PLACE,
     t.CINVCNAME, t.CINVNAME, t.CWHNAME, t.MZ, t.PZ, t.JZ, t.CREATEMAN, t.CREATETIME,
-    t.UPDATEMAN, t.UPDATETIME, t.READTIME
+    t.UPDATEMAN, t.UPDATETIME, t.READTIME,t.BFSFCL_WATER,t.BFSFCL_ZAZHI,t.BFSFCL_KZ
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM DZ_MATERIAL_SF
@@ -599,7 +602,8 @@
               cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, djlx,
               case pzdl when '' then '空' else ISNULL(pzdl,'空') end as pzdl,
               'sh' as tab,
-              case BFSFCL_FHDD when '' then '空' else ISNULL(BFSFCL_FHDD,'空') end as place
+              case BFSFCL_FHDD when '' then '空' else ISNULL(BFSFCL_FHDD,'空') end as place,
+    SUM(BFSFCL_WATER) as BFSFCL_WATER,sum(BFSFCL_ZAZHI) as BFSFCL_ZAZHI,sum(BFSFCL_KZ) as BFSFCL_KZ
               FROM v_nyjk_sh where gbsj >= #{gbsj}
               group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), gbsj, 23),djlx, pzdl,BFSFCL_FHDD
                           ) as sh union all (
@@ -608,7 +612,8 @@
             cWhCode, cWhName, sum(mz) as mz, sum(pz) as pz, sum(jz) as jz, djlx,
             case pzdl when '' then '空' else ISNULL(pzdl,'空') end as pzdl,
             'fh' as tab,
-            case BFFHCL_FHDD when '' then '空' else ISNULL(BFFHCL_FHDD,'空') end as place
+            case BFFHCL_FHDD when '' then '空' else ISNULL(BFFHCL_FHDD,'空') end as place,
+    0 as BFSFCL_WATER,0 as BFSFCL_ZAZHI,0 as BFSFCL_KZ
     FROM v_nyjk_fh where gbsj >= #{gbsj}
     group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), [gbsj], 23),djlx, pzdl,BFFHCL_FHDD)
   </select>

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

@@ -105,6 +105,21 @@ public class DzMaterialSf {
      */
     private String readtime;
 
+    /**
+     * 扣水(BFSFCL_WATER,DECIMAL,20)
+     */
+    private BigDecimal bfsfclWater;
+
+    /**
+     * 杂质(BFSFCL_ZAZHI,DECIMAL,20)
+     */
+    private BigDecimal bfsfclZazhi;
+
+    /**
+     * 扣杂(BFSFCL_KZ,DECIMAL,20)
+     */
+    private BigDecimal bfsfclKz;
+
     private static final long serialVersionUID = 1L;
 
     public Map<String, Object> getId() {
@@ -293,6 +308,30 @@ public class DzMaterialSf {
         this.readtime = readtime == null ? null : readtime.trim();
     }
 
+    public BigDecimal getBfsfclWater() {
+        return bfsfclWater;
+    }
+
+    public void setBfsfclWater(BigDecimal bfsfclWater) {
+        this.bfsfclWater = bfsfclWater;
+    }
+
+    public BigDecimal getBfsfclZazhi() {
+        return bfsfclZazhi;
+    }
+
+    public void setBfsfclZazhi(BigDecimal bfsfclZazhi) {
+        this.bfsfclZazhi = bfsfclZazhi;
+    }
+
+    public BigDecimal getBfsfclKz() {
+        return bfsfclKz;
+    }
+
+    public void setBfsfclKz(BigDecimal bfsfclKz) {
+        this.bfsfclKz = bfsfclKz;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -319,6 +358,9 @@ public class DzMaterialSf {
         sb.append(", updateman=").append(updateman);
         sb.append(", updatetime=").append(updatetime);
         sb.append(", readtime=").append(readtime);
+        sb.append(", bfsfclWater=").append(bfsfclWater);
+        sb.append(", bfsfclZazhi=").append(bfsfclZazhi);
+        sb.append(", bfsfclKz=").append(bfsfclKz);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();