Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-datasource

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

@@ -3,33 +3,34 @@
 <mapper namespace="com.steerinfo.product.dzmaterialsf.mapper.DzMaterialSfMapper">
   <resultMap id="BaseResultMap" type="com.steerinfo.product.dzmaterialsf.model.DzMaterialSf">
     <id column="GBSJ" jdbcType="VARCHAR" property="gbsj" />
-    <result column="CINVCCODE" jdbcType="VARCHAR" property="cinvccode" />
+    <id column="CINVCCODE" jdbcType="VARCHAR" property="cinvccode" />
+    <id column="CINVCODE" jdbcType="VARCHAR" property="cinvcode" />
+    <id column="CINVSTD" jdbcType="VARCHAR" property="cinvstd" />
+    <id column="CWHCODE" jdbcType="VARCHAR" property="cwhcode" />
+    <id column="TAB" jdbcType="VARCHAR" property="tab" />
+    <id column="DJLX" jdbcType="VARCHAR" property="djlx" />
+    <id column="PZDL" jdbcType="VARCHAR" property="pzdl" />
+    <id column="PLACE" jdbcType="VARCHAR" property="place" />
     <result column="CINVCNAME" jdbcType="VARCHAR" property="cinvcname" />
-    <result column="CINVCODE" jdbcType="VARCHAR" property="cinvcode" />
     <result column="CINVNAME" jdbcType="VARCHAR" property="cinvname" />
-    <result column="CINVSTD" jdbcType="VARCHAR" property="cinvstd" />
-    <result column="CWHCODE" jdbcType="VARCHAR" property="cwhcode" />
     <result column="CWHNAME" jdbcType="VARCHAR" property="cwhname" />
     <result column="MZ" jdbcType="DECIMAL" property="mz" />
     <result column="PZ" jdbcType="DECIMAL" property="pz" />
     <result column="JZ" jdbcType="DECIMAL" property="jz" />
-    <result column="TAB" jdbcType="VARCHAR" property="tab" />
     <result column="CREATEMAN" jdbcType="VARCHAR" property="createman" />
     <result column="CREATETIME" jdbcType="VARCHAR" property="createtime" />
     <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, DJLX, PZDL
+    GBSJ, CINVCCODE, CINVCODE, CINVSTD, CWHCODE, TAB, DJLX, PZDL, PLACE, CINVCNAME, CINVNAME,
+    CWHNAME, MZ, PZ, JZ, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME
   </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.DJLX, t.PZDL
+    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
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM DZ_MATERIAL_SF
@@ -38,28 +39,40 @@
     SELECT <include refid="columns_alias"/> FROM DZ_MATERIAL_SF t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="gbsj != null and gbsj != ''">
         and GBSJ = #{gbsj}
       </if>
       <if test="cinvccode != null and cinvccode != ''">
         and CINVCCODE = #{cinvccode}
       </if>
-      <if test="cinvcname != null and cinvcname != ''">
-        and CINVCNAME = #{cinvcname}
-      </if>
       <if test="cinvcode != null and cinvcode != ''">
         and CINVCODE = #{cinvcode}
       </if>
-      <if test="cinvname != null and cinvname != ''">
-        and CINVNAME = #{cinvname}
-      </if>
       <if test="cinvstd != null and cinvstd != ''">
         and CINVSTD = #{cinvstd}
       </if>
       <if test="cwhcode != null and cwhcode != ''">
         and CWHCODE = #{cwhcode}
       </if>
+      <if test="tab != null and tab != ''">
+        and TAB = #{tab}
+      </if>
+      <if test="djlx != null and djlx != ''">
+        and DJLX = #{djlx}
+      </if>
+      <if test="pzdl != null and pzdl != ''">
+        and PZDL = #{pzdl}
+      </if>
+      <if test="place != null and place != ''">
+        and PLACE = #{place}
+      </if>
+      <if test="cinvcname != null and cinvcname != ''">
+        and CINVCNAME = #{cinvcname}
+      </if>
+      <if test="cinvname != null and cinvname != ''">
+        and CINVNAME = #{cinvname}
+      </if>
       <if test="cwhname != null and cwhname != ''">
         and CWHNAME = #{cwhname}
       </if>
@@ -72,9 +85,6 @@
       <if test="jz != null">
         and JZ = #{jz}
       </if>
-      <if test="tab != null and tab != ''">
-        and TAB = #{tab}
-      </if>
       <if test="createman != null and createman != ''">
         and CREATEMAN = #{createman}
       </if>
@@ -93,28 +103,40 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="gbsj != null and gbsj != ''">
         and GBSJ LIKE '%${gbsj}%'
       </if>
       <if test="cinvccode != null and cinvccode != ''">
         and CINVCCODE LIKE '%${cinvccode}%'
       </if>
-      <if test="cinvcname != null and cinvcname != ''">
-        and CINVCNAME LIKE '%${cinvcname}%'
-      </if>
       <if test="cinvcode != null and cinvcode != ''">
         and CINVCODE LIKE '%${cinvcode}%'
       </if>
-      <if test="cinvname != null and cinvname != ''">
-        and CINVNAME LIKE '%${cinvname}%'
-      </if>
       <if test="cinvstd != null and cinvstd != ''">
         and CINVSTD LIKE '%${cinvstd}%'
       </if>
       <if test="cwhcode != null and cwhcode != ''">
         and CWHCODE LIKE '%${cwhcode}%'
       </if>
+      <if test="tab != null and tab != ''">
+        and TAB LIKE '%${tab}%'
+      </if>
+      <if test="djlx != null and djlx != ''">
+        and DJLX LIKE '%${djlx}%'
+      </if>
+      <if test="pzdl != null and pzdl != ''">
+        and PZDL LIKE '%${pzdl}%'
+      </if>
+      <if test="place != null and place != ''">
+        and PLACE LIKE '%${place}%'
+      </if>
+      <if test="cinvcname != null and cinvcname != ''">
+        and CINVCNAME LIKE '%${cinvcname}%'
+      </if>
+      <if test="cinvname != null and cinvname != ''">
+        and CINVNAME LIKE '%${cinvname}%'
+      </if>
       <if test="cwhname != null and cwhname != ''">
         and CWHNAME LIKE '%${cwhname}%'
       </if>
@@ -127,9 +149,6 @@
       <if test="jz != null">
         and JZ = #{jz}
       </if>
-      <if test="tab != null and tab != ''">
-        and TAB LIKE '%${tab}%'
-      </if>
       <if test="createman != null and createman != ''">
         and CREATEMAN LIKE '%${createman}%'
       </if>
@@ -147,75 +166,94 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+  <delete id="deleteByPrimaryKey" parameterType="map">
     delete from DZ_MATERIAL_SF
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
+    and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
+    and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
+    and CINVSTD = #{cinvstd,jdbcType=VARCHAR}
+    and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+    and TAB = #{tab,jdbcType=VARCHAR}
+    and DJLX = #{djlx,jdbcType=VARCHAR}
+    and PZDL = #{pzdl,jdbcType=VARCHAR}
+    and PLACE = #{place,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from DZ_MATERIAL_SF
-    where 1!=1 
-      <if test="cinvccode != null and cinvccode != ''">
-        or CINVCCODE = #{cinvccode}
-      </if>
-      <if test="cinvcname != null and cinvcname != ''">
-        or CINVCNAME = #{cinvcname}
-      </if>
-      <if test="cinvcode != null and cinvcode != ''">
-        or CINVCODE = #{cinvcode}
-      </if>
-      <if test="cinvname != null and cinvname != ''">
-        or CINVNAME = #{cinvname}
-      </if>
-      <if test="cinvstd != null and cinvstd != ''">
-        or CINVSTD = #{cinvstd}
-      </if>
-      <if test="cwhcode != null and cwhcode != ''">
-        or CWHCODE = #{cwhcode}
-      </if>
-      <if test="cwhname != null and cwhname != ''">
-        or CWHNAME = #{cwhname}
-      </if>
-      <if test="mz != null">
-        or MZ = #{mz}
-      </if>
-      <if test="pz != null">
-        or PZ = #{pz}
-      </if>
-      <if test="jz != null">
-        or JZ = #{jz}
-      </if>
-      <if test="tab != null and tab != ''">
-        or TAB = #{tab}
-      </if>
-      <if test="createman != null and createman != ''">
-        or CREATEMAN = #{createman}
-      </if>
-      <if test="createtime != null and createtime != ''">
-        or CREATETIME = #{createtime}
-      </if>
-      <if test="updateman != null and updateman != ''">
-        or UPDATEMAN = #{updateman}
-      </if>
-      <if test="updatetime != null and updatetime != ''">
-        or UPDATETIME = #{updatetime}
-      </if>
-      <if test="readtime != null and readtime != ''">
-        or READTIME = #{readtime}
-      </if>
+    where 1!=1
+    <if test="cinvccode != null and cinvccode != ''">
+      or CINVCCODE = #{cinvccode}
+    </if>
+    <if test="cinvcode != null and cinvcode != ''">
+      or CINVCODE = #{cinvcode}
+    </if>
+    <if test="cinvstd != null and cinvstd != ''">
+      or CINVSTD = #{cinvstd}
+    </if>
+    <if test="cwhcode != null and cwhcode != ''">
+      or CWHCODE = #{cwhcode}
+    </if>
+    <if test="tab != null and tab != ''">
+      or TAB = #{tab}
+    </if>
+    <if test="djlx != null and djlx != ''">
+      or DJLX = #{djlx}
+    </if>
+    <if test="pzdl != null and pzdl != ''">
+      or PZDL = #{pzdl}
+    </if>
+    <if test="place != null and place != ''">
+      or PLACE = #{place}
+    </if>
+    <if test="cinvcname != null and cinvcname != ''">
+      or CINVCNAME = #{cinvcname}
+    </if>
+    <if test="cinvname != null and cinvname != ''">
+      or CINVNAME = #{cinvname}
+    </if>
+    <if test="cwhname != null and cwhname != ''">
+      or CWHNAME = #{cwhname}
+    </if>
+    <if test="mz != null">
+      or MZ = #{mz}
+    </if>
+    <if test="pz != null">
+      or PZ = #{pz}
+    </if>
+    <if test="jz != null">
+      or JZ = #{jz}
+    </if>
+    <if test="createman != null and createman != ''">
+      or CREATEMAN = #{createman}
+    </if>
+    <if test="createtime != null and createtime != ''">
+      or CREATETIME = #{createtime}
+    </if>
+    <if test="updateman != null and updateman != ''">
+      or UPDATEMAN = #{updateman}
+    </if>
+    <if test="updatetime != null and updatetime != ''">
+      or UPDATETIME = #{updatetime}
+    </if>
+    <if test="readtime != null and readtime != ''">
+      or READTIME = #{readtime}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.product.dzmaterialsf.model.DzMaterialSf">
-    insert into DZ_MATERIAL_SF (GBSJ, CINVCCODE, CINVCNAME, 
-      CINVCODE, CINVNAME, CINVSTD, 
-      CWHCODE, CWHNAME, MZ, 
-      PZ, JZ, TAB, CREATEMAN, 
-      CREATETIME, UPDATEMAN, UPDATETIME, 
-      READTIME)
-    values (#{gbsj,jdbcType=VARCHAR}, #{cinvccode,jdbcType=VARCHAR}, #{cinvcname,jdbcType=VARCHAR}, 
-      #{cinvcode,jdbcType=VARCHAR}, #{cinvname,jdbcType=VARCHAR}, #{cinvstd,jdbcType=VARCHAR}, 
-      #{cwhcode,jdbcType=VARCHAR}, #{cwhname,jdbcType=VARCHAR}, #{mz,jdbcType=DECIMAL}, 
-      #{pz,jdbcType=DECIMAL}, #{jz,jdbcType=DECIMAL}, #{tab,jdbcType=VARCHAR}, #{createman,jdbcType=VARCHAR}, 
-      #{createtime,jdbcType=VARCHAR}, #{updateman,jdbcType=VARCHAR}, #{updatetime,jdbcType=VARCHAR}, 
-      #{readtime,jdbcType=VARCHAR})
+    insert into DZ_MATERIAL_SF (GBSJ, CINVCCODE, CINVCODE,
+    CINVSTD, CWHCODE, TAB,
+    DJLX, PZDL, PLACE,
+    CINVCNAME, CINVNAME, CWHNAME,
+    MZ, PZ, JZ, CREATEMAN,
+    CREATETIME, UPDATEMAN, UPDATETIME,
+    READTIME)
+    values (#{gbsj,jdbcType=VARCHAR}, #{cinvccode,jdbcType=VARCHAR}, #{cinvcode,jdbcType=VARCHAR},
+    #{cinvstd,jdbcType=VARCHAR}, #{cwhcode,jdbcType=VARCHAR}, #{tab,jdbcType=VARCHAR},
+    #{djlx,jdbcType=VARCHAR}, #{pzdl,jdbcType=VARCHAR}, #{place,jdbcType=VARCHAR},
+    #{cinvcname,jdbcType=VARCHAR}, #{cinvname,jdbcType=VARCHAR}, #{cwhname,jdbcType=VARCHAR},
+    #{mz,jdbcType=DECIMAL}, #{pz,jdbcType=DECIMAL}, #{jz,jdbcType=DECIMAL}, #{createman,jdbcType=VARCHAR},
+    #{createtime,jdbcType=VARCHAR}, #{updateman,jdbcType=VARCHAR}, #{updatetime,jdbcType=VARCHAR},
+    #{readtime,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.product.dzmaterialsf.model.DzMaterialSf">
     insert into DZ_MATERIAL_SF
@@ -226,21 +264,33 @@
       <if test="cinvccode != null">
         CINVCCODE,
       </if>
-      <if test="cinvcname != null">
-        CINVCNAME,
-      </if>
       <if test="cinvcode != null">
         CINVCODE,
       </if>
-      <if test="cinvname != null">
-        CINVNAME,
-      </if>
       <if test="cinvstd != null">
         CINVSTD,
       </if>
       <if test="cwhcode != null">
         CWHCODE,
       </if>
+      <if test="tab != null">
+        TAB,
+      </if>
+      <if test="djlx != null">
+        DJLX,
+      </if>
+      <if test="pzdl != null">
+        PZDL,
+      </if>
+      <if test="place != null">
+        PLACE,
+      </if>
+      <if test="cinvcname != null">
+        CINVCNAME,
+      </if>
+      <if test="cinvname != null">
+        CINVNAME,
+      </if>
       <if test="cwhname != null">
         CWHNAME,
       </if>
@@ -253,9 +303,6 @@
       <if test="jz != null">
         JZ,
       </if>
-      <if test="tab != null">
-        TAB,
-      </if>
       <if test="createman != null">
         CREATEMAN,
       </if>
@@ -279,21 +326,33 @@
       <if test="cinvccode != null">
         #{cinvccode,jdbcType=VARCHAR},
       </if>
-      <if test="cinvcname != null">
-        #{cinvcname,jdbcType=VARCHAR},
-      </if>
       <if test="cinvcode != null">
         #{cinvcode,jdbcType=VARCHAR},
       </if>
-      <if test="cinvname != null">
-        #{cinvname,jdbcType=VARCHAR},
-      </if>
       <if test="cinvstd != null">
         #{cinvstd,jdbcType=VARCHAR},
       </if>
       <if test="cwhcode != null">
         #{cwhcode,jdbcType=VARCHAR},
       </if>
+      <if test="tab != null">
+        #{tab,jdbcType=VARCHAR},
+      </if>
+      <if test="djlx != null">
+        #{djlx,jdbcType=VARCHAR},
+      </if>
+      <if test="pzdl != null">
+        #{pzdl,jdbcType=VARCHAR},
+      </if>
+      <if test="place != null">
+        #{place,jdbcType=VARCHAR},
+      </if>
+      <if test="cinvcname != null">
+        #{cinvcname,jdbcType=VARCHAR},
+      </if>
+      <if test="cinvname != null">
+        #{cinvname,jdbcType=VARCHAR},
+      </if>
       <if test="cwhname != null">
         #{cwhname,jdbcType=VARCHAR},
       </if>
@@ -306,9 +365,6 @@
       <if test="jz != null">
         #{jz,jdbcType=DECIMAL},
       </if>
-      <if test="tab != null">
-        #{tab,jdbcType=VARCHAR},
-      </if>
       <if test="createman != null">
         #{createman,jdbcType=VARCHAR},
       </if>
@@ -328,45 +384,36 @@
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.product.dzmaterialsf.model.DzMaterialSf">
     update DZ_MATERIAL_SF
-    set CINVCCODE = #{cinvccode,jdbcType=VARCHAR},
-      CINVCNAME = #{cinvcname,jdbcType=VARCHAR},
-      CINVCODE = #{cinvcode,jdbcType=VARCHAR},
-      CINVNAME = #{cinvname,jdbcType=VARCHAR},
-      CINVSTD = #{cinvstd,jdbcType=VARCHAR},
-      CWHCODE = #{cwhcode,jdbcType=VARCHAR},
-      CWHNAME = #{cwhname,jdbcType=VARCHAR},
-      MZ = #{mz,jdbcType=DECIMAL},
-      PZ = #{pz,jdbcType=DECIMAL},
-      JZ = #{jz,jdbcType=DECIMAL},
-      TAB = #{tab,jdbcType=VARCHAR},
-      CREATEMAN = #{createman,jdbcType=VARCHAR},
-      CREATETIME = #{createtime,jdbcType=VARCHAR},
-      UPDATEMAN = #{updateman,jdbcType=VARCHAR},
-      UPDATETIME = #{updatetime,jdbcType=VARCHAR},
-      READTIME = #{readtime,jdbcType=VARCHAR}
+    set CINVCNAME = #{cinvcname,jdbcType=VARCHAR},
+    CINVNAME = #{cinvname,jdbcType=VARCHAR},
+    CWHNAME = #{cwhname,jdbcType=VARCHAR},
+    MZ = #{mz,jdbcType=DECIMAL},
+    PZ = #{pz,jdbcType=DECIMAL},
+    JZ = #{jz,jdbcType=DECIMAL},
+    CREATEMAN = #{createman,jdbcType=VARCHAR},
+    CREATETIME = #{createtime,jdbcType=VARCHAR},
+    UPDATEMAN = #{updateman,jdbcType=VARCHAR},
+    UPDATETIME = #{updatetime,jdbcType=VARCHAR},
+    READTIME = #{readtime,jdbcType=VARCHAR}
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
+    and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
+    and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
+    and CINVSTD = #{cinvstd,jdbcType=VARCHAR}
+    and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+    and TAB = #{tab,jdbcType=VARCHAR}
+    and DJLX = #{djlx,jdbcType=VARCHAR}
+    and PZDL = #{pzdl,jdbcType=VARCHAR}
+    and PLACE = #{place,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.product.dzmaterialsf.model.DzMaterialSf">
     update DZ_MATERIAL_SF
     <set>
-      <if test="cinvccode != null">
-        CINVCCODE = #{cinvccode,jdbcType=VARCHAR},
-      </if>
       <if test="cinvcname != null">
         CINVCNAME = #{cinvcname,jdbcType=VARCHAR},
       </if>
-      <if test="cinvcode != null">
-        CINVCODE = #{cinvcode,jdbcType=VARCHAR},
-      </if>
       <if test="cinvname != null">
         CINVNAME = #{cinvname,jdbcType=VARCHAR},
       </if>
-      <if test="cinvstd != null">
-        CINVSTD = #{cinvstd,jdbcType=VARCHAR},
-      </if>
-      <if test="cwhcode != null">
-        CWHCODE = #{cwhcode,jdbcType=VARCHAR},
-      </if>
       <if test="cwhname != null">
         CWHNAME = #{cwhname,jdbcType=VARCHAR},
       </if>
@@ -379,9 +426,6 @@
       <if test="jz != null">
         JZ = #{jz,jdbcType=DECIMAL},
       </if>
-      <if test="tab != null">
-        TAB = #{tab,jdbcType=VARCHAR},
-      </if>
       <if test="createman != null">
         CREATEMAN = #{createman,jdbcType=VARCHAR},
       </if>
@@ -399,10 +443,26 @@
       </if>
     </set>
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
+    and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
+    and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
+    and CINVSTD = #{cinvstd,jdbcType=VARCHAR}
+    and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+    and TAB = #{tab,jdbcType=VARCHAR}
+    and DJLX = #{djlx,jdbcType=VARCHAR}
+    and PZDL = #{pzdl,jdbcType=VARCHAR}
+    and PLACE = #{place,jdbcType=VARCHAR}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
     <include refid="select"/>
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
+    and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
+    and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
+    and CINVSTD = #{cinvstd,jdbcType=VARCHAR}
+    and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
+    and TAB = #{tab,jdbcType=VARCHAR}
+    and DJLX = #{djlx,jdbcType=VARCHAR}
+    and PZDL = #{pzdl,jdbcType=VARCHAR}
+    and PLACE = #{place,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
@@ -413,106 +473,120 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into DZ_MATERIAL_SF 
-      (GBSJ, 
-      CINVCCODE, CINVCNAME, CINVCODE, 
-      CINVNAME, CINVSTD, CWHCODE, 
-      CWHNAME, MZ, PZ, 
-      JZ, TAB, CREATEMAN, 
-      CREATETIME, UPDATEMAN, UPDATETIME, 
-      READTIME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.gbsj,jdbcType=VARCHAR}, 
-      #{item.cinvccode,jdbcType=VARCHAR}, #{item.cinvcname,jdbcType=VARCHAR}, #{item.cinvcode,jdbcType=VARCHAR}, 
-      #{item.cinvname,jdbcType=VARCHAR}, #{item.cinvstd,jdbcType=VARCHAR}, #{item.cwhcode,jdbcType=VARCHAR}, 
-      #{item.cwhname,jdbcType=VARCHAR}, #{item.mz,jdbcType=DECIMAL}, #{item.pz,jdbcType=DECIMAL}, 
-      #{item.jz,jdbcType=DECIMAL}, #{item.tab,jdbcType=VARCHAR}, #{item.createman,jdbcType=VARCHAR}, 
-      #{item.createtime,jdbcType=VARCHAR}, #{item.updateman,jdbcType=VARCHAR}, #{item.updatetime,jdbcType=VARCHAR}, 
-      #{item.readtime,jdbcType=VARCHAR} from dual  
-   </foreach> )
+    insert into DZ_MATERIAL_SF
+    (GBSJ,
+    CINVCCODE, CINVCODE, CINVSTD,
+    CWHCODE, TAB, DJLX,
+    PZDL, PLACE, CINVCNAME,
+    CINVNAME, CWHNAME, MZ,
+    PZ, JZ, CREATEMAN,
+    CREATETIME, UPDATEMAN, UPDATETIME,
+    READTIME)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.gbsj,jdbcType=VARCHAR},
+    #{item.cinvccode,jdbcType=VARCHAR}, #{item.cinvcode,jdbcType=VARCHAR}, #{item.cinvstd,jdbcType=VARCHAR},
+    #{item.cwhcode,jdbcType=VARCHAR}, #{item.tab,jdbcType=VARCHAR}, #{item.djlx,jdbcType=VARCHAR},
+    #{item.pzdl,jdbcType=VARCHAR}, #{item.place,jdbcType=VARCHAR}, #{item.cinvcname,jdbcType=VARCHAR},
+    #{item.cinvname,jdbcType=VARCHAR}, #{item.cwhname,jdbcType=VARCHAR}, #{item.mz,jdbcType=DECIMAL},
+    #{item.pz,jdbcType=DECIMAL}, #{item.jz,jdbcType=DECIMAL}, #{item.createman,jdbcType=VARCHAR},
+    #{item.createtime,jdbcType=VARCHAR}, #{item.updateman,jdbcType=VARCHAR}, #{item.updatetime,jdbcType=VARCHAR},
+    #{item.readtime,jdbcType=VARCHAR} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update DZ_MATERIAL_SF
-     set
-       GBSJ=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.gbsj,jdbcType=VARCHAR}
-       </foreach>
-       ,CINVCCODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvccode,jdbcType=VARCHAR}
-       </foreach>
-       ,CINVCNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvcname,jdbcType=VARCHAR}
-       </foreach>
-       ,CINVCODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvcode,jdbcType=VARCHAR}
-       </foreach>
-       ,CINVNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvname,jdbcType=VARCHAR}
-       </foreach>
-       ,CINVSTD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvstd,jdbcType=VARCHAR}
-       </foreach>
-       ,CWHCODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cwhcode,jdbcType=VARCHAR}
-       </foreach>
-       ,CWHNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.cwhname,jdbcType=VARCHAR}
-       </foreach>
-       ,MZ=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.mz,jdbcType=DECIMAL}
-       </foreach>
-       ,PZ=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.pz,jdbcType=DECIMAL}
-       </foreach>
-       ,JZ=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.jz,jdbcType=DECIMAL}
-       </foreach>
-       ,TAB=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.tab,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATEMAN=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.createman,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATETIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.createtime,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATEMAN=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.updateman,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATETIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.updatetime,jdbcType=VARCHAR}
-       </foreach>
-       ,READTIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
-          when #{item.gbsj,jdbcType=VARCHAR} then #{item.readtime,jdbcType=VARCHAR}
-       </foreach>
-     where GBSJ in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.gbsj,jdbcType=VARCHAR}
-     </foreach> 
+    update DZ_MATERIAL_SF
+    set
+    GBSJ=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.gbsj,jdbcType=VARCHAR}
+    </foreach>
+    ,CINVCCODE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvccode,jdbcType=VARCHAR}
+    </foreach>
+    ,CINVCODE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvcode,jdbcType=VARCHAR}
+    </foreach>
+    ,CINVSTD=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvstd,jdbcType=VARCHAR}
+    </foreach>
+    ,CWHCODE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cwhcode,jdbcType=VARCHAR}
+    </foreach>
+    ,TAB=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.tab,jdbcType=VARCHAR}
+    </foreach>
+    ,DJLX=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.djlx,jdbcType=VARCHAR}
+    </foreach>
+    ,PZDL=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.pzdl,jdbcType=VARCHAR}
+    </foreach>
+    ,PLACE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.place,jdbcType=VARCHAR}
+    </foreach>
+    ,CINVCNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvcname,jdbcType=VARCHAR}
+    </foreach>
+    ,CINVNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cinvname,jdbcType=VARCHAR}
+    </foreach>
+    ,CWHNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.cwhname,jdbcType=VARCHAR}
+    </foreach>
+    ,MZ=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.mz,jdbcType=DECIMAL}
+    </foreach>
+    ,PZ=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.pz,jdbcType=DECIMAL}
+    </foreach>
+    ,JZ=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.jz,jdbcType=DECIMAL}
+    </foreach>
+    ,CREATEMAN=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.createman,jdbcType=VARCHAR}
+    </foreach>
+    ,CREATETIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.createtime,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATEMAN=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.updateman,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATETIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.updatetime,jdbcType=VARCHAR}
+    </foreach>
+    ,READTIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.readtime,jdbcType=VARCHAR}
+    </foreach>
+    where (GBSJ,CINVCCODE,CINVCODE,CINVSTD,CWHCODE,TAB,DJLX,PZDL,PLACE) in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      (#{item.gbsj, jdbcType=VARCHAR},#{item.cinvccode, jdbcType=VARCHAR},#{item.cinvcode, jdbcType=VARCHAR},#{item.cinvstd, jdbcType=VARCHAR},#{item.cwhcode, jdbcType=VARCHAR},#{item.tab, jdbcType=VARCHAR},#{item.djlx, jdbcType=VARCHAR},#{item.pzdl, jdbcType=VARCHAR},#{item.place, jdbcType=VARCHAR})
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from DZ_MATERIAL_SF
-    where GBSJ in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
+    where (GBSJ,CINVCCODE,CINVCODE,CINVSTD,CWHCODE,TAB,DJLX,PZDL,PLACE) in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      ( #{item.gbsj, jdbcType=VARCHAR}, #{item.cinvccode, jdbcType=VARCHAR}, #{item.cinvcode, jdbcType=VARCHAR}, #{item.cinvstd, jdbcType=VARCHAR}, #{item.cwhcode, jdbcType=VARCHAR}, #{item.tab, jdbcType=VARCHAR}, #{item.djlx, jdbcType=VARCHAR}, #{item.pzdl, jdbcType=VARCHAR}, #{item.place, jdbcType=VARCHAR})
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
@@ -520,14 +594,22 @@
 <!--  &#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,
+              case cInvStd when '' then '空' else ISNULL(cInvStd,'空') end as cInvStd,
+              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
+              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 (
     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)
+            case cInvStd when '' then '空' else ISNULL(cInvStd,'空') end as cInvStd,
+            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
+    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>
 </mapper>

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

@@ -20,11 +20,36 @@ public class DzMaterialSf {
      */
     private String cinvcode;
 
+    /**
+     * 物料规格(备注)(CINVSTD,VARCHAR,100)
+     */
+    private String cinvstd;
+
     /**
      * 物料仓库ID(CWHCODE,VARCHAR,20)
      */
     private String cwhcode;
 
+    /**
+     * 表标识(TAB,VARCHAR,10)
+     */
+    private String tab;
+
+    /**
+     * 单据类型(DJLX,VARCHAR,20)
+     */
+    private String djlx;
+
+    /**
+     * 品种(PZDL,VARCHAR,50)
+     */
+    private String pzdl;
+
+    /**
+     * 收发货地点(PLACE,VARCHAR,100)
+     */
+    private String place;
+
     /**
      * 物料类型名称(CINVCNAME,VARCHAR,20)
      */
@@ -35,11 +60,6 @@ public class DzMaterialSf {
      */
     private String cinvname;
 
-    /**
-     * 物料规格(备注)(CINVSTD,VARCHAR,100)
-     */
-    private String cinvstd;
-
     /**
      * 物料仓库名称(CWHNAME,VARCHAR,100)
      */
@@ -60,11 +80,6 @@ public class DzMaterialSf {
      */
     private BigDecimal jz;
 
-    /**
-     * 表标识(TAB,VARCHAR,10)
-     */
-    private String tab;
-
     /**
      * 创建人(CREATEMAN,VARCHAR,50)
      */
@@ -90,16 +105,6 @@ 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() {
@@ -107,9 +112,12 @@ public class DzMaterialSf {
         params.put("gbsj",this.gbsj);
         params.put("cinvccode",this.cinvccode);
         params.put("cinvcode",this.cinvcode);
+        params.put("cinvstd",this.cinvstd);
         params.put("cwhcode",this.cwhcode);
         params.put("tab",this.tab);
         params.put("djlx",this.djlx);
+        params.put("pzdl",this.pzdl);
+        params.put("place",this.place);
         return params;
     }
 
@@ -117,9 +125,12 @@ public class DzMaterialSf {
         this.gbsj = dzMaterialSf.getGbsj();
         this.cinvccode = dzMaterialSf.getCinvccode();
         this.cinvcode = dzMaterialSf.getCinvcode();
+        this.cinvstd = dzMaterialSf.getCinvstd();
         this.cwhcode = dzMaterialSf.getCwhcode();
         this.tab = dzMaterialSf.getTab();
         this.djlx = dzMaterialSf.getDjlx();
+        this.pzdl = dzMaterialSf.getPzdl();
+        this.place = dzMaterialSf.getPlace();
     }
 
     public String getGbsj() {
@@ -146,6 +157,14 @@ public class DzMaterialSf {
         this.cinvcode = cinvcode == null ? null : cinvcode.trim();
     }
 
+    public String getCinvstd() {
+        return cinvstd;
+    }
+
+    public void setCinvstd(String cinvstd) {
+        this.cinvstd = cinvstd == null ? null : cinvstd.trim();
+    }
+
     public String getCwhcode() {
         return cwhcode;
     }
@@ -154,6 +173,38 @@ public class DzMaterialSf {
         this.cwhcode = cwhcode == null ? null : cwhcode.trim();
     }
 
+    public String getTab() {
+        return tab;
+    }
+
+    public void setTab(String tab) {
+        this.tab = tab == null ? null : tab.trim();
+    }
+
+    public String getDjlx() {
+        return djlx;
+    }
+
+    public void setDjlx(String djlx) {
+        this.djlx = djlx == null ? null : djlx.trim();
+    }
+
+    public String getPzdl() {
+        return pzdl;
+    }
+
+    public void setPzdl(String pzdl) {
+        this.pzdl = pzdl == null ? null : pzdl.trim();
+    }
+
+    public String getPlace() {
+        return place;
+    }
+
+    public void setPlace(String place) {
+        this.place = place == null ? null : place.trim();
+    }
+
     public String getCinvcname() {
         return cinvcname;
     }
@@ -170,14 +221,6 @@ public class DzMaterialSf {
         this.cinvname = cinvname == null ? null : cinvname.trim();
     }
 
-    public String getCinvstd() {
-        return cinvstd;
-    }
-
-    public void setCinvstd(String cinvstd) {
-        this.cinvstd = cinvstd == null ? null : cinvstd.trim();
-    }
-
     public String getCwhname() {
         return cwhname;
     }
@@ -210,14 +253,6 @@ public class DzMaterialSf {
         this.jz = jz;
     }
 
-    public String getTab() {
-        return tab;
-    }
-
-    public void setTab(String tab) {
-        this.tab = tab == null ? null : tab.trim();
-    }
-
     public String getCreateman() {
         return createman;
     }
@@ -258,19 +293,6 @@ 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();
@@ -280,22 +302,23 @@ public class DzMaterialSf {
         sb.append(", gbsj=").append(gbsj);
         sb.append(", cinvccode=").append(cinvccode);
         sb.append(", cinvcode=").append(cinvcode);
+        sb.append(", cinvstd=").append(cinvstd);
         sb.append(", cwhcode=").append(cwhcode);
+        sb.append(", tab=").append(tab);
+        sb.append(", djlx=").append(djlx);
+        sb.append(", pzdl=").append(pzdl);
+        sb.append(", place=").append(place);
         sb.append(", cinvcname=").append(cinvcname);
         sb.append(", cinvname=").append(cinvname);
-        sb.append(", cinvstd=").append(cinvstd);
         sb.append(", cwhname=").append(cwhname);
         sb.append(", mz=").append(mz);
         sb.append(", pz=").append(pz);
         sb.append(", jz=").append(jz);
-        sb.append(", tab=").append(tab);
         sb.append(", createman=").append(createman);
         sb.append(", createtime=").append(createtime);
         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/product/dzmaterialsf/service/impl/DzMaterialSfServiceImpl.java

@@ -37,7 +37,7 @@ public class DzMaterialSfServiceImpl  implements IDzMaterialSfService {
 
     @Override
     //@TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
-    @TargetDataSource(name = "ds3")
+    @TargetDataSource(name = "ds4")
     public List<DzMaterialSf> getDzMaterialSf() {
 
         Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例

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

@@ -22,6 +22,12 @@
 <!--        <id column="TSNLJ" jdbcType="VARCHAR" property="tsYlj"/>-->
         <id column="JS" jdbcType="VARCHAR" property="memo"/>
         <id column="GSRCL" jdbcType="VARCHAR" property="gsrcl"/>
+        <id column="PGGP" jdbcType="VARCHAR" property="pggp"/>
+        <id column="PZGGP" jdbcType="VARCHAR" property="pzggp"/>
+        <id column="YXPGP" jdbcType="VARCHAR" property="yxpgp"/>
+        <id column="PGGS" jdbcType="VARCHAR" property="pggs"/>
+        <id column="PZGGS" jdbcType="VARCHAR" property="pzggs"/>
+        <id column="YXPGS" jdbcType="VARCHAR" property="yxpgs"/>
     </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

@@ -113,11 +113,47 @@ public class EmsScqkLg {
     /**
      * 冷料比(LLB,DECIMAL,0)
      */
-    private Short llb;
+    private String llb;
 
     /**
      * 钢水日产量(GSRCL,DECIMAL,0)
      */
-    private Short gsrcl;
+    private String gsrcl;
+
+    /**
+     * 炼钢浓盐水用量(LG_NYS,DECIMAL,0)
+     */
+    private String lgNys;
+
+    /**
+     * 普钢钢坯产量(PGGP,DECIMAL,0)
+     */
+    private String pggp;
+
+    /**
+     * 品种钢钢坯产量(PZGGP,DECIMAL,0)
+     */
+    private String pzggp;
+
+    /**
+     * 异型坯钢坯产量(YXPGP,DECIMAL,0)
+     */
+    private String yxpgp;
+
+    /**
+     * 普钢钢水产量(PGGS,DECIMAL,0)
+     */
+    private String pggs;
+
+    /**
+     * 品种钢钢水产量(PZGGS,DECIMAL,0)
+     */
+    private String pzggs;
+
+    /**
+     * 异型坯钢水产量(YXPGS,DECIMAL,0)
+     */
+    private String yxpgs;
+
 
 }