lrl -2021-11-30

src/main/java/com/steerinfo/ems/Utils/CompareUtil.java

@@ -95,4 +95,67 @@ public class CompareUtil {
             return null;
         }
     }
+
+    /**
+     * 比较两个实体属性值，返回一个map以有差异的属性名为key，value为一个Map分别存oldObject,newObject此属性名的值
+     *
+     * @param obj1      进行属性比较的对象1,旧对象
+     * @param obj2      进行属性比较的对象2,新对象
+     * @param ignoreArr 忽略比较的字段
+     * @param i         无意义字段,用于区分方法
+     * @return 属性差异比较结果的新值map
+     */
+    @SuppressWarnings("rawtypes")
+    public static Map<String, Object> compareFields(Object obj1, Object obj2, String[] ignoreArr,Integer i) {
+        try {
+            Map<String, Object> map = new HashMap<String,Object>();
+            List<String> ignoreList = null;
+            if (ignoreArr != null && ignoreArr.length > 0) {
+                // array转化为list
+                ignoreList = Arrays.asList(ignoreArr);
+            }
+            // 只有两个对象都是同一类型的才有可比性
+            if (obj1.getClass() == obj2.getClass()) {
+                Class clazz = obj1.getClass();
+                // 获取object的属性描述
+                PropertyDescriptor[] pds = Introspector.getBeanInfo(clazz,
+                        Object.class).getPropertyDescriptors();
+                // 这里就是所有的属性了
+                for (PropertyDescriptor pd : pds) {
+                    // 属性名
+                    String name = pd.getName();
+                    // 如果当前属性选择忽略比较，跳到下一次循环
+                    if (ignoreList != null && ignoreList.contains(name)) {
+                        continue;
+                    }
+                    // get方法
+                    Method readMethod = pd.getReadMethod();
+                    // 在obj1上调用get方法等同于获得obj1的属性值
+                    Object o1 = readMethod.invoke(obj1);
+                    // 在obj2上调用get方法等同于获得obj2的属性值
+                    Object o2 = readMethod.invoke(obj2);
+                    if (o1 instanceof Timestamp) {
+                        o1 = new Date(((Timestamp) o1).getTime());
+                    }
+                    if (o2 instanceof Timestamp) {
+                        o2 = new Date(((Timestamp) o2).getTime());
+                    }
+                    if (o1 == null && o2 == null) {
+                        continue;
+                    } else if (o1 == null && o2 != null) {
+                        map.put(name, o2);
+                        continue;
+                    }
+                    //// 比较这两个值是否相等,不等就可以放入map了
+                    //if (!o1.equals(o2)) {
+                    //    map.put(name, o2);
+                    //}
+                }
+            }
+            return map;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

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

@@ -5,31 +5,32 @@
     <id column="GBSJ" jdbcType="VARCHAR" property="gbsj" />
     <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="CINVNAME" jdbcType="VARCHAR" property="cinvname" />
-    <result column="CINVSTD" jdbcType="VARCHAR" property="cinvstd" />
     <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, CINVCODE, CWHCODE, CINVCNAME, CINVNAME, CINVSTD, 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.CINVCODE, t.CWHCODE, t.CINVCNAME, t.CINVNAME, t.CINVSTD, 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,7 +39,7 @@
     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>
@@ -48,18 +49,30 @@
       <if test="cinvcode != null and cinvcode != ''">
         and CINVCODE = #{cinvcode}
       </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="cinvstd != null and cinvstd != ''">
-        and CINVSTD = #{cinvstd}
-      </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>
@@ -90,16 +100,10 @@
       <if test="readtime != null and readtime != ''">
         and READTIME = #{readtime}
       </if>
-      <if test="djlx != null and djlx != ''">
-        and DJLX = #{djlx}
-      </if>
-      <if test="pzdl != null and pzdl != ''">
-        and PZDL = #{pzdl}
-      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="gbsj != null and gbsj != ''">
         and GBSJ LIKE '%${gbsj}%'
       </if>
@@ -109,18 +113,30 @@
       <if test="cinvcode != null and cinvcode != ''">
         and CINVCODE LIKE '%${cinvcode}%'
       </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="cinvstd != null and cinvstd != ''">
-        and CINVSTD LIKE '%${cinvstd}%'
-      </if>
       <if test="cwhname != null and cwhname != ''">
         and CWHNAME LIKE '%${cwhname}%'
       </if>
@@ -133,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>
@@ -151,94 +164,96 @@
       <if test="readtime != null and readtime != ''">
         and READTIME LIKE '%${readtime}%'
       </if>
-      <if test="djlx != null and djlx != ''">
-        and READTIME LIKE '%${djlx}%'
-      </if>
-      <if test="pzdl != null and pzdl != ''">
-        and PZDL LIKE '%${pzdl}%'
-      </if>
     </where>
   </sql>
   <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 CWHCODE = #{cwhcode,jdbcType=VARCHAR}
-      and TAB = #{tab,jdbcType=VARCHAR}
-      and DJLX = #{djlx,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="cinvcode != null and cinvcode != ''">
-        or CINVCODE = #{cinvcode}
-      </if>
-      <if test="cwhcode != null and cwhcode != ''">
-        or CWHCODE = #{cwhcode}
-      </if>
-      <if test="cinvcname != null and cinvcname != ''">
-        or CINVCNAME = #{cinvcname}
-      </if>
-      <if test="cinvname != null and cinvname != ''">
-        or CINVNAME = #{cinvname}
-      </if>
-      <if test="cinvstd != null and cinvstd != ''">
-        or CINVSTD = #{cinvstd}
-      </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.ems.dzmaterialsf.model.DzMaterialSf">
-    insert into DZ_MATERIAL_SF (GBSJ, CINVCCODE, CINVCODE, 
-      CWHCODE, CINVCNAME, CINVNAME, 
-      CINVSTD, CWHNAME, MZ, 
-      PZ, JZ, TAB, CREATEMAN, 
-      CREATETIME, UPDATEMAN, UPDATETIME, 
-      READTIME,DJLX,PZDL)
-    values (#{gbsj,jdbcType=VARCHAR}, #{cinvccode,jdbcType=VARCHAR}, #{cinvcode,jdbcType=VARCHAR}, 
-      #{cwhcode,jdbcType=VARCHAR}, #{cinvcname,jdbcType=VARCHAR}, #{cinvname,jdbcType=VARCHAR}, 
-      #{cinvstd,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},#{djlx,jdbcType=VARCHAR},#{pzdl,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.ems.dzmaterialsf.model.DzMaterialSf">
     insert into DZ_MATERIAL_SF
@@ -252,18 +267,30 @@
       <if test="cinvcode != null">
         CINVCODE,
       </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="cinvstd != null">
-        CINVSTD,
-      </if>
       <if test="cwhname != null">
         CWHNAME,
       </if>
@@ -276,9 +303,6 @@
       <if test="jz != null">
         JZ,
       </if>
-      <if test="tab != null">
-        TAB,
-      </if>
       <if test="createman != null">
         CREATEMAN,
       </if>
@@ -294,12 +318,6 @@
       <if test="readtime != null">
         READTIME,
       </if>
-      <if test="djlx != null">
-        DJLX,
-      </if>
-      <if test="pzdl != null">
-        PZDL,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="gbsj != null">
@@ -311,18 +329,30 @@
       <if test="cinvcode != null">
         #{cinvcode,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="cinvstd != null">
-        #{cinvstd,jdbcType=VARCHAR},
-      </if>
       <if test="cwhname != null">
         #{cwhname,jdbcType=VARCHAR},
       </if>
@@ -335,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>
@@ -353,36 +380,30 @@
       <if test="readtime != null">
         #{readtime,jdbcType=VARCHAR},
       </if>
-      <if test="djlx != null">
-        #{djlx,jdbcType=VARCHAR},
-      </if>
-      <if test="pzdl != null">
-        #{pzdl,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
     update DZ_MATERIAL_SF
     set CINVCNAME = #{cinvcname,jdbcType=VARCHAR},
-      CINVNAME = #{cinvname,jdbcType=VARCHAR},
-      CINVSTD = #{cinvstd,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},
-      DJLX = #{djlx,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 CWHCODE = #{cwhcode,jdbcType=VARCHAR}
-      and TAB = #{tab,jdbcType=VARCHAR}
-      and djlx = #{djlx,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.ems.dzmaterialsf.model.DzMaterialSf">
     update DZ_MATERIAL_SF
@@ -393,9 +414,6 @@
       <if test="cinvname != null">
         CINVNAME = #{cinvname,jdbcType=VARCHAR},
       </if>
-      <if test="cinvstd != null">
-        CINVSTD = #{cinvstd,jdbcType=VARCHAR},
-      </if>
       <if test="cwhname != null">
         CWHNAME = #{cwhname,jdbcType=VARCHAR},
       </if>
@@ -408,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>
@@ -426,28 +441,28 @@
       <if test="readtime != null">
         READTIME = #{readtime,jdbcType=VARCHAR},
       </if>
-      <if test="djlx != null">
-        DJLX = #{djlx,jdbcType=VARCHAR},
-      </if>
-      <if test="pzdl != null">
-        PZDL = #{pzdl,jdbcType=VARCHAR},
-      </if>
     </set>
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
-      and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
-      and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
-      and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
-      and TAB = #{tab,jdbcType=VARCHAR}
-      and DJLX = #{djlx,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="map" resultMap="BaseResultMap">
     <include refid="select"/>
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
-      and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
-      and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
-      and CWHCODE = #{cwhcode,jdbcType=VARCHAR}
-      and TAB = #{tab,jdbcType=VARCHAR}
-      and DJLX = #{djlx,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"/>
@@ -458,128 +473,132 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into DZ_MATERIAL_SF 
-      (GBSJ, 
-      CINVCCODE, CINVCODE, CWHCODE, 
-      CINVCNAME, CINVNAME, CINVSTD, 
-      CWHNAME, MZ, PZ, 
-      JZ, TAB, CREATEMAN, 
-      CREATETIME, UPDATEMAN, UPDATETIME, 
-      READTIME,DJLX,PZDL)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.gbsj,jdbcType=VARCHAR}, 
-      #{item.cinvccode,jdbcType=VARCHAR}, #{item.cinvcode,jdbcType=VARCHAR}, #{item.cwhcode,jdbcType=VARCHAR}, 
-      #{item.cinvcname,jdbcType=VARCHAR}, #{item.cinvname,jdbcType=VARCHAR}, #{item.cinvstd,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},#{item.djlx,jdbcType=VARCHAR},#{item.pzdl,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>
-       ,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>
-       ,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>
-       ,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>
-       ,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>
-       ,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>
+    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>
-    where (GBSJ,CINVCCODE,CINVCODE,CWHCODE,TAB,DJLX) in
+    ,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.cwhcode, jdbcType=VARCHAR},#{item.tab, jdbcType=VARCHAR},#{item.djlx, jdbcType=VARCHAR})
+      (#{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,CINVCCODE,CINVCODE,CWHCODE,TAB,DJLX) in
+    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.cwhcode, jdbcType=VARCHAR},#{item.tab, jdbcType=VARCHAR},#{item.djlx, jdbcType=VARCHAR})
+      ( #{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>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <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, djlx, pzdl, 'sh' as tab
-    FROM v_nyjk_sh where gbsj >= #{gbsj,jdbcType=VARCHAR} and pzdl IS NOT NULL
+                          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, ISNULL(pzdl,'无') as pzdl, 'sh' as tab,ISNULL(BFSFCL_FHDD,'无') as place FROM v_nyjk_sh where gbsj >= '2021-11-21' group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), gbsj, 23),djlx, pzdl,BFSFCL_FHDD) as sh
     --cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
-    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
+    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, ISNULL(pzdl,'无') as pzdl, 'fh' as tab,ISNULL(BFFHCL_FHDD,'无') as place
+    FROM v_nyjk_fh where gbsj >= '2021-11-21'
     --cInvCName in('合金材料','国内矿粉','过滤材料','进口矿粉','原煤','外购精煤','国内球团','高炉干渣','进口块矿','石料')
-    group by cInvCCode, cInvCName, cInvCode, cInvName, cInvStd, cWhCode, cWhName, CONVERT(varchar(100), [gbsj], 23),djlx, pzdl)
+    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/ems/dzmaterialsf/model/DzMaterialSf.java

@@ -27,12 +27,42 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
     @ApiModelProperty(value="物料ID",required=true)
     private String cinvcode;
 
+    /**
+     * 物料规格(备注)(CINVSTD,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物料规格(备注)",required=true)
+    private String cinvstd;
+
     /**
      * 物料仓库ID(CWHCODE,VARCHAR,20)
      */
     @ApiModelProperty(value="物料仓库ID",required=true)
     private String cwhcode;
 
+    /**
+     * 表标识(TAB,VARCHAR,10)
+     */
+    @ApiModelProperty(value="表标识",required=true)
+    private String tab;
+
+    /**
+     * 单据类型(DJLX,VARCHAR,20)
+     */
+    @ApiModelProperty(value="单据类型",required=true)
+    private String djlx;
+
+    /**
+     * 品种(PZDL,VARCHAR,50)
+     */
+    @ApiModelProperty(value="品种",required=true)
+    private String pzdl;
+
+    /**
+     * 收发货地点(PLACE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收发货地点",required=true)
+    private String place;
+
     /**
      * 物料类型名称(CINVCNAME,VARCHAR,20)
      */
@@ -45,12 +75,6 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
     @ApiModelProperty(value="物料名称",required=false)
     private String cinvname;
 
-    /**
-     * 物料规格(备注)(CINVSTD,VARCHAR,100)
-     */
-    @ApiModelProperty(value="物料规格(备注)",required=false)
-    private String cinvstd;
-
     /**
      * 物料仓库名称(CWHNAME,VARCHAR,100)
      */
@@ -75,12 +99,6 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
     @ApiModelProperty(value="净重",required=false)
     private BigDecimal jz;
 
-    /**
-     * 表标识(TAB,VARCHAR,10)
-     */
-    @ApiModelProperty(value="表标识",required=false)
-    private String tab;
-
     /**
      * 创建人(CREATEMAN,VARCHAR,50)
      */
@@ -111,18 +129,6 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
     @ApiModelProperty(value="读取时间",required=false)
     private String readtime;
 
-    /**
-     * 单据类型(READTIME,VARCHAR,50)
-     */
-    @ApiModelProperty(value="单据类型",required=false)
-    private String djlx;
-
-    /**
-     * 品种(READTIME,VARCHAR,50)
-     */
-    @ApiModelProperty(value="品种",required=false)
-    private String pzdl;
-
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -131,9 +137,12 @@ public class DzMaterialSf implements ICBasePO<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;
     }
 
@@ -142,8 +151,12 @@ public class DzMaterialSf implements ICBasePO<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() {
@@ -170,6 +183,14 @@ public class DzMaterialSf implements ICBasePO<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;
     }
@@ -178,6 +199,38 @@ public class DzMaterialSf implements ICBasePO<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;
     }
@@ -194,14 +247,6 @@ public class DzMaterialSf implements ICBasePO<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;
     }
@@ -234,14 +279,6 @@ public class DzMaterialSf implements ICBasePO<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;
     }
@@ -282,20 +319,6 @@ public class DzMaterialSf implements ICBasePO<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();
@@ -305,22 +328,23 @@ public class DzMaterialSf implements ICBasePO<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/ems/dzmaterialsf/service/impl/DzMaterialSfServiceImpl.java

@@ -56,24 +56,12 @@ public class DzMaterialSfServiceImpl extends CBaseServiceImpl<DzMaterialSf, Stri
             HashMap<String, Object> hashMap = new HashMap<>();
             for (DzMaterialSf dzMaterialSf : dzMaterialSfList){
                 dzMaterialSf.setReadtime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                hashMap.put("gbsj",dzMaterialSf.getGbsj());
-                hashMap.put("cinvccode",dzMaterialSf.getCinvccode());
-                hashMap.put("cinvcode",dzMaterialSf.getCinvcode());
-                hashMap.put("cwhcode",dzMaterialSf.getCwhcode());
-                hashMap.put("tab",dzMaterialSf.getTab());
-                hashMap.put("djlx",dzMaterialSf.getDjlx());
-                //model = dzMaterialSfMapper.selectByParameters(hashMap);
-                model = dzMaterialSfMapper.selectByPrimaryKey(dzMaterialSf);
-                if(model != null){
-                    dzMaterialSf.setUpdateman("系统");
-                    dzMaterialSf.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                    dzMaterialSfMapper.updateByPrimaryKey(dzMaterialSf);
-                    updateSize+=1;
-                    continue;
-                }else {
+                dzMaterialSf.setUpdateman("系统");
+                dzMaterialSf.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+                if(dzMaterialSfMapper.updateByPrimaryKeySelective(dzMaterialSf)==0){
                     dzMaterialSf.setCreateman("系统");
                     dzMaterialSf.setCreatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                    addSize+= dzMaterialSfMapper.insert(dzMaterialSf);
+                    addSize+= dzMaterialSfMapper.insertSelective(dzMaterialSf);
                 }
             }
         } catch (Exception e) {

src/main/java/com/steerinfo/ems/emsscqklg/mapper/EmsScqkLgMapper.java

@@ -5,7 +5,9 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Date;
+import java.util.HashMap;
 
 @Mapper
 public interface EmsScqkLgMapper extends IBaseMapper<EmsScqkLg, Date> {
+    int updateByMap(HashMap<String,Object> map);
 }

src/main/java/com/steerinfo/ems/emsscqklg/mapper/EmsScqkLgMapper.xml

@@ -23,24 +23,32 @@
     <result column="WXGPCL" jdbcType="DECIMAL" property="wxgpcl" />
     <result column="LLB" jdbcType="DECIMAL" property="llb" />
     <result column="GSRCL" jdbcType="DECIMAL" property="gsrcl" />
+    <result column="LG_NYS" jdbcType="DECIMAL" property="lgNys" />
+    <result column="PGGP" jdbcType="DECIMAL" property="pggp" />
+    <result column="PZGGP" jdbcType="DECIMAL" property="pzggp" />
+    <result column="YXPGP" jdbcType="DECIMAL" property="yxpgp" />
+    <result column="PGGS" jdbcType="DECIMAL" property="pggs" />
+    <result column="PZGGS" jdbcType="DECIMAL" property="pzggs" />
+    <result column="YXPGS" jdbcType="DECIMAL" property="yxpgs" />
   </resultMap>
   <sql id="columns">
-    DATES, RCL, JTSL, SJYL, KCL, WJZL, SCLS, LL_1, LL_2, FGZL_NBHST, FGZL_WG, LLDLYL, 
-    WGFG_JFGK, WGFG_QXC, XCF, MEMO, CZR, CZSJ, WXGPCL, LLB, GSRCL
+    DATES, RCL, JTSL, SJYL, KCL, WJZL, SCLS, LL_1, LL_2, FGZL_NBHST, FGZL_WG, LLDLYL,
+    WGFG_JFGK, WGFG_QXC, XCF, MEMO, CZR, CZSJ, WXGPCL, LLB, GSRCL, LG_NYS, PGGP, PZGGP,
+    YXPGP, PGGS, PZGGS, YXPGS
   </sql>
   <sql id="columns_alias">
-    t.DATES, t.RCL, t.JTSL, t.SJYL, t.KCL, t.WJZL, t.SCLS, t.LL_1, t.LL_2, t.FGZL_NBHST, 
-    t.FGZL_WG, t.LLDLYL, t.WGFG_JFGK, t.WGFG_QXC, t.XCF, t.MEMO, t.CZR, t.CZSJ, t.WXGPCL, 
-    t.LLB, t.GSRCL
+    t.DATES, t.RCL, t.JTSL, t.SJYL, t.KCL, t.WJZL, t.SCLS, t.LL_1, t.LL_2, t.FGZL_NBHST,
+    t.FGZL_WG, t.LLDLYL, t.WGFG_JFGK, t.WGFG_QXC, t.XCF, t.MEMO, t.CZR, t.CZSJ, t.WXGPCL,
+    t.LLB, t.GSRCL, t.LG_NYS, t.PGGP, t.PZGGP, t.YXPGP, t.PGGS, t.PZGGS, t.YXPGS
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM EMS_SCQK_LG
+    SELECT <include refid="columns" /> FROM EMS_SCQK_LG
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM EMS_SCQK_LG t
+    SELECT <include refid="columns_alias" /> FROM EMS_SCQK_LG t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="dates != null">
         and TO_CHAR(DATES,'yyyy-MM-dd') = #{dates}
       </if>
@@ -104,10 +112,31 @@
       <if test="gsrcl != null">
         and GSRCL = #{gsrcl}
       </if>
+      <if test="lgNys != null">
+        and LG_NYS = #{lgNys}
+      </if>
+      <if test="pggp != null">
+        and PGGP = #{pggp}
+      </if>
+      <if test="pzggp != null">
+        and PZGGP = #{pzggp}
+      </if>
+      <if test="yxpgp != null">
+        and YXPGP = #{yxpgp}
+      </if>
+      <if test="pggs != null">
+        and PGGS = #{pggs}
+      </if>
+      <if test="pzggs != null">
+        and PZGGS = #{pzggs}
+      </if>
+      <if test="yxpgs != null">
+        and YXPGS = #{yxpgs}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="dates != null">
         and TO_CHAR(DATES,'yyyy-MM-dd') = #{dates}
       </if>
@@ -171,6 +200,27 @@
       <if test="gsrcl != null">
         and GSRCL = #{gsrcl}
       </if>
+      <if test="lgNys != null">
+        and LG_NYS = #{lgNys}
+      </if>
+      <if test="pggp != null">
+        and PGGP = #{pggp}
+      </if>
+      <if test="pzggp != null">
+        and PZGGP = #{pzggp}
+      </if>
+      <if test="yxpgp != null">
+        and YXPGP = #{yxpgp}
+      </if>
+      <if test="pggs != null">
+        and PGGS = #{pggs}
+      </if>
+      <if test="pzggs != null">
+        and PZGGS = #{pzggs}
+      </if>
+      <if test="yxpgs != null">
+        and YXPGS = #{yxpgs}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.util.Date">
@@ -179,83 +229,108 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from EMS_SCQK_LG
-    where 1!=1 
-      <if test="rcl != null">
-        or RCL = #{rcl}
-      </if>
-      <if test="jtsl != null">
-        or JTSL = #{jtsl}
-      </if>
-      <if test="sjyl != null">
-        or SJYL = #{sjyl}
-      </if>
-      <if test="kcl != null">
-        or KCL = #{kcl}
-      </if>
-      <if test="wjzl != null">
-        or WJZL = #{wjzl}
-      </if>
-      <if test="scls != null">
-        or SCLS = #{scls}
-      </if>
-      <if test="ll1 != null">
-        or LL_1 = #{ll1}
-      </if>
-      <if test="ll2 != null">
-        or LL_2 = #{ll2}
-      </if>
-      <if test="fgzlNbhst != null">
-        or FGZL_NBHST = #{fgzlNbhst}
-      </if>
-      <if test="fgzlWg != null">
-        or FGZL_WG = #{fgzlWg}
-      </if>
-      <if test="lldlyl != null">
-        or LLDLYL = #{lldlyl}
-      </if>
-      <if test="wgfgJfgk != null">
-        or WGFG_JFGK = #{wgfgJfgk}
-      </if>
-      <if test="wgfgQxc != null">
-        or WGFG_QXC = #{wgfgQxc}
-      </if>
-      <if test="xcf != null">
-        or XCF = #{xcf}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </if>
-      <if test="czr != null and czr != ''">
-        or CZR = #{czr}
-      </if>
-      <if test="czsj != null">
-        or TO_CHAR(CZSJ,'yyyy-MM-dd') = '#{czsj}'
-      </if>
-      <if test="wxgpcl != null">
-        or WXGPCL = #{wxgpcl}
-      </if>
-      <if test="llb != null">
-        or LLB = #{llb}
-      </if>
+    where 1!=1
+    <if test="rcl != null">
+      or RCL = #{rcl}
+    </if>
+    <if test="jtsl != null">
+      or JTSL = #{jtsl}
+    </if>
+    <if test="sjyl != null">
+      or SJYL = #{sjyl}
+    </if>
+    <if test="kcl != null">
+      or KCL = #{kcl}
+    </if>
+    <if test="wjzl != null">
+      or WJZL = #{wjzl}
+    </if>
+    <if test="scls != null">
+      or SCLS = #{scls}
+    </if>
+    <if test="ll1 != null">
+      or LL_1 = #{ll1}
+    </if>
+    <if test="ll2 != null">
+      or LL_2 = #{ll2}
+    </if>
+    <if test="fgzlNbhst != null">
+      or FGZL_NBHST = #{fgzlNbhst}
+    </if>
+    <if test="fgzlWg != null">
+      or FGZL_WG = #{fgzlWg}
+    </if>
+    <if test="lldlyl != null">
+      or LLDLYL = #{lldlyl}
+    </if>
+    <if test="wgfgJfgk != null">
+      or WGFG_JFGK = #{wgfgJfgk}
+    </if>
+    <if test="wgfgQxc != null">
+      or WGFG_QXC = #{wgfgQxc}
+    </if>
+    <if test="xcf != null">
+      or XCF = #{xcf}
+    </if>
+    <if test="memo != null and memo != ''">
+      or MEMO = #{memo}
+    </if>
+    <if test="czr != null and czr != ''">
+      or CZR = #{czr}
+    </if>
+    <if test="czsj != null">
+      or TO_CHAR(CZSJ,'yyyy-MM-dd') = '#{czsj}'
+    </if>
+    <if test="wxgpcl != null">
+      or WXGPCL = #{wxgpcl}
+    </if>
+    <if test="llb != null">
+      or LLB = #{llb}
+    </if>
     <if test="gsrcl != null">
       or GSRCL = #{gsrcl}
     </if>
+    <if test="lgNys != null">
+      or LG_NYS = #{lgNys}
+    </if>
+    <if test="pggp != null">
+      or PGGP = #{pggp}
+    </if>
+    <if test="pzggp != null">
+      or PZGGP = #{pzggp}
+    </if>
+    <if test="yxpgp != null">
+      or YXPGP = #{yxpgp}
+    </if>
+    <if test="pggs != null">
+      or PGGS = #{pggs}
+    </if>
+    <if test="pzggs != null">
+      or PZGGS = #{pzggs}
+    </if>
+    <if test="yxpgs != null">
+      or YXPGS = #{yxpgs}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.emsscqklg.model.EmsScqkLg">
-    insert into EMS_SCQK_LG (DATES, RCL, JTSL, 
-      SJYL, KCL, WJZL, SCLS, 
-      LL_1, LL_2, FGZL_NBHST, 
-      FGZL_WG, LLDLYL, WGFG_JFGK, 
-      WGFG_QXC, XCF, MEMO, 
-      CZR, CZSJ, WXGPCL, 
-      LLB,GSRCL)
-    values (#{dates,jdbcType=TIMESTAMP}, #{rcl,jdbcType=DECIMAL}, #{jtsl,jdbcType=DECIMAL}, 
-      #{sjyl,jdbcType=DECIMAL}, #{kcl,jdbcType=DECIMAL}, #{wjzl,jdbcType=DECIMAL}, #{scls,jdbcType=DECIMAL}, 
-      #{ll1,jdbcType=DECIMAL}, #{ll2,jdbcType=DECIMAL}, #{fgzlNbhst,jdbcType=DECIMAL}, 
-      #{fgzlWg,jdbcType=DECIMAL}, #{lldlyl,jdbcType=DECIMAL}, #{wgfgJfgk,jdbcType=DECIMAL}, 
-      #{wgfgQxc,jdbcType=DECIMAL}, #{xcf,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR}, 
-      #{czr,jdbcType=VARCHAR}, #{czsj,jdbcType=TIMESTAMP}, #{wxgpcl,jdbcType=DECIMAL}, 
-      #{llb,jdbcType=DECIMAL},#{gsrcl,jdbcType=DECIMAL})
+    insert into EMS_SCQK_LG (DATES, RCL, JTSL,
+    SJYL, KCL, WJZL, SCLS,
+    LL_1, LL_2, FGZL_NBHST,
+    FGZL_WG, LLDLYL, WGFG_JFGK,
+    WGFG_QXC, XCF, MEMO,
+    CZR, CZSJ, WXGPCL,
+    LLB, GSRCL, LG_NYS,
+    PGGP, PZGGP, YXPGP,
+    PGGS, PZGGS, YXPGS)
+    values (#{dates,jdbcType=TIMESTAMP}, #{rcl,jdbcType=DECIMAL}, #{jtsl,jdbcType=DECIMAL},
+    #{sjyl,jdbcType=DECIMAL}, #{kcl,jdbcType=DECIMAL}, #{wjzl,jdbcType=DECIMAL}, #{scls,jdbcType=DECIMAL},
+    #{ll1,jdbcType=DECIMAL}, #{ll2,jdbcType=DECIMAL}, #{fgzlNbhst,jdbcType=DECIMAL},
+    #{fgzlWg,jdbcType=DECIMAL}, #{lldlyl,jdbcType=DECIMAL}, #{wgfgJfgk,jdbcType=DECIMAL},
+    #{wgfgQxc,jdbcType=DECIMAL}, #{xcf,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
+    #{czr,jdbcType=VARCHAR}, #{czsj,jdbcType=TIMESTAMP}, #{wxgpcl,jdbcType=DECIMAL},
+    #{llb,jdbcType=DECIMAL}, #{gsrcl,jdbcType=DECIMAL}, #{lgNys,jdbcType=DECIMAL},
+    #{pggp,jdbcType=DECIMAL}, #{pzggp,jdbcType=DECIMAL}, #{yxpgp,jdbcType=DECIMAL},
+    #{pggs,jdbcType=DECIMAL}, #{pzggs,jdbcType=DECIMAL}, #{yxpgs,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsscqklg.model.EmsScqkLg">
     insert into EMS_SCQK_LG
@@ -323,6 +398,27 @@
       <if test="gsrcl != null">
         GSRCL,
       </if>
+      <if test="lgNys != null">
+        LG_NYS,
+      </if>
+      <if test="pggp != null">
+        PGGP,
+      </if>
+      <if test="pzggp != null">
+        PZGGP,
+      </if>
+      <if test="yxpgp != null">
+        YXPGP,
+      </if>
+      <if test="pggs != null">
+        PGGS,
+      </if>
+      <if test="pzggs != null">
+        PZGGS,
+      </if>
+      <if test="yxpgs != null">
+        YXPGS,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="dates != null">
@@ -388,30 +484,58 @@
       <if test="gsrcl != null">
         #{gsrcl,jdbcType=DECIMAL},
       </if>
+      <if test="lgNys != null">
+        #{lgNys,jdbcType=DECIMAL},
+      </if>
+      <if test="pggp != null">
+        #{pggp,jdbcType=DECIMAL},
+      </if>
+      <if test="pzggp != null">
+        #{pzggp,jdbcType=DECIMAL},
+      </if>
+      <if test="yxpgp != null">
+        #{yxpgp,jdbcType=DECIMAL},
+      </if>
+      <if test="pggs != null">
+        #{pggs,jdbcType=DECIMAL},
+      </if>
+      <if test="pzggs != null">
+        #{pzggs,jdbcType=DECIMAL},
+      </if>
+      <if test="yxpgs != null">
+        #{yxpgs,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emsscqklg.model.EmsScqkLg">
     update EMS_SCQK_LG
     set RCL = #{rcl,jdbcType=DECIMAL},
-      JTSL = #{jtsl,jdbcType=DECIMAL},
-      SJYL = #{sjyl,jdbcType=DECIMAL},
-      KCL = #{kcl,jdbcType=DECIMAL},
-      WJZL = #{wjzl,jdbcType=DECIMAL},
-      SCLS = #{scls,jdbcType=DECIMAL},
-      LL_1 = #{ll1,jdbcType=DECIMAL},
-      LL_2 = #{ll2,jdbcType=DECIMAL},
-      FGZL_NBHST = #{fgzlNbhst,jdbcType=DECIMAL},
-      FGZL_WG = #{fgzlWg,jdbcType=DECIMAL},
-      LLDLYL = #{lldlyl,jdbcType=DECIMAL},
-      WGFG_JFGK = #{wgfgJfgk,jdbcType=DECIMAL},
-      WGFG_QXC = #{wgfgQxc,jdbcType=DECIMAL},
-      XCF = #{xcf,jdbcType=DECIMAL},
-      MEMO = #{memo,jdbcType=VARCHAR},
-      CZR = #{czr,jdbcType=VARCHAR},
-      CZSJ = #{czsj,jdbcType=TIMESTAMP},
-      WXGPCL = #{wxgpcl,jdbcType=DECIMAL},
-      LLB = #{llb,jdbcType=DECIMAL},
-      GSRCL = #{gsrcl,jdbcType=DECIMAL}
+    JTSL = #{jtsl,jdbcType=DECIMAL},
+    SJYL = #{sjyl,jdbcType=DECIMAL},
+    KCL = #{kcl,jdbcType=DECIMAL},
+    WJZL = #{wjzl,jdbcType=DECIMAL},
+    SCLS = #{scls,jdbcType=DECIMAL},
+    LL_1 = #{ll1,jdbcType=DECIMAL},
+    LL_2 = #{ll2,jdbcType=DECIMAL},
+    FGZL_NBHST = #{fgzlNbhst,jdbcType=DECIMAL},
+    FGZL_WG = #{fgzlWg,jdbcType=DECIMAL},
+    LLDLYL = #{lldlyl,jdbcType=DECIMAL},
+    WGFG_JFGK = #{wgfgJfgk,jdbcType=DECIMAL},
+    WGFG_QXC = #{wgfgQxc,jdbcType=DECIMAL},
+    XCF = #{xcf,jdbcType=DECIMAL},
+    MEMO = #{memo,jdbcType=VARCHAR},
+    CZR = #{czr,jdbcType=VARCHAR},
+    CZSJ = #{czsj,jdbcType=TIMESTAMP},
+    WXGPCL = #{wxgpcl,jdbcType=DECIMAL},
+    LLB = #{llb,jdbcType=DECIMAL},
+    GSRCL = #{gsrcl,jdbcType=DECIMAL},
+    LG_NYS = #{lgNys,jdbcType=DECIMAL},
+    PGGP = #{pggp,jdbcType=DECIMAL},
+    PZGGP = #{pzggp,jdbcType=DECIMAL},
+    YXPGP = #{yxpgp,jdbcType=DECIMAL},
+    PGGS = #{pggs,jdbcType=DECIMAL},
+    PZGGS = #{pzggs,jdbcType=DECIMAL},
+    YXPGS = #{yxpgs,jdbcType=DECIMAL}
     where DATES = #{dates,jdbcType=TIMESTAMP}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsscqklg.model.EmsScqkLg">
@@ -477,143 +601,284 @@
       <if test="gsrcl != null">
         GSRCL = #{gsrcl,jdbcType=DECIMAL},
       </if>
+      <if test="lgNys != null">
+        LG_NYS = #{lgNys,jdbcType=DECIMAL},
+      </if>
+      <if test="pggp != null">
+        PGGP = #{pggp,jdbcType=DECIMAL},
+      </if>
+      <if test="pzggp != null">
+        PZGGP = #{pzggp,jdbcType=DECIMAL},
+      </if>
+      <if test="yxpgp != null">
+        YXPGP = #{yxpgp,jdbcType=DECIMAL},
+      </if>
+      <if test="pggs != null">
+        PGGS = #{pggs,jdbcType=DECIMAL},
+      </if>
+      <if test="pzggs != null">
+        PZGGS = #{pzggs,jdbcType=DECIMAL},
+      </if>
+      <if test="yxpgs != null">
+        YXPGS = #{yxpgs,jdbcType=DECIMAL},
+      </if>
     </set>
     where DATES = #{dates,jdbcType=TIMESTAMP}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.util.Date" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where DATES = #{dates,jdbcType=TIMESTAMP}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into EMS_SCQK_LG 
-      (DATES, 
-      RCL, JTSL, SJYL, 
-      KCL, WJZL, SCLS, 
-      LL_1, LL_2, FGZL_NBHST, 
-      FGZL_WG, LLDLYL, WGFG_JFGK, 
-      WGFG_QXC, XCF, MEMO, 
-      CZR, CZSJ, WXGPCL, 
-      LLB, GSRCL)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.dates,jdbcType=TIMESTAMP}, 
-      #{item.rcl,jdbcType=DECIMAL}, #{item.jtsl,jdbcType=DECIMAL}, #{item.sjyl,jdbcType=DECIMAL}, 
-      #{item.kcl,jdbcType=DECIMAL}, #{item.wjzl,jdbcType=DECIMAL}, #{item.scls,jdbcType=DECIMAL}, 
-      #{item.ll1,jdbcType=DECIMAL}, #{item.ll2,jdbcType=DECIMAL}, #{item.fgzlNbhst,jdbcType=DECIMAL}, 
-      #{item.fgzlWg,jdbcType=DECIMAL}, #{item.lldlyl,jdbcType=DECIMAL}, #{item.wgfgJfgk,jdbcType=DECIMAL}, 
-      #{item.wgfgQxc,jdbcType=DECIMAL}, #{item.xcf,jdbcType=DECIMAL}, #{item.memo,jdbcType=VARCHAR}, 
-      #{item.czr,jdbcType=VARCHAR}, #{item.czsj,jdbcType=TIMESTAMP}, #{item.wxgpcl,jdbcType=DECIMAL}, 
-      #{item.llb,jdbcType=DECIMAL}, #{item.gsrcl,jdbcType=DECIMAL} from dual
-   </foreach> )
+    insert into EMS_SCQK_LG
+    (DATES,
+    RCL, JTSL, SJYL,
+    KCL, WJZL, SCLS,
+    LL_1, LL_2, FGZL_NBHST,
+    FGZL_WG, LLDLYL, WGFG_JFGK,
+    WGFG_QXC, XCF, MEMO,
+    CZR, CZSJ, WXGPCL,
+    LLB, GSRCL, LG_NYS,
+    PGGP, PZGGP, YXPGP,
+    PGGS, PZGGS, YXPGS
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.dates,jdbcType=TIMESTAMP},
+    #{item.rcl,jdbcType=DECIMAL}, #{item.jtsl,jdbcType=DECIMAL}, #{item.sjyl,jdbcType=DECIMAL},
+    #{item.kcl,jdbcType=DECIMAL}, #{item.wjzl,jdbcType=DECIMAL}, #{item.scls,jdbcType=DECIMAL},
+    #{item.ll1,jdbcType=DECIMAL}, #{item.ll2,jdbcType=DECIMAL}, #{item.fgzlNbhst,jdbcType=DECIMAL},
+    #{item.fgzlWg,jdbcType=DECIMAL}, #{item.lldlyl,jdbcType=DECIMAL}, #{item.wgfgJfgk,jdbcType=DECIMAL},
+    #{item.wgfgQxc,jdbcType=DECIMAL}, #{item.xcf,jdbcType=DECIMAL}, #{item.memo,jdbcType=VARCHAR},
+    #{item.czr,jdbcType=VARCHAR}, #{item.czsj,jdbcType=TIMESTAMP}, #{item.wxgpcl,jdbcType=DECIMAL},
+    #{item.llb,jdbcType=DECIMAL}, #{item.gsrcl,jdbcType=DECIMAL}, #{item.lgNys,jdbcType=DECIMAL},
+    #{item.pggp,jdbcType=DECIMAL}, #{item.pzggp,jdbcType=DECIMAL}, #{item.yxpgp,jdbcType=DECIMAL},
+    #{item.pggs,jdbcType=DECIMAL}, #{item.pzggs,jdbcType=DECIMAL}, #{item.yxpgs,jdbcType=DECIMAL}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update EMS_SCQK_LG
-     set
-       DATES=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.dates,jdbcType=TIMESTAMP}
-       </foreach>
-       ,RCL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.rcl,jdbcType=DECIMAL}
-       </foreach>
-       ,JTSL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.jtsl,jdbcType=DECIMAL}
-       </foreach>
-       ,SJYL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.sjyl,jdbcType=DECIMAL}
-       </foreach>
-       ,KCL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.kcl,jdbcType=DECIMAL}
-       </foreach>
-       ,WJZL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.wjzl,jdbcType=DECIMAL}
-       </foreach>
-       ,SCLS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.scls,jdbcType=DECIMAL}
-       </foreach>
-       ,LL_1=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.ll1,jdbcType=DECIMAL}
-       </foreach>
-       ,LL_2=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.ll2,jdbcType=DECIMAL}
-       </foreach>
-       ,FGZL_NBHST=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.fgzlNbhst,jdbcType=DECIMAL}
-       </foreach>
-       ,FGZL_WG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.fgzlWg,jdbcType=DECIMAL}
-       </foreach>
-       ,LLDLYL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.lldlyl,jdbcType=DECIMAL}
-       </foreach>
-       ,WGFG_JFGK=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.wgfgJfgk,jdbcType=DECIMAL}
-       </foreach>
-       ,WGFG_QXC=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.wgfgQxc,jdbcType=DECIMAL}
-       </foreach>
-       ,XCF=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.xcf,jdbcType=DECIMAL}
-       </foreach>
-       ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,CZR=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.czr,jdbcType=VARCHAR}
-       </foreach>
-       ,CZSJ=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.czsj,jdbcType=TIMESTAMP}
-       </foreach>
-       ,WXGPCL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.wxgpcl,jdbcType=DECIMAL}
-       </foreach>
-       ,LLB=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
-          when #{item.dates,jdbcType=TIMESTAMP} then #{item.llb,jdbcType=DECIMAL}
-       </foreach>
+    update EMS_SCQK_LG
+    set
+    DATES=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.dates,jdbcType=TIMESTAMP}
+    </foreach>
+    ,RCL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.rcl,jdbcType=DECIMAL}
+    </foreach>
+    ,JTSL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.jtsl,jdbcType=DECIMAL}
+    </foreach>
+    ,SJYL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.sjyl,jdbcType=DECIMAL}
+    </foreach>
+    ,KCL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.kcl,jdbcType=DECIMAL}
+    </foreach>
+    ,WJZL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.wjzl,jdbcType=DECIMAL}
+    </foreach>
+    ,SCLS=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.scls,jdbcType=DECIMAL}
+    </foreach>
+    ,LL_1=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.ll1,jdbcType=DECIMAL}
+    </foreach>
+    ,LL_2=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.ll2,jdbcType=DECIMAL}
+    </foreach>
+    ,FGZL_NBHST=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.fgzlNbhst,jdbcType=DECIMAL}
+    </foreach>
+    ,FGZL_WG=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.fgzlWg,jdbcType=DECIMAL}
+    </foreach>
+    ,LLDLYL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.lldlyl,jdbcType=DECIMAL}
+    </foreach>
+    ,WGFG_JFGK=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.wgfgJfgk,jdbcType=DECIMAL}
+    </foreach>
+    ,WGFG_QXC=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.wgfgQxc,jdbcType=DECIMAL}
+    </foreach>
+    ,XCF=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.xcf,jdbcType=DECIMAL}
+    </foreach>
+    ,MEMO=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.memo,jdbcType=VARCHAR}
+    </foreach>
+    ,CZR=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.czr,jdbcType=VARCHAR}
+    </foreach>
+    ,CZSJ=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.czsj,jdbcType=TIMESTAMP}
+    </foreach>
+    ,WXGPCL=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.wxgpcl,jdbcType=DECIMAL}
+    </foreach>
+    ,LLB=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.llb,jdbcType=DECIMAL}
+    </foreach>
     ,GSRCL=
-    <foreach collection="list" item="item" index="index" separator=" " open="case DATES" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
       when #{item.dates,jdbcType=TIMESTAMP} then #{item.gsrcl,jdbcType=DECIMAL}
     </foreach>
-     where DATES in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.dates,jdbcType=TIMESTAMP}
-     </foreach> 
+    ,LG_NYS=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.lgNys,jdbcType=DECIMAL}
+    </foreach>
+    ,PGGP=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.pggp,jdbcType=DECIMAL}
+    </foreach>
+    ,PZGGP=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.pzggp,jdbcType=DECIMAL}
+    </foreach>
+    ,YXPGP=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.yxpgp,jdbcType=DECIMAL}
+    </foreach>
+    ,PGGS=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.pggs,jdbcType=DECIMAL}
+    </foreach>
+    ,PZGGS=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.pzggs,jdbcType=DECIMAL}
+    </foreach>
+    ,YXPGS=
+    <foreach close="end" collection="list" index="index" item="item" open="case DATES" separator=" ">
+      when #{item.dates,jdbcType=TIMESTAMP} then #{item.yxpgs,jdbcType=DECIMAL}
+    </foreach>
+    where DATES in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.dates,jdbcType=TIMESTAMP}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from EMS_SCQK_LG
-    where DATES in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    where DATES in
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <update id="updateByMap" parameterType="java.util.HashMap">
+    update EMS_SCQK_LG
+    <set>
+      <if test="rcl != null">
+        RCL = #{rcl,jdbcType=DECIMAL},
+      </if>
+      <if test="jtsl != null">
+        JTSL = #{jtsl,jdbcType=DECIMAL},
+      </if>
+      <if test="sjyl != null">
+        SJYL = #{sjyl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcl != null">
+        KCL = #{kcl,jdbcType=DECIMAL},
+      </if>
+      <if test="wjzl != null">
+        WJZL = #{wjzl,jdbcType=DECIMAL},
+      </if>
+      <if test="scls != null">
+        SCLS = #{scls,jdbcType=DECIMAL},
+      </if>
+      <if test="ll1 != null">
+        LL_1 = #{ll1,jdbcType=DECIMAL},
+      </if>
+      <if test="ll2 != null">
+        LL_2 = #{ll2,jdbcType=DECIMAL},
+      </if>
+      <if test="fgzlNbhst != null">
+        FGZL_NBHST = #{fgzlNbhst,jdbcType=DECIMAL},
+      </if>
+      <if test="fgzlWg != null">
+        FGZL_WG = #{fgzlWg,jdbcType=DECIMAL},
+      </if>
+      <if test="lldlyl != null">
+        LLDLYL = #{lldlyl,jdbcType=DECIMAL},
+      </if>
+      <if test="wgfgJfgk != null">
+        WGFG_JFGK = #{wgfgJfgk,jdbcType=DECIMAL},
+      </if>
+      <if test="wgfgQxc != null">
+        WGFG_QXC = #{wgfgQxc,jdbcType=DECIMAL},
+      </if>
+      <if test="xcf != null">
+        XCF = #{xcf,jdbcType=DECIMAL},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="czr != null">
+        CZR = #{czr,jdbcType=VARCHAR},
+      </if>
+      <if test="czsj != null">
+        CZSJ = #{czsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="wxgpcl != null">
+        WXGPCL = #{wxgpcl,jdbcType=DECIMAL},
+      </if>
+      <if test="llb != null">
+        LLB = #{llb,jdbcType=DECIMAL},
+      </if>
+      <if test="gsrcl != null">
+        GSRCL = #{gsrcl,jdbcType=DECIMAL},
+      </if>
+      <if test="lgNys != null">
+        LG_NYS = #{lgNys,jdbcType=DECIMAL},
+      </if>
+      <if test="pggp != null">
+        PGGP = #{pggp,jdbcType=DECIMAL},
+      </if>
+      <if test="pzggp != null">
+        PZGGP = #{pzggp,jdbcType=DECIMAL},
+      </if>
+      <if test="yxpgp != null">
+        YXPGP = #{yxpgp,jdbcType=DECIMAL},
+      </if>
+      <if test="pggs != null">
+        PGGS = #{pggs,jdbcType=DECIMAL},
+      </if>
+      <if test="pzggs != null">
+        PZGGS = #{pzggs,jdbcType=DECIMAL},
+      </if>
+      <if test="yxpgs != null">
+        YXPGS = #{yxpgs,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where DATES = #{dates,jdbcType=TIMESTAMP}
+  </update>
 </mapper>

src/main/java/com/steerinfo/ems/emsscqklg/model/EmsScqkLg.java

@@ -7,6 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * @author quietShadow
+ */
 @ApiModel(value="生产情况-炼钢")
 public class EmsScqkLg implements IBasePO<Date> {
     /**
@@ -100,7 +103,7 @@ public class EmsScqkLg implements IBasePO<Date> {
     private BigDecimal xcf;
 
     /**
-     * 记事(MEMO,VARCHAR,500)
+     * 记事(MEMO,VARCHAR,1000)
      */
     @ApiModelProperty(value="记事",required=false)
     private String memo;
@@ -130,11 +133,53 @@ public class EmsScqkLg implements IBasePO<Date> {
     private BigDecimal llb;
 
     /**
-     * 冷料比(LLB,DECIMAL,0)
+     * 钢水日产量(GSRCL,DECIMAL,0)
      */
     @ApiModelProperty(value="钢水日产量",required=false)
     private BigDecimal gsrcl;
 
+    /**
+     * 炼钢浓盐水用量(LG_NYS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="炼钢浓盐水用量",required=false)
+    private BigDecimal lgNys;
+
+    /**
+     * 普钢钢坯产量(PGGP,DECIMAL,0)
+     */
+    @ApiModelProperty(value="普钢钢坯产量",required=false)
+    private BigDecimal pggp;
+
+    /**
+     * 品种钢钢坯产量(PZGGP,DECIMAL,0)
+     */
+    @ApiModelProperty(value="品种钢钢坯产量",required=false)
+    private BigDecimal pzggp;
+
+    /**
+     * 异型坯钢坯产量(YXPGP,DECIMAL,0)
+     */
+    @ApiModelProperty(value="异型坯钢坯产量",required=false)
+    private BigDecimal yxpgp;
+
+    /**
+     * 普钢钢水产量(PGGS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="普钢钢水产量",required=false)
+    private BigDecimal pggs;
+
+    /**
+     * 品种钢钢水产量(PZGGS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="品种钢钢水产量",required=false)
+    private BigDecimal pzggs;
+
+    /**
+     * 异型坯钢水产量(YXPGS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="异型坯钢水产量",required=false)
+    private BigDecimal yxpgs;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -315,6 +360,62 @@ public class EmsScqkLg implements IBasePO<Date> {
         this.gsrcl = gsrcl;
     }
 
+    public BigDecimal getLgNys() {
+        return lgNys;
+    }
+
+    public void setLgNys(BigDecimal lgNys) {
+        this.lgNys = lgNys;
+    }
+
+    public BigDecimal getPggp() {
+        return pggp;
+    }
+
+    public void setPggp(BigDecimal pggp) {
+        this.pggp = pggp;
+    }
+
+    public BigDecimal getPzggp() {
+        return pzggp;
+    }
+
+    public void setPzggp(BigDecimal pzggp) {
+        this.pzggp = pzggp;
+    }
+
+    public BigDecimal getYxpgp() {
+        return yxpgp;
+    }
+
+    public void setYxpgp(BigDecimal yxpgp) {
+        this.yxpgp = yxpgp;
+    }
+
+    public BigDecimal getPggs() {
+        return pggs;
+    }
+
+    public void setPggs(BigDecimal pggs) {
+        this.pggs = pggs;
+    }
+
+    public BigDecimal getPzggs() {
+        return pzggs;
+    }
+
+    public void setPzggs(BigDecimal pzggs) {
+        this.pzggs = pzggs;
+    }
+
+    public BigDecimal getYxpgs() {
+        return yxpgs;
+    }
+
+    public void setYxpgs(BigDecimal yxpgs) {
+        this.yxpgs = yxpgs;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -342,6 +443,13 @@ public class EmsScqkLg implements IBasePO<Date> {
         sb.append(", wxgpcl=").append(wxgpcl);
         sb.append(", llb=").append(llb);
         sb.append(", gsrcl=").append(gsrcl);
+        sb.append(", lgNys=").append(lgNys);
+        sb.append(", pggp=").append(pggp);
+        sb.append(", pzggp=").append(pzggp);
+        sb.append(", yxpgp=").append(yxpgp);
+        sb.append(", pggs=").append(pggs);
+        sb.append(", pzggs=").append(pzggs);
+        sb.append(", yxpgs=").append(yxpgs);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/ems/emsscqklg/service/impl/EmsScqkLgServiceImpl.java

@@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * EmsScqkLg服务实现：
@@ -56,8 +56,11 @@ public class EmsScqkLgServiceImpl extends BaseServiceImpl<EmsScqkLg, Date> imple
               number += emsScqkLgMapper.insert(emsScqkLg);
               return number ;
            }
-          Map map = CompareUtil.compareFields(model,emsScqkLg,ignoreArr);
-           System.out.println(map.toString());
+          HashMap map = (HashMap) CompareUtil.compareFields(model,emsScqkLg,ignoreArr,0);
+           if(map.size()>0){
+               map.put("dates",model.getDates());
+               emsScqkLgMapper.updateByMap(map);
+           }
            //model.setGsrcl(emsScqkLg.getGsrcl());
            //number += emsScqkLgMapper.updateByPrimaryKeySelective(emsScqkLg);
        }

src/main/java/com/steerinfo/ems/emswebsocketlog/controller/EmsWebsocketLogController.java

@@ -0,0 +1,111 @@
+package com.steerinfo.ems.emswebsocketlog.controller;
+
+import com.steerinfo.auth.utils.JwtUtil;
+import com.steerinfo.ems.Utils.DateUtils;
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.ems.emswebsocketlog.service.IEmsWebsocketLogService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * EmsWebsocketLog RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-15 03:24
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-15
+ * 作者：generator
+ * 参考：
+ * 描述：EmsWebsocketLog RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/emswebsocketlogs")
+public class EmsWebsocketLogController extends BaseRESTfulController {
+
+    @Autowired
+    IEmsWebsocketLogService emsWebsocketLogService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("emswebsocketlog:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<EmsWebsocketLog> list = emsWebsocketLogService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("emswebsocketlog:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<EmsWebsocketLog> list = emsWebsocketLogService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据EmsWebsocketLog对象创建")
+    @ApiImplicitParam(name = "emsWebsocketLog", value = "详细实体emsWebsocketLog", required = true, dataType = "EmsWebsocketLog")
+    //@RequiresPermissions("emswebsocketlog:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody EmsWebsocketLog model){
+        model.setCreateman(JwtUtil.getUseridByToken());
+        model.setCreatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        EmsWebsocketLog emsWebsocketLog = emsWebsocketLogService.add(model);
+        return success(emsWebsocketLog);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("emswebsocketlog:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        EmsWebsocketLog emsWebsocketLog = emsWebsocketLogService.getById(id);
+        return success(emsWebsocketLog);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的emsWebsocketLog信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "emsWebsocketLog", value = "详细实体emsWebsocketLog", required = true, dataType = "EmsWebsocketLog")
+    })
+    //@RequiresPermissions("emswebsocketlog:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody EmsWebsocketLog model){
+        model.setId(id);
+        EmsWebsocketLog emsWebsocketLog = emsWebsocketLogService.modify(model);
+        return success(emsWebsocketLog);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("emswebsocketlog:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  emsWebsocketLogService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/ems/emswebsocketlog/mapper/EmsWebsocketLogMapper.java

@@ -0,0 +1,9 @@
+package com.steerinfo.ems.emswebsocketlog.mapper;
+
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EmsWebsocketLogMapper extends IBaseMapper<EmsWebsocketLog, String> {
+}

src/main/java/com/steerinfo/ems/emswebsocketlog/mapper/EmsWebsocketLogMapper.xml

@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.ems.emswebsocketlog.mapper.EmsWebsocketLogMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog">
+    <id column="MESSAGEID" jdbcType="VARCHAR" property="messageid" />
+    <result column="RELATION" jdbcType="VARCHAR" property="relation" />
+    <result column="ROLE" jdbcType="VARCHAR" property="role" />
+    <result column="TITLE" jdbcType="VARCHAR" property="title" />
+    <result column="MESSAGE" jdbcType="VARCHAR" property="message" />
+    <result column="TIPS" jdbcType="VARCHAR" property="tips" />
+    <result column="STATE" jdbcType="VARCHAR" property="state" />
+    <result column="CREATETIME" jdbcType="VARCHAR" property="createtime" />
+    <result column="CREATEMAN" jdbcType="VARCHAR" property="createman" />
+    <result column="CLOSETIME" jdbcType="VARCHAR" property="closetime" />
+    <result column="CLOSEMAN" jdbcType="VARCHAR" property="closeman" />
+  </resultMap>
+  <sql id="columns">
+    MESSAGEID, RELATION, ROLE, TITLE, MESSAGE, TIPS, STATE, CREATETIME, CREATEMAN, CLOSETIME, 
+    CLOSEMAN
+  </sql>
+  <sql id="columns_alias">
+    t.MESSAGEID, t.RELATION, t.ROLE, t.TITLE, t.MESSAGE, t.TIPS, t.STATE, t.CREATETIME, 
+    t.CREATEMAN, t.CLOSETIME, t.CLOSEMAN
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM EMS_WEBSOCKET_LOG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM EMS_WEBSOCKET_LOG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="messageid != null and messageid != ''">
+        and MESSAGEID = #{messageid}
+      </if>
+      <if test="relation != null and relation != ''">
+        and RELATION = #{relation}
+      </if>
+      <if test="role != null and role != ''">
+        and ROLE = #{role}
+      </if>
+      <if test="title != null and title != ''">
+        and TITLE = #{title}
+      </if>
+      <if test="message != null and message != ''">
+        and MESSAGE = #{message}
+      </if>
+      <if test="tips != null and tips != ''">
+        and TIPS = #{tips}
+      </if>
+      <if test="state != null and state != ''">
+        and STATE = #{state}
+      </if>
+      <if test="createtime != null and createtime != ''">
+        and CREATETIME = #{createtime}
+      </if>
+      <if test="createman != null and createman != ''">
+        and CREATEMAN = #{createman}
+      </if>
+      <if test="closetime != null and closetime != ''">
+        and CLOSETIME = #{closetime}
+      </if>
+      <if test="closeman != null and closeman != ''">
+        and CLOSEMAN = #{closeman}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="messageid != null and messageid != ''">
+        and MESSAGEID LIKE '%${messageid}%'
+      </if>
+      <if test="relation != null and relation != ''">
+        and RELATION LIKE '%${relation}%'
+      </if>
+      <if test="role != null and role != ''">
+        and ROLE LIKE '%${role}%'
+      </if>
+      <if test="title != null and title != ''">
+        and TITLE LIKE '%${title}%'
+      </if>
+      <if test="message != null and message != ''">
+        and MESSAGE LIKE '%${message}%'
+      </if>
+      <if test="tips != null and tips != ''">
+        and TIPS LIKE '%${tips}%'
+      </if>
+      <if test="state != null and state != ''">
+        and STATE LIKE '%${state}%'
+      </if>
+      <if test="createtime != null and createtime != ''">
+        and CREATETIME LIKE '%${createtime}%'
+      </if>
+      <if test="createman != null and createman != ''">
+        and CREATEMAN LIKE '%${createman}%'
+      </if>
+      <if test="closetime != null and closetime != ''">
+        and CLOSETIME LIKE '%${closetime}%'
+      </if>
+      <if test="closeman != null and closeman != ''">
+        and CLOSEMAN LIKE '%${closeman}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from EMS_WEBSOCKET_LOG
+    where MESSAGEID = #{messageid,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from EMS_WEBSOCKET_LOG
+    where 1!=1 
+      <if test="relation != null and relation != ''">
+        or RELATION = #{relation}
+      </if>
+      <if test="role != null and role != ''">
+        or ROLE = #{role}
+      </if>
+      <if test="title != null and title != ''">
+        or TITLE = #{title}
+      </if>
+      <if test="message != null and message != ''">
+        or MESSAGE = #{message}
+      </if>
+      <if test="tips != null and tips != ''">
+        or TIPS = #{tips}
+      </if>
+      <if test="state != null and state != ''">
+        or STATE = #{state}
+      </if>
+      <if test="createtime != null and createtime != ''">
+        or CREATETIME = #{createtime}
+      </if>
+      <if test="createman != null and createman != ''">
+        or CREATEMAN = #{createman}
+      </if>
+      <if test="closetime != null and closetime != ''">
+        or CLOSETIME = #{closetime}
+      </if>
+      <if test="closeman != null and closeman != ''">
+        or CLOSEMAN = #{closeman}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog">
+    insert into EMS_WEBSOCKET_LOG (MESSAGEID, RELATION, ROLE, 
+      TITLE, MESSAGE, TIPS, 
+      STATE, CREATETIME, CREATEMAN, 
+      CLOSETIME, CLOSEMAN)
+    values (#{messageid,jdbcType=VARCHAR}, #{relation,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
+      #{title,jdbcType=VARCHAR}, #{message,jdbcType=VARCHAR}, #{tips,jdbcType=VARCHAR}, 
+      #{state,jdbcType=VARCHAR}, #{createtime,jdbcType=VARCHAR}, #{createman,jdbcType=VARCHAR}, 
+      #{closetime,jdbcType=VARCHAR}, #{closeman,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog">
+    insert into EMS_WEBSOCKET_LOG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="messageid != null">
+        MESSAGEID,
+      </if>
+      <if test="relation != null">
+        RELATION,
+      </if>
+      <if test="role != null">
+        ROLE,
+      </if>
+      <if test="title != null">
+        TITLE,
+      </if>
+      <if test="message != null">
+        MESSAGE,
+      </if>
+      <if test="tips != null">
+        TIPS,
+      </if>
+      <if test="state != null">
+        STATE,
+      </if>
+      <if test="createtime != null">
+        CREATETIME,
+      </if>
+      <if test="createman != null">
+        CREATEMAN,
+      </if>
+      <if test="closetime != null">
+        CLOSETIME,
+      </if>
+      <if test="closeman != null">
+        CLOSEMAN,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="messageid != null">
+        #{messageid,jdbcType=VARCHAR},
+      </if>
+      <if test="relation != null">
+        #{relation,jdbcType=VARCHAR},
+      </if>
+      <if test="role != null">
+        #{role,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="message != null">
+        #{message,jdbcType=VARCHAR},
+      </if>
+      <if test="tips != null">
+        #{tips,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=VARCHAR},
+      </if>
+      <if test="createman != null">
+        #{createman,jdbcType=VARCHAR},
+      </if>
+      <if test="closetime != null">
+        #{closetime,jdbcType=VARCHAR},
+      </if>
+      <if test="closeman != null">
+        #{closeman,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog">
+    update EMS_WEBSOCKET_LOG
+    set RELATION = #{relation,jdbcType=VARCHAR},
+      ROLE = #{role,jdbcType=VARCHAR},
+      TITLE = #{title,jdbcType=VARCHAR},
+      MESSAGE = #{message,jdbcType=VARCHAR},
+      TIPS = #{tips,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATETIME = #{createtime,jdbcType=VARCHAR},
+      CREATEMAN = #{createman,jdbcType=VARCHAR},
+      CLOSETIME = #{closetime,jdbcType=VARCHAR},
+      CLOSEMAN = #{closeman,jdbcType=VARCHAR}
+    where MESSAGEID = #{messageid,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog">
+    update EMS_WEBSOCKET_LOG
+    <set>
+      <if test="relation != null">
+        RELATION = #{relation,jdbcType=VARCHAR},
+      </if>
+      <if test="role != null">
+        ROLE = #{role,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        TITLE = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="message != null">
+        MESSAGE = #{message,jdbcType=VARCHAR},
+      </if>
+      <if test="tips != null">
+        TIPS = #{tips,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        CREATETIME = #{createtime,jdbcType=VARCHAR},
+      </if>
+      <if test="createman != null">
+        CREATEMAN = #{createman,jdbcType=VARCHAR},
+      </if>
+      <if test="closetime != null">
+        CLOSETIME = #{closetime,jdbcType=VARCHAR},
+      </if>
+      <if test="closeman != null">
+        CLOSEMAN = #{closeman,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where MESSAGEID = #{messageid,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where MESSAGEID = #{messageid,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into EMS_WEBSOCKET_LOG 
+      (MESSAGEID, 
+      RELATION, ROLE, TITLE, 
+      MESSAGE, TIPS, STATE, 
+      CREATETIME, CREATEMAN, CLOSETIME, 
+      CLOSEMAN)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.messageid,jdbcType=VARCHAR}, 
+      #{item.relation,jdbcType=VARCHAR}, #{item.role,jdbcType=VARCHAR}, #{item.title,jdbcType=VARCHAR}, 
+      #{item.message,jdbcType=VARCHAR}, #{item.tips,jdbcType=VARCHAR}, #{item.state,jdbcType=VARCHAR}, 
+      #{item.createtime,jdbcType=VARCHAR}, #{item.createman,jdbcType=VARCHAR}, #{item.closetime,jdbcType=VARCHAR}, 
+      #{item.closeman,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update EMS_WEBSOCKET_LOG
+     set
+       MESSAGEID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.messageid,jdbcType=VARCHAR}
+       </foreach>
+       ,RELATION=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.relation,jdbcType=VARCHAR}
+       </foreach>
+       ,ROLE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.role,jdbcType=VARCHAR}
+       </foreach>
+       ,TITLE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.title,jdbcType=VARCHAR}
+       </foreach>
+       ,MESSAGE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.message,jdbcType=VARCHAR}
+       </foreach>
+       ,TIPS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.tips,jdbcType=VARCHAR}
+       </foreach>
+       ,STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.state,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATETIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.createtime,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATEMAN=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.createman,jdbcType=VARCHAR}
+       </foreach>
+       ,CLOSETIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.closetime,jdbcType=VARCHAR}
+       </foreach>
+       ,CLOSEMAN=
+       <foreach collection="list" item="item" index="index" separator=" " open="case MESSAGEID" close="end">
+          when #{item.messageid,jdbcType=VARCHAR} then #{item.closeman,jdbcType=VARCHAR}
+       </foreach>
+     where MESSAGEID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.messageid,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from EMS_WEBSOCKET_LOG
+    where MESSAGEID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/ems/emswebsocketlog/model/EmsWebsocketLog.java

@@ -0,0 +1,196 @@
+package com.steerinfo.ems.emswebsocketlog.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="websocket消息日志表")
+public class EmsWebsocketLog implements IBasePO<String> {
+    /**
+     * id(MESSAGEID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="id",required=true)
+    private String messageid;
+
+    /**
+     * 消息关联ID(RELATION,VARCHAR,255)
+     */
+    @ApiModelProperty(value="消息关联ID",required=false)
+    private String relation;
+
+    /**
+     * 消息权限(ROLE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="消息权限",required=false)
+    private String role;
+
+    /**
+     * 消息标题(TITLE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="消息标题",required=false)
+    private String title;
+
+    /**
+     * 消息(MESSAGE,VARCHAR,1000)
+     */
+    @ApiModelProperty(value="消息",required=false)
+    private String message;
+
+    /**
+     * 语音提示(TIPS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="语音提示",required=false)
+    private String tips;
+
+    /**
+     * 消息状态(STATE,VARCHAR,10)
+     */
+    @ApiModelProperty(value="消息状态",required=false)
+    private String state;
+
+    /**
+     * 消息创建时间(CREATETIME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="消息创建时间",required=false)
+    private String createtime;
+
+    /**
+     * 消息创建人(CREATEMAN,VARCHAR,50)
+     */
+    @ApiModelProperty(value="消息创建人",required=false)
+    private String createman;
+
+    /**
+     * 消息关闭时间(CLOSETIME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="消息关闭时间",required=false)
+    private String closetime;
+
+    /**
+     * 消息关闭人(CLOSEMAN,VARCHAR,1000)
+     */
+    @ApiModelProperty(value="消息关闭人",required=false)
+    private String closeman;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.messageid;
+    }
+
+    @Override
+    public void setId(String messageid) {
+        this.messageid = messageid == null ? null : messageid.trim();
+    }
+
+    public String getMessageid() {
+        return messageid;
+    }
+
+    public void setMessageid(String messageid) {
+        this.messageid = messageid == null ? null : messageid.trim();
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation == null ? null : relation.trim();
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role == null ? null : role.trim();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title == null ? null : title.trim();
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message == null ? null : message.trim();
+    }
+
+    public String getTips() {
+        return tips;
+    }
+
+    public void setTips(String tips) {
+        this.tips = tips == null ? null : tips.trim();
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    public String getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(String createtime) {
+        this.createtime = createtime == null ? null : createtime.trim();
+    }
+
+    public String getCreateman() {
+        return createman;
+    }
+
+    public void setCreateman(String createman) {
+        this.createman = createman == null ? null : createman.trim();
+    }
+
+    public String getClosetime() {
+        return closetime;
+    }
+
+    public void setClosetime(String closetime) {
+        this.closetime = closetime == null ? null : closetime.trim();
+    }
+
+    public String getCloseman() {
+        return closeman;
+    }
+
+    public void setCloseman(String closeman) {
+        this.closeman = closeman == null ? null : closeman.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", messageid=").append(messageid);
+        sb.append(", relation=").append(relation);
+        sb.append(", role=").append(role);
+        sb.append(", title=").append(title);
+        sb.append(", message=").append(message);
+        sb.append(", tips=").append(tips);
+        sb.append(", state=").append(state);
+        sb.append(", createtime=").append(createtime);
+        sb.append(", createman=").append(createman);
+        sb.append(", closetime=").append(closetime);
+        sb.append(", closeman=").append(closeman);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/ems/emswebsocketlog/service/IEmsWebsocketLogService.java

@@ -0,0 +1,21 @@
+package com.steerinfo.ems.emswebsocketlog.service;
+
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * EmsWebsocketLog服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-15 03:24
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-15
+ * 作者：generator
+ * 参考：
+ * 描述：EmsWebsocketLog服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IEmsWebsocketLogService extends IBaseService<EmsWebsocketLog, String>{
+
+}

src/main/java/com/steerinfo/ems/emswebsocketlog/service/impl/EmsWebsocketLogServiceImpl.java

@@ -0,0 +1,34 @@
+package com.steerinfo.ems.emswebsocketlog.service.impl;
+
+import com.steerinfo.ems.emswebsocketlog.mapper.EmsWebsocketLogMapper;
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.ems.emswebsocketlog.service.IEmsWebsocketLogService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * EmsWebsocketLog服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-15 03:24
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-15
+ * 作者：generator
+ * 参考：
+ * 描述：EmsWebsocketLog服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "emsWebsocketLogService")
+public class EmsWebsocketLogServiceImpl extends BaseServiceImpl<EmsWebsocketLog, String> implements IEmsWebsocketLogService {
+
+    @Autowired
+    private EmsWebsocketLogMapper emsWebsocketLogMapper;
+
+    @Override
+    protected IBaseMapper<EmsWebsocketLog, String> getMapper() {
+        return emsWebsocketLogMapper;
+    }
+}

src/main/java/com/steerinfo/ems/trmactitem/controller/TRmActItemController.java

@@ -5,9 +5,6 @@ import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.formula.model.Formula;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.trmactitem.mapper.TRmActItemMapper;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.ems.trmactitem.model.TRmActItem;
 import com.steerinfo.ems.trmactitem.service.ITRmActItemService;
 import com.steerinfo.ems.trmactvalue.service.ITRmActValueService;
@@ -15,6 +12,9 @@ import com.steerinfo.ems.trmbalancevalue.service.ITRmBalanceValueService;
 import com.steerinfo.ems.trmdfvalue.service.ITRmDfValueService;
 import com.steerinfo.ems.trmdwvalue.service.ITRmDwValueService;
 import com.steerinfo.ems.trmplanvalue.service.ITRmPlanValueService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.task.SpringCronTask;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -26,11 +26,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.util.*;
-
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * TRmActItem RESTful接口：
@@ -277,32 +276,37 @@ public class TRmActItemController extends BaseRESTfulController {
         String userId = JwtUtil.getUseridByToken();
         for(int i = 0;i < model.length;i++){
             try {
-            	TRmActItem old = tRmActItemService.getById(model[i].getId());
-                logger.info("T_RM_ACT_ITEM表的数据发生修改(操作人ID：" + userId + "):");
-                logger.info("修改前数据是" + old.toString());
-                String oldMintimegranid = old.getMintimegranid();
-                // 如果修改最小时间粒度，判断公式是否合法（最小时间粒度影响公式计算）
-                if(!oldMintimegranid.equalsIgnoreCase(model[i].getMintimegranid())){
-                	HashMap<String, Object> parmas = new HashMap<>();
-                	parmas.put("code", model[i].getItemid());
-                	parmas.put("clock", DateUtils.dateStr(new Date(), "yyyyMM"));
-                	// 获取公式
-                	Formula fm = formulaService.getFormulaCodeClock(parmas);
-                	String res = formulaService.checkFormulaMint(fm, model[i].getMintimegranid());
-                	if(!res.isEmpty()){
-                		warnmsg.add(model[i].getId() + ":" + res);
+                if(model[i].getIssettle() != null && !model[i].getIssettle().equals("")){
+                    tRmActItemService.modify(model[i]);
+                } else {
+                    TRmActItem old = tRmActItemService.getById(model[i].getId());
+                    logger.info("T_RM_ACT_ITEM表的数据发生修改(操作人ID：" + userId + "):");
+                    logger.info("修改前数据是" + old.toString());
+                    String oldMintimegranid = old.getMintimegranid();
+                    // 如果修改最小时间粒度，判断公式是否合法（最小时间粒度影响公式计算）
+                    if(!oldMintimegranid.equalsIgnoreCase(model[i].getMintimegranid())){
+                        HashMap<String, Object> parmas = new HashMap<>();
+                        parmas.put("code", model[i].getItemid());
+                        parmas.put("clock", DateUtils.dateStr(new Date(), "yyyyMM"));
+                        // 获取公式
+                        Formula fm = formulaService.getFormulaCodeClock(parmas);
+                        String res = formulaService.checkFormulaMint(fm, model[i].getMintimegranid());
+                        if(!res.isEmpty()){
+                            warnmsg.add(model[i].getId() + ":" + res);
+                        }
                     }
+                    model[i].setDefaulman(userId);
+                    model[i].setModificationtime(DateUtils.dateStr(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                    TRmActItem trmData = tRmActItemService.modify(model[i]);
+                    if(model[i].getItemdesc()!=null && !model[i].getItemdesc().trim().isEmpty()) {
+                        Map<String, Object> pm = new HashMap<>();
+                        pm.put("code", model[i].getItemid());
+                        pm.put("description", model[i].getItemdesc().trim());
+                        formulaService.updateDesBycode(pm);
+                    }
+                    logger.info("修改后数据是" + trmData.toString());
                 }
-                model[i].setDefaulman(userId);
-                model[i].setModificationtime(DateUtils.dateStr(new Date(), "yyyy-MM-dd HH:mm:ss"));
-                TRmActItem trmData = tRmActItemService.modify(model[i]);
-                if(model[i].getItemdesc()!=null && !model[i].getItemdesc().trim().isEmpty()) {
-                	Map<String, Object> pm = new HashMap<>();
-                    pm.put("code", model[i].getItemid());
-                    pm.put("description", model[i].getItemdesc().trim());
-                    formulaService.updateDesBycode(pm);
-                }
-                logger.info("修改后数据是" + trmData.toString());
+
             }
             catch(Exception e){
                 failnum++;

src/main/java/com/steerinfo/ems/trmactitem/mapper/TRmActItemMapper.xml

@@ -724,6 +724,9 @@
 	        <if test="itemdesc != null and itemdesc != ''">
 	           and t.itemdesc like '%${itemdesc}%'
 	        </if>
+          <if test="issettle != null and issettle != ''">
+            and t.issettle = ${issettle}
+          </if>
 	        <if test="measureid != null and measureid != ''">
       			and exists
       			(select id from FORMULA where sourcecode like '%[${measureid}]%' and code = t.itemid)

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/controller/TRmWorkprocMaterialValueController.java

@@ -246,6 +246,7 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
 		tRmWorkprocMaterialValueService.synchronousData5();
         //根据报表中的原料数据生成
         tRmWorkprocMaterialValueService.getReportValue(parmas);
+        tRmWorkprocMaterialValueService.getMaterialValue(parmas);
 		parmas.put("useflag", "1");
 		// 查询需要统计的计量点信息
 		List<TRmWorkprocMaterial> l = tRmWorkprocMaterialMapper.selectByParameters(parmas);

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/mapper/TRmWorkprocMaterialValueMapper.java

@@ -73,6 +73,13 @@ public interface TRmWorkprocMaterialValueMapper extends IBaseMapper<TRmWorkprocM
     List<TRmWorkprocMaterialValue> getReportValue(HashMap<String, Object> params);
 
     /**
+     * 根据原料对应表获取报表数据
+     * @param params
+     * @return
+     */
+    List<TRmWorkprocMaterialValue> getMaterialValue(HashMap<String, Object> params);
+
+     /**
      * 盘库消耗查询
      */
     List<Map<String,Object>> getpkdata(Map<String,Object> params);

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/mapper/TRmWorkprocMaterialValueMapper.xml

@@ -616,14 +616,30 @@
   <select id="getReportValue" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,
     CONCAT(PROCEDURE,CONCAT(MATERIAL,'R')) AS ITEMID,
-    WEIGHT AS APPORTVALUE FROM V_INPUTOUTPUT WHERE 1=1
+    WEIGHT AS APPORTVALUE FROM V_INPUTOUTPUT WHERE 1=1 AND MATERIAL LIKE '%Y%' AND WEIGHT IS NOT NULL
       <if test="clock != null and clock != ''">
        AND DATES >= TO_DATE(#{clock}, 'yyyy-MM-dd')
       </if>
-    <if test="clock1 != null and clock1 != ''">
-      AND DATES &lt;= TO_DATE(#{clock1}, 'yyyy-MM-dd')
+    <if test="clocke != null and clocke != ''">
+      AND DATES &lt;= TO_DATE(#{clocke}, 'yyyy-MM-dd')
     </if>
   </select>
+
+  <!--根据原料对应表，获取报表数据-->
+  <select id="getMaterialValue" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT * FROM(
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_JT_1 AS ACTUALVALUE,RLXH_JT_1 AS APPORTVALUE,'AT3001Y0366R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_JT_1 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_PM_1 AS ACTUALVALUE,RLXH_PM_1 AS APPORTVALUE,'AT3001Y0368R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_PM_1 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_JT_2 AS ACTUALVALUE,RLXH_JT_2 AS APPORTVALUE,'AT3002Y0366R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_JT_2 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_JT_2 AS ACTUALVALUE,RLXH_PM_2 AS APPORTVALUE,'AT3002Y0368R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_JT_2 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_JT_3 AS ACTUALVALUE,RLXH_JT_3 AS APPORTVALUE,'AT3003Y0366R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_JT_3 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_PM_3 AS ACTUALVALUE,RLXH_PM_3 AS APPORTVALUE,'AT3003Y0368R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_PM_3 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_JT_4 AS ACTUALVALUE,RLXH_JT_4 AS APPORTVALUE,'AT3004Y0366R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_JT_4 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RLXH_PM_4 AS ACTUALVALUE,RLXH_PM_4 AS APPORTVALUE,'AT3004Y0368R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RLXH_PM_4 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,YS_JF AS ACTUALVALUE,(100-YS_JFSF)/100*YS_JF AS APPORTVALUE,'AT2009Y0380R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND YS_JF IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ES_JF AS ACTUALVALUE,(100-ES_JFSF)/100*ES_JF AS APPORTVALUE,'AT2010Y0380R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND ES_JF IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JMXH AS ACTUALVALUE,(100-JM_SF)/100*JMXH AS APPORTVALUE,'AT2017Y0025R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND JMXH IS NOT NULL) WHERE ACTUALVALUE IS NOT NULL AND APPORTVALUE IS NOT NULL
+  </select>
   <select id="getpkdata" parameterType="java.util.HashMap" resultType="Map">
             SELECT *
             FROM (SELECT T.TIMEGRANID,

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/service/ITRmWorkprocMaterialValueService.java

@@ -113,6 +113,13 @@ public interface ITRmWorkprocMaterialValueService extends IBaseService<TRmWorkpr
 	 */
 	void getReportValue(Date date);
 
+	/**
+	 * 根据原料对应表获取报表数据
+	 * @param params
+	 * @return
+	 */
+	void getMaterialValue(HashMap<String, Object> params);
+
 	/**
 	 * 盘库消耗查询
 	 */

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/service/impl/TRmWorkprocMaterialValueServiceImpl.java

@@ -1030,15 +1030,14 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork
 		for(TRmWorkprocMaterialValue trmWorkprocMaterialValue: trmlist)
 		{
 			trmWorkprocMaterialValue.setTimegranid("DAY");
-			trmModel= tRmWorkprocMaterialValueMapper.selectByUPrimaryKey(trmWorkprocMaterialValue);
-			if(trmModel==null){
-				//tRmWorkprocMaterialValueMapper.insertSelective(trmWorkprocMaterialValue);
-				continue;
-			}
-			trmWorkprocMaterialValue.setCorrectvalue(trmWorkprocMaterialValue.getApportvalue().subtract(trmModel.getActualvalue()));
-			trmWorkprocMaterialValue.setUpman("系统");
-			trmWorkprocMaterialValue.setUptime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-			tRmWorkprocMaterialValueMapper.updateByPrimaryKeySelective(trmWorkprocMaterialValue);
+			trmWorkprocMaterialValue.setActualvalue(trmWorkprocMaterialValue.getApportvalue());
+			trmWorkprocMaterialValue.setCorrectvalue(BigDecimal.ZERO);
+			trmWorkprocMaterialValue.setBz("系统根据报表数据自动新增");
+			trmWorkprocMaterialValue.setUserid("系统");
+			trmWorkprocMaterialValue.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+			if(tRmWorkprocMaterialValueMapper.updateByPrimaryKeySelective(trmWorkprocMaterialValue)==0){
+				tRmWorkprocMaterialValueMapper.insertSelective(trmWorkprocMaterialValue);
+			};
 		}
 	}
 
@@ -1089,6 +1088,21 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork
 		PageList<Map<String, Object>> pageInfo = new PageList<Map<String, Object>>(rows);
 		return pageInfo;
 	}
+	@Override
+	public void getMaterialValue(HashMap<String, Object> params) {
+		List<TRmWorkprocMaterialValue> trmlist= tRmWorkprocMaterialValueMapper.getMaterialValue(params);
+		for(TRmWorkprocMaterialValue trmWorkprocMaterialValue: trmlist)
+		{
+			trmWorkprocMaterialValue.setTimegranid("DAY");
+			trmWorkprocMaterialValue.setCorrectvalue(trmWorkprocMaterialValue.getApportvalue().subtract(trmWorkprocMaterialValue.getActualvalue()));
+			trmWorkprocMaterialValue.setBz("计算值是湿基；最终值是干基");
+			trmWorkprocMaterialValue.setUserid("系统");
+			trmWorkprocMaterialValue.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+			if(tRmWorkprocMaterialValueMapper.updateByPrimaryKeySelective(trmWorkprocMaterialValue)==0){
+				tRmWorkprocMaterialValueMapper.insertSelective(trmWorkprocMaterialValue);
+			};
+		}
+	}
 
 
 }

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/controller/TRmWorkprocProductValueController.java

@@ -440,8 +440,9 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
 			TRmWorkprocProduct t = l.get(i);
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
-        //根据报表中的原料数据生成
+        //根据报表中的产量数据生成
         tRmWorkprocProductValueService.getReportValue(parmas);
+        tRmWorkprocProductValueService.getReportProductValue(parmas);
 		if(!res.isEmpty()){
 			return failed(null, res);
 		}

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.java

@@ -14,19 +14,20 @@ import java.util.Set;
 public interface TRmWorkprocProductValueMapper extends IBaseMapper<TRmWorkprocProductValue, HashMap<String, Object>> {
 	/**
 	 * 根据联合主键查询对象
-	 * 
+	 *
 	 * @param
 	 */
 	TRmWorkprocProductValue selectByUPrimaryKey(TRmWorkprocProductValue tRmWorkprocProductValue);
 
-    /**
-     * 查询时间粒度,时间,产品,工序获取数据(能源计划管理-计划项目数据维护)
-     * @param parameters
-     * @return
-     */
-    List<Map<String,Object>> getWorkprocProductValues(Map<String,Object> parameters);
+	/**
+	 * 查询时间粒度,时间,产品,工序获取数据(能源计划管理-计划项目数据维护)
+	 *
+	 * @param parameters
+	 * @return
+	 */
+	List<Map<String, Object>> getWorkprocProductValues(Map<String, Object> parameters);
 
-    int updateValue(HashMap<String, Object> m);
+	int updateValue(HashMap<String, Object> m);
 
 	int insertValue(HashMap<String, Object> m);
 
@@ -37,93 +38,100 @@ public interface TRmWorkprocProductValueMapper extends IBaseMapper<TRmWorkprocPr
 	List<Map<String, Object>> getDate53(HashMap<String, Object> parmas);
 
 	/**
-     * 计算累计值
-     * @param params <br/>
-     *  itemid 项目ID <br/>
-     *  clock 时间头(like clock%)<br/>
-     *  timegranid 时间粒度
-     * @return
-     */
-    Double getSumvalue(HashMap<String,Object> params);
-    
-    /**
-     * 计算累计值2（计算日期小于参数值的累计值）
-     * 
-     * @param params <br/>
-     * 	itemid 项目ID <br/>
-     *  clock 小于该时间<br/>
-     *  ckhead 时间头<br/>
-     *  timegranid 时间粒度
-     * @return
-     */
-    Double getSumvalue2(HashMap<String,Object> params);
-
-    /**
-     * 根据联合主键获取
-     * @return
-     */
-    Set<String>getByCompositekeys();
-
-    /**
-     * 月粒度 获取计算值
-     * @param params
-     * @return
-     */
-    Double getTRmActValue(HashMap<String,Object> params);
-    /**
-     * 获取实绩产量
-     * @param params
-     * @return
-     */
-    Map<String ,BigDecimal> getOutPut(HashMap<String,Object> params);
-
-    /**
-     * 获取时间内所有Itemid，用于实绩项目月年粒度统计
-     * @param params
-     * @return
-     */
+	 * 计算累计值
+	 *
+	 * @param params <br/>
+	 *               itemid 项目ID <br/>
+	 *               clock 时间头(like clock%)<br/>
+	 *               timegranid 时间粒度
+	 * @return
+	 */
+	Double getSumvalue(HashMap<String, Object> params);
+
+	/**
+	 * 计算累计值2（计算日期小于参数值的累计值）
+	 *
+	 * @param params <br/>
+	 *               itemid 项目ID <br/>
+	 *               clock 小于该时间<br/>
+	 *               ckhead 时间头<br/>
+	 *               timegranid 时间粒度
+	 * @return
+	 */
+	Double getSumvalue2(HashMap<String, Object> params);
+
+	/**
+	 * 根据联合主键获取
+	 *
+	 * @return
+	 */
+	Set<String> getByCompositekeys();
+
+	/**
+	 * 月粒度 获取计算值
+	 *
+	 * @param params
+	 * @return
+	 */
+	Double getTRmActValue(HashMap<String, Object> params);
+
+	/**
+	 * 获取实绩产量
+	 *
+	 * @param params
+	 * @return
+	 */
+	Map<String, BigDecimal> getOutPut(HashMap<String, Object> params);
+
+	/**
+	 * 获取时间内所有Itemid，用于实绩项目月年粒度统计
+	 *
+	 * @param params
+	 * @return
+	 */
 	List<String> selectItemidByClock(HashMap<String, Object> params);
 
 	/**
-     * 获取实绩项目值与数据来源FID（从IF_MES_EMS_SWAPFILE表,status=1的已处理数据）
-     * 
-     * @param params
-     * @return
-     */
+	 * 获取实绩项目值与数据来源FID（从IF_MES_EMS_SWAPFILE表,status=1的已处理数据）
+	 *
+	 * @param params
+	 * @return
+	 */
 	Map<String, Object> getItemval(HashMap<String, Object> delObj);
 
 	/**
-     * 获取计划项目值与数据来源FID（从IF_MES_EMS_PRODUCTORDER表,status=1的已处理数据）
-     * 
-     * @param params
-     * @return
-     */
+	 * 获取计划项目值与数据来源FID（从IF_MES_EMS_PRODUCTORDER表,status=1的已处理数据）
+	 *
+	 * @param params
+	 * @return
+	 */
 	Map<String, Object> getItempval(HashMap<String, Object> delObj);
-	
+
 	/**
-     * 获取实绩项目值与数据来源FID（从IF_MES_EMS_SWAPFILE表）
-     * 
-     * @param params
-     * @return
-     */
+	 * 获取实绩项目值与数据来源FID（从IF_MES_EMS_SWAPFILE表）
+	 *
+	 * @param params
+	 * @return
+	 */
 	Map<String, Object> getAllItemval(HashMap<String, Object> mp);
-	
+
 	/**
-     * 获取计划项目值与数据来源FID（从IF_MES_EMS_PRODUCTORDER表）
-     * 
-     * @param params
-     * @return
-     */
+	 * 获取计划项目值与数据来源FID（从IF_MES_EMS_PRODUCTORDER表）
+	 *
+	 * @param params
+	 * @return
+	 */
 	Map<String, Object> getAllItempval(HashMap<String, Object> mp);
 
 	/**
-     * 获取某工序某时间粒度产品产量
-     * @param params <br/>
-     *  workprocid 工序ID <br/>
-     *  clock 时间 <br/>
-     *  timegranid 时间粒度
-     * @return
-     */
+	 * 获取某工序某时间粒度产品产量
+	 *
+	 * @param params <br/>
+	 *               workprocid 工序ID <br/>
+	 *               clock 时间 <br/>
+	 *               timegranid 时间粒度
+	 * @return
+	 */
 	Double getProductvalue(HashMap<String, Object> params);
 
 	/**
@@ -134,6 +142,12 @@ public interface TRmWorkprocProductValueMapper extends IBaseMapper<TRmWorkprocPr
 	 */
 	List<TRmWorkprocProductValue> getReportValue(HashMap<String, Object> params);
 
+	/**
+	 * 根据原料对应表获取报表数据
+	 * @param params
+	 * @return
+	 */
+	List<TRmWorkprocProductValue> getProductValue(HashMap<String, Object> params);
 	/**
 	 * 盘库消耗查询
 	 */

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.xml

@@ -796,14 +796,38 @@ FROM
   <select id="getReportValue" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,
     CONCAT(PROCEDURE,CONCAT(MATERIAL,'R')) AS ITEMID,
-    WEIGHT AS APPORTVALUE FROM V_INPUTOUTPUT WHERE 1=1
+    WEIGHT AS APPORTVALUE FROM V_INPUTOUTPUT WHERE 1=1 AND MATERIAL LIKE '%CP%' AND WEIGHT IS NOT NULL
     <if test="clock != null and clock != ''">
       AND DATES >= TO_DATE(#{clock}, 'yyyy-MM-dd')
     </if>
-    <if test="clock1 != null and clock1 != ''">
-      AND DATES &lt;= TO_DATE(#{clock1}, 'yyyy-MM-dd')
+    <if test="clocke != null and clocke != ''">
+      AND DATES &lt;= TO_DATE(#{clocke}, 'yyyy-MM-dd')
     </if>
   </select>
+  <!--根据原料对应表，获取报表数据-->
+  <select id="getProductValue" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT * FROM (SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL1 AS ACTUALVALUE,ZH_RCL1 AS APPORTVALUE,'AT3011CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND ZH_RCL1 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL2 AS ACTUALVALUE,ZH_RCL2 AS APPORTVALUE,'AT3012CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND ZH_RCL2 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,KZF_RCL AS ACTUALVALUE,KZF_RCL AS APPORTVALUE,'AT2014CP048R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND KZF_RCL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-W)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JY_CL AS ACTUALVALUE,JY_CL AS APPORTVALUE,'AT2011CP032R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND JY_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,CB_CL AS ACTUALVALUE,CB_CL AS APPORTVALUE,'AT2011CP026R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND CB_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,YS_CL AS ACTUALVALUE,YS_CL AS APPORTVALUE,'AT2009CP022R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND YS_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ES_CL AS ACTUALVALUE,ES_CL AS APPORTVALUE,'AT2010CP022R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND ES_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL_1 AS ACTUALVALUE,RCL_1 AS APPORTVALUE,'AT3001CP053R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RCL_1 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL_2 AS ACTUALVALUE,RCL_2 AS APPORTVALUE,'AT3002CP053R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RCL_2 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL_3 AS ACTUALVALUE,RCL_3 AS APPORTVALUE,'AT3003CP053R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RCL_3 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL_4 AS ACTUALVALUE,RCL_4 AS APPORTVALUE,'AT3004CP053R' AS ITEMID FROM EMS_SCQK_GL WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND RCL_4 IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,(CP_CL1+CP_CL2+CP_CL3+CP_CL4+CP_CL5+CP_CL6+CP_CL7+CP_CL8+CP_CL9+CP_CL10+CP_CL11+CP_CL12+CP_CL13+CP_CL14+CP_CL15) AS ACTUALVALUE,(CP_CL1+CP_CL2+CP_CL3+CP_CL4+CP_CL5+CP_CL6+CP_CL7+CP_CL8+CP_CL9+CP_CL10+CP_CL11+CP_CL12+CP_CL13+CP_CL14+CP_CL15) AS APPORTVALUE,'AT2005CP001R' AS ITEMID  FROM EMS_SCQK_GX WHERE PRO_LINE='1' AND TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,(CP_CL1+CP_CL2+CP_CL3+CP_CL4+CP_CL5+CP_CL6+CP_CL7+CP_CL8+CP_CL9+CP_CL10+CP_CL11+CP_CL12+CP_CL13+CP_CL14+CP_CL15) AS ACTUALVALUE,(CP_CL1+CP_CL2+CP_CL3+CP_CL4+CP_CL5+CP_CL6+CP_CL7+CP_CL8+CP_CL9+CP_CL10+CP_CL11+CP_CL12+CP_CL13+CP_CL14+CP_CL15) AS APPORTVALUE,'AT2006CP001R' AS ITEMID  FROM EMS_SCQK_GX WHERE PRO_LINE='2' AND TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,PGGS AS ACTUALVALUE,PGGS AS APPORTVALUE,'AT3016CP056R' AS ITEMID FROM EMS_SCQK_LG WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND PGGS IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,YXPGS AS ACTUALVALUE,YXPGS AS APPORTVALUE,'AT3016CP058R' AS ITEMID FROM EMS_SCQK_LG WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND PGGS IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,PZGGS AS ACTUALVALUE,PZGGS AS APPORTVALUE,'AT3016CP057R' AS ITEMID FROM EMS_SCQK_LG WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND PGGS IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,PGGP AS ACTUALVALUE,PGGP AS APPORTVALUE,'AT3018CP059R' AS ITEMID FROM EMS_SCQK_LG WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND PGGS IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,PZGGP AS ACTUALVALUE,PZGGP AS APPORTVALUE,'AT3018CP060R' AS ITEMID FROM EMS_SCQK_LG WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND PGGS IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,YXPGP AS ACTUALVALUE,YXPGP AS APPORTVALUE,'AT3018CP003R' AS ITEMID FROM EMS_SCQK_LG WHERE TO_CHAR(DATES,'yyyy-MM-dd')&gt;=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')&lt;=#{clocke,jdbcType=VARCHAR} AND PGGS IS NOT NULL
+    )  WHERE ACTUALVALUE IS NOT NULL AND APPORTVALUE IS NOT NULL
+  </select>
 
   <!--盘库查询-->
   <select id="getpkdata" parameterType="java.util.HashMap" resultType="Map">

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/ITRmWorkprocProductValueService.java

@@ -157,6 +157,13 @@ public interface ITRmWorkprocProductValueService extends IBaseService<TRmWorkpro
      */
     void getReportValue(Date date);
 
+    /**
+     * 根据产品对应表获取报表数据
+     * @param params
+     * @return
+     */
+    void getReportProductValue(HashMap<String, Object> params);
+
     /**
      * 盘库消耗查询
      */

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/impl/TRmWorkprocProductValueServiceImpl.java

@@ -1128,15 +1128,15 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
 		{
 			tRmWorkprocProductValue.setTimegranid("DAY");
 			tRmWorkprocProductValue.setItemtype("R");
-			trmModel= tRmWorkprocProductValueMapper.selectByUPrimaryKey(tRmWorkprocProductValue);
-			if(trmModel==null){
-				//tRmWorkprocMaterialValueMapper.insertSelective(trmWorkprocMaterialValue);
-				continue;
-			}
-			tRmWorkprocProductValue.setCorrectvalue(tRmWorkprocProductValue.getApportvalue().subtract(trmModel.getActualvalue()));
-			tRmWorkprocProductValue.setUpman("系统");
-			tRmWorkprocProductValue.setUptime(new Date());
-			tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue);
+			tRmWorkprocProductValue.setActualvalue(tRmWorkprocProductValue.getApportvalue());
+			tRmWorkprocProductValue.setCorrectvalue(BigDecimal.ZERO);
+			tRmWorkprocProductValue.setBz("系统根据报表数据自动新增");
+			tRmWorkprocProductValue.setUserid("系统");
+			tRmWorkprocProductValue.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+			if(tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue)==0){
+				tRmWorkprocProductValueMapper.insertSelective(tRmWorkprocProductValue);
+			};
+
 		}
 	}
 
@@ -1181,6 +1181,23 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
 		}
 	}
 
+	@Override
+	public void getReportProductValue(HashMap<String, Object> params) {
+		List<TRmWorkprocProductValue> trmlist= tRmWorkprocProductValueMapper.getProductValue(params);
+		for(TRmWorkprocProductValue tRmWorkprocProductValue: trmlist)
+		{
+			tRmWorkprocProductValue.setTimegranid("DAY");
+			tRmWorkprocProductValue.setItemtype("R");
+			tRmWorkprocProductValue.setCorrectvalue(tRmWorkprocProductValue.getApportvalue().subtract(tRmWorkprocProductValue.getActualvalue()));
+			tRmWorkprocProductValue.setBz("计算值是湿基；最终值是干基");
+			tRmWorkprocProductValue.setUserid("系统");
+			tRmWorkprocProductValue.setUpdatetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+			if(tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue)==0){
+				tRmWorkprocProductValueMapper.insertSelective(tRmWorkprocProductValue);
+			};
+		}
+	}
+
 	@Override
 	public PageList<Map<String, Object>> getpkdata(Map<String, Object> parameters) {
 		List<Map<String, Object>> rows = tRmWorkprocProductValueMapper.getpkdata(parameters);

src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -45,7 +45,9 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Service;
 
+import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
@@ -245,6 +247,15 @@ public class SpringCronTask implements SchedulingConfigurer{
 					}
 					tRmWorkprocProductValueService.setDate(new Date()); // 产品实绩产量、产品计划数据维护
 					tRmWorkprocMaterialValueService.setDate(new Date()); // 原材料数据维护
+					 //新的业务逻辑，从报表获取数据。
+					 DateFormat dateForm = new SimpleDateFormat("YYYY-MM-dd");
+					 Calendar calendar=Calendar.getInstance();
+					 calendar.set(Calendar.HOUR_OF_DAY,-24);
+					 HashMap<String,Object> hs =new HashMap<>(4);
+					 hs.put("clock",dateForm.format(calendar.getTime()));
+					 hs.put("clocke",  DateUtils.dateStr(new Date(),"YYYY-MM-dd"));
+					 tRmWorkprocProductValueService.getReportProductValue(hs);
+					 tRmWorkprocMaterialValueService.getMaterialValue(hs);
 					logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
 				}
 				else if (taskId.equalsIgnoreCase("119")) {