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

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

@@ -22,15 +22,19 @@
     <result column="UPDATEMAN" jdbcType="VARCHAR" property="updateman" />
     <result column="UPDATETIME" jdbcType="VARCHAR" property="updatetime" />
     <result column="READTIME" jdbcType="VARCHAR" property="readtime" />
+    <result column="BFSFCL_WATER" jdbcType="DECIMAL" property="bfsfclWater" />
+    <result column="BFSFCL_ZAZHI" jdbcType="DECIMAL" property="bfsfclZazhi" />
+    <result column="BFSFCL_KZ" jdbcType="DECIMAL" property="bfsfclKz" />
   </resultMap>
   <sql id="columns">
     GBSJ, CINVCCODE, CINVCODE, CINVSTD, CWHCODE, TAB, DJLX, PZDL, PLACE, CINVCNAME, CINVNAME,
-    CWHNAME, MZ, PZ, JZ, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME
+    CWHNAME, MZ, PZ, JZ, CREATEMAN, CREATETIME, UPDATEMAN, UPDATETIME, READTIME, BFSFCL_WATER,
+    BFSFCL_ZAZHI, BFSFCL_KZ
   </sql>
   <sql id="columns_alias">
     t.GBSJ, t.CINVCCODE, t.CINVCODE, t.CINVSTD, t.CWHCODE, t.TAB, t.DJLX, t.PZDL, t.PLACE,
     t.CINVCNAME, t.CINVNAME, t.CWHNAME, t.MZ, t.PZ, t.JZ, t.CREATEMAN, t.CREATETIME,
-    t.UPDATEMAN, t.UPDATETIME, t.READTIME
+    t.UPDATEMAN, t.UPDATETIME, t.READTIME, t.BFSFCL_WATER, t.BFSFCL_ZAZHI, t.BFSFCL_KZ
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM DZ_MATERIAL_SF
@@ -100,6 +104,15 @@
       <if test="readtime != null and readtime != ''">
         and READTIME = #{readtime}
       </if>
+      <if test="bfsfclWater != null">
+        and BFSFCL_WATER = #{bfsfclWater}
+      </if>
+      <if test="bfsfclZazhi != null">
+        and BFSFCL_ZAZHI = #{bfsfclZazhi}
+      </if>
+      <if test="bfsfclKz != null">
+        and BFSFCL_KZ = #{bfsfclKz}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -164,6 +177,15 @@
       <if test="readtime != null and readtime != ''">
         and READTIME LIKE '%${readtime}%'
       </if>
+      <if test="bfsfclWater != null">
+        and BFSFCL_WATER = #{bfsfclWater}
+      </if>
+      <if test="bfsfclZazhi != null">
+        and BFSFCL_ZAZHI = #{bfsfclZazhi}
+      </if>
+      <if test="bfsfclKz != null">
+        and BFSFCL_KZ = #{bfsfclKz}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="map">
@@ -238,6 +260,15 @@
     <if test="readtime != null and readtime != ''">
       or READTIME = #{readtime}
     </if>
+    <if test="bfsfclWater != null">
+      or BFSFCL_WATER = #{bfsfclWater}
+    </if>
+    <if test="bfsfclZazhi != null">
+      or BFSFCL_ZAZHI = #{bfsfclZazhi}
+    </if>
+    <if test="bfsfclKz != null">
+      or BFSFCL_KZ = #{bfsfclKz}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
     insert into DZ_MATERIAL_SF (GBSJ, CINVCCODE, CINVCODE,
@@ -246,14 +277,16 @@
     CINVCNAME, CINVNAME, CWHNAME,
     MZ, PZ, JZ, CREATEMAN,
     CREATETIME, UPDATEMAN, UPDATETIME,
-    READTIME)
+    READTIME, BFSFCL_WATER, BFSFCL_ZAZHI,
+    BFSFCL_KZ)
     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})
+    #{readtime,jdbcType=VARCHAR}, #{bfsfclWater,jdbcType=DECIMAL}, #{bfsfclZazhi,jdbcType=DECIMAL},
+    #{bfsfclKz,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
     insert into DZ_MATERIAL_SF
@@ -318,6 +351,15 @@
       <if test="readtime != null">
         READTIME,
       </if>
+      <if test="bfsfclWater != null">
+        BFSFCL_WATER,
+      </if>
+      <if test="bfsfclZazhi != null">
+        BFSFCL_ZAZHI,
+      </if>
+      <if test="bfsfclKz != null">
+        BFSFCL_KZ,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="gbsj != null">
@@ -380,6 +422,15 @@
       <if test="readtime != null">
         #{readtime,jdbcType=VARCHAR},
       </if>
+      <if test="bfsfclWater != null">
+        #{bfsfclWater,jdbcType=DECIMAL},
+      </if>
+      <if test="bfsfclZazhi != null">
+        #{bfsfclZazhi,jdbcType=DECIMAL},
+      </if>
+      <if test="bfsfclKz != null">
+        #{bfsfclKz,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.dzmaterialsf.model.DzMaterialSf">
@@ -394,7 +445,10 @@
     CREATETIME = #{createtime,jdbcType=VARCHAR},
     UPDATEMAN = #{updateman,jdbcType=VARCHAR},
     UPDATETIME = #{updatetime,jdbcType=VARCHAR},
-    READTIME = #{readtime,jdbcType=VARCHAR}
+    READTIME = #{readtime,jdbcType=VARCHAR},
+    BFSFCL_WATER = #{bfsfclWater,jdbcType=DECIMAL},
+    BFSFCL_ZAZHI = #{bfsfclZazhi,jdbcType=DECIMAL},
+    BFSFCL_KZ = #{bfsfclKz,jdbcType=DECIMAL}
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
     and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
     and CINVCODE = #{cinvcode,jdbcType=VARCHAR}
@@ -441,6 +495,15 @@
       <if test="readtime != null">
         READTIME = #{readtime,jdbcType=VARCHAR},
       </if>
+      <if test="bfsfclWater != null">
+        BFSFCL_WATER = #{bfsfclWater,jdbcType=DECIMAL},
+      </if>
+      <if test="bfsfclZazhi != null">
+        BFSFCL_ZAZHI = #{bfsfclZazhi,jdbcType=DECIMAL},
+      </if>
+      <if test="bfsfclKz != null">
+        BFSFCL_KZ = #{bfsfclKz,jdbcType=DECIMAL},
+      </if>
     </set>
     where GBSJ = #{gbsj,jdbcType=VARCHAR}
     and CINVCCODE = #{cinvccode,jdbcType=VARCHAR}
@@ -481,7 +544,8 @@
     CINVNAME, CWHNAME, MZ,
     PZ, JZ, CREATEMAN,
     CREATETIME, UPDATEMAN, UPDATETIME,
-    READTIME)
+    READTIME, BFSFCL_WATER, BFSFCL_ZAZHI,
+    BFSFCL_KZ)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.gbsj,jdbcType=VARCHAR},
@@ -491,7 +555,8 @@
     #{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
+    #{item.readtime,jdbcType=VARCHAR}, #{item.bfsfclWater,jdbcType=DECIMAL}, #{item.bfsfclZazhi,jdbcType=DECIMAL},
+    #{item.bfsfclKz,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -577,6 +642,18 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
       when #{item.gbsj,jdbcType=VARCHAR} then #{item.readtime,jdbcType=VARCHAR}
     </foreach>
+    ,BFSFCL_WATER=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.bfsfclWater,jdbcType=DECIMAL}
+    </foreach>
+    ,BFSFCL_ZAZHI=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.bfsfclZazhi,jdbcType=DECIMAL}
+    </foreach>
+    ,BFSFCL_KZ=
+    <foreach collection="list" item="item" index="index" separator=" " open="case GBSJ" close="end">
+      when #{item.gbsj,jdbcType=VARCHAR} then #{item.bfsfclKz,jdbcType=DECIMAL}
+    </foreach>
     where (GBSJ,CINVCCODE,CINVCODE,CINVSTD,CWHCODE,TAB,DJLX,PZDL,PLACE) in
     <foreach collection="list" item="item" open="(" close=")" separator=",">
       (#{item.gbsj, jdbcType=VARCHAR},#{item.cinvccode, jdbcType=VARCHAR},#{item.cinvcode, jdbcType=VARCHAR},#{item.cinvstd, jdbcType=VARCHAR},#{item.cwhcode, jdbcType=VARCHAR},#{item.tab, jdbcType=VARCHAR},#{item.djlx, jdbcType=VARCHAR},#{item.pzdl, jdbcType=VARCHAR},#{item.place, jdbcType=VARCHAR})

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

@@ -129,6 +129,24 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
     @ApiModelProperty(value="读取时间",required=false)
     private String readtime;
 
+    /**
+     * 扣水(BFSFCL_WATER,DECIMAL,20)
+     */
+    @ApiModelProperty(value="扣水",required=false)
+    private BigDecimal bfsfclWater;
+
+    /**
+     * 杂质(BFSFCL_ZAZHI,DECIMAL,20)
+     */
+    @ApiModelProperty(value="杂质",required=false)
+    private BigDecimal bfsfclZazhi;
+
+    /**
+     * 扣杂(BFSFCL_KZ,DECIMAL,20)
+     */
+    @ApiModelProperty(value="扣杂",required=false)
+    private BigDecimal bfsfclKz;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -319,6 +337,30 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
         this.readtime = readtime == null ? null : readtime.trim();
     }
 
+    public BigDecimal getBfsfclWater() {
+        return bfsfclWater;
+    }
+
+    public void setBfsfclWater(BigDecimal bfsfclWater) {
+        this.bfsfclWater = bfsfclWater;
+    }
+
+    public BigDecimal getBfsfclZazhi() {
+        return bfsfclZazhi;
+    }
+
+    public void setBfsfclZazhi(BigDecimal bfsfclZazhi) {
+        this.bfsfclZazhi = bfsfclZazhi;
+    }
+
+    public BigDecimal getBfsfclKz() {
+        return bfsfclKz;
+    }
+
+    public void setBfsfclKz(BigDecimal bfsfclKz) {
+        this.bfsfclKz = bfsfclKz;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -345,6 +387,9 @@ public class DzMaterialSf implements ICBasePO<DzMaterialSf> {
         sb.append(", updateman=").append(updateman);
         sb.append(", updatetime=").append(updatetime);
         sb.append(", readtime=").append(readtime);
+        sb.append(", bfsfclWater=").append(bfsfclWater);
+        sb.append(", bfsfclZazhi=").append(bfsfclZazhi);
+        sb.append(", bfsfclKz=").append(bfsfclKz);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/ftp/uploadfile/mapper/UploadFileMapper.xml

@@ -12,14 +12,16 @@
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
     <result column="UPDATE_MAN" jdbcType="VARCHAR" property="updateMan" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="EXPLAIN" jdbcType="VARCHAR" property="explain" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
   </resultMap>
   <sql id="columns">
     ID, FILE_NAME, FILE_URL, TYPE, UPLOAD_TIME, CREATE_MAN, CREATE_TIME, UPDATE_MAN, 
-    UPDATE_TIME, FILE_TYPE
+    UPDATE_TIME, FILE_TYPE,EXPLAIN,MEMO
   </sql>
   <sql id="columns_alias">
     t.ID, t.FILE_NAME, t.FILE_URL, t.TYPE, t.UPLOAD_TIME, t.CREATE_MAN, t.CREATE_TIME, 
-    t.UPDATE_MAN, t.UPDATE_TIME, t.FILE_TYPE
+    t.UPDATE_MAN, t.UPDATE_TIME, t.FILE_TYPE,t.EXPLAIN,t.MEMO
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM UPLOAD_FILE
@@ -59,6 +61,12 @@
       <if test="fileType != null and fileType != ''">
         and FILE_TYPE = #{fileType}
       </if>
+      <if test="explain != null and explain != ''">
+        and EXPLAIN = #{explain}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -100,6 +108,12 @@
 <!--        OR FILE_TYPE = ''-->
         AND REGEXP_LIKE(FILE_TYPE,'(${fileType})')
       </if>
+      <if test="explain != null and explain != ''">
+        and EXPLAIN LIKE '%${explain}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -133,16 +147,22 @@
       <if test="updateTime != null">
         or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
       </if>
+      <if test="explain != null and explain != ''">
+        or EXPLAIN = #{explain}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.ftp.uploadfile.model.UploadFile">
     insert into UPLOAD_FILE (ID, FILE_NAME, FILE_URL, 
       TYPE, UPLOAD_TIME, CREATE_MAN, 
-      CREATE_TIME, UPDATE_MAN, UPDATE_TIME,FILE_TYPE
+      CREATE_TIME, UPDATE_MAN, UPDATE_TIME,FILE_TYPE,EXPLAIN,MEMO
       )
     values (#{id,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{fileUrl,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{uploadTime,jdbcType=TIMESTAMP}, #{createMan,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateMan,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-      #{fileType,jdbcType=VARCHAR}
+      #{fileType,jdbcType=VARCHAR},#{explain,jdbcType=VARCHAR},#{memo,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ftp.uploadfile.model.UploadFile">
@@ -178,6 +198,12 @@
       <if test="updateTime != null">
         UPDATE_TIME,
       </if>
+      <if test="explain != null">
+        EXPLAIN,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -210,6 +236,12 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="explain != null">
+        #{explain,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ftp.uploadfile.model.UploadFile">
@@ -221,7 +253,9 @@
       CREATE_MAN = #{createMan,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       UPDATE_MAN = #{updateMan,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+    EXPLAIN = #{explain,jdbcType=VARCHAR},
+    MEMO = #{memo,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ftp.uploadfile.model.UploadFile">
@@ -254,6 +288,12 @@
       <if test="fileType != null">
         FILE_TYPE = #{fileType,jdbcType=VARCHAR},
       </if>
+      <if test="explain != null">
+        EXPLAIN = #{explain,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
     </set>
     where ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -275,13 +315,13 @@
       (ID, 
       FILE_NAME, FILE_URL, TYPE, 
       UPLOAD_TIME, CREATE_MAN, CREATE_TIME, 
-      UPDATE_MAN, UPDATE_TIME)
+      UPDATE_MAN, UPDATE_TIME, EXPLAIN,MEMO)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.id,jdbcType=VARCHAR}, 
       #{item.fileName,jdbcType=VARCHAR}, #{item.fileUrl,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, 
       #{item.uploadTime,jdbcType=TIMESTAMP}, #{item.createMan,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateMan,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP} from dual  
+      #{item.updateMan,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.explain,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -323,6 +363,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
           when #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
        </foreach>
+    ,EXPLAIN=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+      when #{item.id,jdbcType=VARCHAR} then #{item.explain,jdbcType=VARCHAR}
+    </foreach>
+    ,MEMO=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+      when #{item.id,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+    </foreach>
      where ID in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.id,jdbcType=VARCHAR}

src/main/java/com/steerinfo/ftp/uploadfile/model/UploadFile.java

@@ -71,6 +71,17 @@ public class UploadFile implements IBasePO<String>, TreePO<String, String, Uploa
     @ApiModelProperty(value="修改时间",required=false)
     private Date updateTime;
 
+    /**
+     * 应急物资说明(EXPLAIN,VARCHAR,255)
+     */
+    @ApiModelProperty(value="应急物资说明",required=false)
+    private String explain;
+    /**
+     * 备注(MEMO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
     private transient MultipartFile multipartFile;
 
     public MultipartFile getMultipartFile() {
@@ -187,6 +198,22 @@ public class UploadFile implements IBasePO<String>, TreePO<String, String, Uploa
         this.updateTime = updateTime;
     }
 
+    public String getExplain() {
+        return explain;
+    }
+
+    public void setExplain(String explain) {
+        this.explain = explain;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -203,6 +230,8 @@ public class UploadFile implements IBasePO<String>, TreePO<String, String, Uploa
         sb.append(", createTime=").append(createTime);
         sb.append(", updateMan=").append(updateMan);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", explain=").append(explain);
+        sb.append(", memo=").append(memo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -5,9 +5,7 @@ import com.steerinfo.ems.bfhyd.service.IBfhydService;
 import com.steerinfo.ems.dzmaterialsf.service.IDzMaterialSfService;
 import com.steerinfo.ems.emsetiming.service.IEmsETimingService;
 import com.steerinfo.ems.emsgmpcjh.service.IEmsGmPcJhService;
-import com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight;
 import com.steerinfo.ems.emsprodplanroundweight.service.IEmsProdplanRoundWeightService;
-import com.steerinfo.ems.emsprodplanroundweight.service.impl.EmsProdplanRoundWeightServiceImpl;
 import com.steerinfo.ems.emsscqklg.service.IEmsScqkLgService;
 import com.steerinfo.ems.emsscqklg.service.ILgRealService;
 import com.steerinfo.ems.emswaterrealtime.service.IEmsWaterRealtimeService;
@@ -258,12 +256,15 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 DateFormat dateForm = new SimpleDateFormat("YYYY-MM-dd");
 					 Calendar calendar=Calendar.getInstance();
 					 calendar.set(Calendar.HOUR_OF_DAY,-24*7);
-					 HashMap<String,Object> hs =new HashMap<>(4);
+					 HashMap<String,Object> hs =new HashMap<>(8);
 					 hs.put("clock",dateForm.format(calendar.getTime()));
 					 calendar.set(Calendar.HOUR_OF_DAY,24*6);
 					 hs.put("clocke", dateForm.format(calendar.getTime()));
 					 tRmWorkprocProductValueService.getReportProductValue(hs);
 					 tRmWorkprocMaterialValueService.getMaterialValue(hs);
+					 //根据报表中的产量数据生成
+					 hs.put("useflag", "1");
+					 tRmWorkprocProductValueService.getReportValue(hs);
 					logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
 				}
 				else if (taskId.equalsIgnoreCase("119")) {