高线增加备注

src/main/java/com/steerinfo/ems/emsprodplanroundweight/mapper/EmsProdplanRoundWeightMapper.xml

@@ -1,264 +1,266 @@
-<?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.emsprodplanroundweight.mapper.EmsProdplanRoundWeightMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
-    <id column="FID" jdbcType="VARCHAR" property="fid" />
-    <result column="PRODATE" jdbcType="VARCHAR" property="prodate" />
-    <result column="MATERIALCODE" jdbcType="VARCHAR" property="materialcode" />
-    <result column="MATERIALNAME" jdbcType="VARCHAR" property="materialname" />
-    <result column="QTY" jdbcType="DECIMAL" property="qty" />
-    <result column="UNIT" jdbcType="VARCHAR" property="unit" />
-    <result column="LC_ID" jdbcType="VARCHAR" property="lcId" />
-  </resultMap>
-  <sql id="columns">
-    FID, PRODATE, MATERIALCODE, MATERIALNAME, QTY, UNIT, LC_ID
-  </sql>
-  <sql id="columns_alias">
-    t.FID, t.PRODATE, t.MATERIALCODE, t.MATERIALNAME, t.QTY, t.UNIT, t.LC_ID
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM EMS_PRODPLAN_ROUND_WEIGHT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM EMS_PRODPLAN_ROUND_WEIGHT t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="fid != null and fid != ''">
-        and FID = #{fid}
-      </if>
-      <if test="prodate != null and prodate != ''">
-        and PRODATE = #{prodate}
-      </if>
-      <if test="materialcode != null and materialcode != ''">
-        and MATERIALCODE = #{materialcode}
-      </if>
-      <if test="materialname != null and materialname != ''">
-        and MATERIALNAME = #{materialname}
-      </if>
-      <if test="qty != null">
-        and QTY = #{qty}
-      </if>
-      <if test="unit != null and unit != ''">
-        and UNIT = #{unit}
-      </if>
-      <if test="lcId != null and lcId != ''">
-        and LC_ID = #{lcId}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="fid != null and fid != ''">
-        and FID LIKE '%${fid}%'
-      </if>
-      <if test="prodate != null and prodate != ''">
-        and PRODATE LIKE '%${prodate}%'
-      </if>
-      <if test="materialcode != null and materialcode != ''">
-        and MATERIALCODE LIKE '%${materialcode}%'
-      </if>
-      <if test="materialname != null and materialname != ''">
-        and MATERIALNAME LIKE '%${materialname}%'
-      </if>
-      <if test="qty != null">
-        and QTY = #{qty}
-      </if>
-      <if test="unit != null and unit != ''">
-        and UNIT LIKE '%${unit}%'
-      </if>
-      <if test="lcId != null and lcId != ''">
-        and LC_ID LIKE '%${lcId}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from EMS_PRODPLAN_ROUND_WEIGHT
-    where FID = #{fid,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from EMS_PRODPLAN_ROUND_WEIGHT
-    where 1!=1 
-      <if test="prodate != null and prodate != ''">
-        or PRODATE = #{prodate}
-      </if>
-      <if test="materialcode != null and materialcode != ''">
-        or MATERIALCODE = #{materialcode}
-      </if>
-      <if test="materialname != null and materialname != ''">
-        or MATERIALNAME = #{materialname}
-      </if>
-      <if test="qty != null">
-        or QTY = #{qty}
-      </if>
-      <if test="unit != null and unit != ''">
-        or UNIT = #{unit}
-      </if>
-      <if test="lcId != null and lcId != ''">
-        or LC_ID = #{lcId}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
-    insert into EMS_PRODPLAN_ROUND_WEIGHT (FID, PRODATE, MATERIALCODE, 
-      MATERIALNAME, QTY, UNIT, 
-      LC_ID)
-    values (#{fid,jdbcType=VARCHAR}, #{prodate,jdbcType=VARCHAR}, #{materialcode,jdbcType=VARCHAR}, 
-      #{materialname,jdbcType=VARCHAR}, #{qty,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR}, 
-      #{lcId,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
-    insert into EMS_PRODPLAN_ROUND_WEIGHT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="fid != null">
-        FID,
-      </if>
-      <if test="prodate != null">
-        PRODATE,
-      </if>
-      <if test="materialcode != null">
-        MATERIALCODE,
-      </if>
-      <if test="materialname != null">
-        MATERIALNAME,
-      </if>
-      <if test="qty != null">
-        QTY,
-      </if>
-      <if test="unit != null">
-        UNIT,
-      </if>
-      <if test="lcId != null">
-        LC_ID,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="fid != null">
-        #{fid,jdbcType=VARCHAR},
-      </if>
-      <if test="prodate != null">
-        #{prodate,jdbcType=VARCHAR},
-      </if>
-      <if test="materialcode != null">
-        #{materialcode,jdbcType=VARCHAR},
-      </if>
-      <if test="materialname != null">
-        #{materialname,jdbcType=VARCHAR},
-      </if>
-      <if test="qty != null">
-        #{qty,jdbcType=DECIMAL},
-      </if>
-      <if test="unit != null">
-        #{unit,jdbcType=VARCHAR},
-      </if>
-      <if test="lcId != null">
-        #{lcId,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
-    update EMS_PRODPLAN_ROUND_WEIGHT
-    set PRODATE = #{prodate,jdbcType=VARCHAR},
-      MATERIALCODE = #{materialcode,jdbcType=VARCHAR},
-      MATERIALNAME = #{materialname,jdbcType=VARCHAR},
-      QTY = #{qty,jdbcType=DECIMAL},
-      UNIT = #{unit,jdbcType=VARCHAR},
-      LC_ID = #{lcId,jdbcType=VARCHAR}
-    where FID = #{fid,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
-    update EMS_PRODPLAN_ROUND_WEIGHT
-    <set>
-      <if test="prodate != null">
-        PRODATE = #{prodate,jdbcType=VARCHAR},
-      </if>
-      <if test="materialcode != null">
-        MATERIALCODE = #{materialcode,jdbcType=VARCHAR},
-      </if>
-      <if test="materialname != null">
-        MATERIALNAME = #{materialname,jdbcType=VARCHAR},
-      </if>
-      <if test="qty != null">
-        QTY = #{qty,jdbcType=DECIMAL},
-      </if>
-      <if test="unit != null">
-        UNIT = #{unit,jdbcType=VARCHAR},
-      </if>
-      <if test="lcId != null">
-        LC_ID = #{lcId,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where FID = #{fid,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where FID = #{fid,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_PRODPLAN_ROUND_WEIGHT 
-      (FID, 
-      PRODATE, MATERIALCODE, MATERIALNAME, 
-      QTY, UNIT, LC_ID
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.fid,jdbcType=VARCHAR}, 
-      #{item.prodate,jdbcType=VARCHAR}, #{item.materialcode,jdbcType=VARCHAR}, #{item.materialname,jdbcType=VARCHAR}, 
-      #{item.qty,jdbcType=DECIMAL}, #{item.unit,jdbcType=VARCHAR}, #{item.lcId,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update EMS_PRODPLAN_ROUND_WEIGHT
-     set
-       FID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.fid,jdbcType=VARCHAR}
-       </foreach>
-       ,PRODATE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.prodate,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIALCODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.materialcode,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIALNAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.materialname,jdbcType=VARCHAR}
-       </foreach>
-       ,QTY=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.qty,jdbcType=DECIMAL}
-       </foreach>
-       ,UNIT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.unit,jdbcType=VARCHAR}
-       </foreach>
-       ,LC_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
-          when #{item.fid,jdbcType=VARCHAR} then #{item.lcId,jdbcType=VARCHAR}
-       </foreach>
-     where FID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.fid,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from EMS_PRODPLAN_ROUND_WEIGHT
-    where FID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-</mapper>
+<?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.emsprodplanroundweight.mapper.EmsProdplanRoundWeightMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
+    <id column="FID" jdbcType="VARCHAR" property="fid" />
+    <result column="PRODATE" jdbcType="VARCHAR" property="prodate" />
+    <result column="MATERIALCODE" jdbcType="VARCHAR" property="materialcode" />
+    <result column="MATERIALNAME" jdbcType="VARCHAR" property="materialname" />
+    <result column="QTY" jdbcType="DECIMAL" property="qty" />
+    <result column="UNIT" jdbcType="VARCHAR" property="unit" />
+    <result column="LC_ID" jdbcType="VARCHAR" property="lcId" />
+  </resultMap>
+  <sql id="columns">
+    FID, PRODATE, MATERIALCODE, MATERIALNAME, QTY, UNIT, LC_ID
+  </sql>
+  <sql id="columns_alias">
+    t.FID, t.PRODATE, t.MATERIALCODE, t.MATERIALNAME, t.QTY, t.UNIT, t.LC_ID
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM EMS_PRODPLAN_ROUND_WEIGHT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM EMS_PRODPLAN_ROUND_WEIGHT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="fid != null and fid != ''">
+        and FID = #{fid}
+      </if>
+      <if test="prodate != null and prodate != ''">
+        and PRODATE = #{prodate}
+      </if>
+      <if test="materialcode != null and materialcode != ''">
+        and MATERIALCODE = #{materialcode}
+      </if>
+      <if test="materialname != null and materialname != ''">
+        and MATERIALNAME = #{materialname}
+      </if>
+      <if test="qty != null">
+        and QTY = #{qty}
+      </if>
+      <if test="unit != null and unit != ''">
+        and UNIT = #{unit}
+      </if>
+      <if test="lcId != null and lcId != ''">
+        and LC_ID = #{lcId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="fid != null and fid != ''">
+        and FID LIKE '%${fid}%'
+      </if>
+      <if test="prodate != null and prodate != ''">
+        and PRODATE LIKE '%${prodate}%'
+      </if>
+      <if test="materialcode != null and materialcode != ''">
+        and MATERIALCODE LIKE '%${materialcode}%'
+      </if>
+      <if test="materialname != null and materialname != ''">
+        and MATERIALNAME LIKE '%${materialname}%'
+      </if>
+      <if test="qty != null">
+        and QTY = #{qty}
+      </if>
+      <if test="unit != null and unit != ''">
+        and UNIT LIKE '%${unit}%'
+      </if>
+      <if test="lcId != null and lcId != ''">
+        and LC_ID LIKE '%${lcId}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from EMS_PRODPLAN_ROUND_WEIGHT
+    where FID = #{fid,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from EMS_PRODPLAN_ROUND_WEIGHT
+    where 1!=1 
+      <if test="prodate != null and prodate != ''">
+        or PRODATE = #{prodate}
+      </if>
+      <if test="materialcode != null and materialcode != ''">
+        or MATERIALCODE = #{materialcode}
+      </if>
+      <if test="materialname != null and materialname != ''">
+        or MATERIALNAME = #{materialname}
+      </if>
+      <if test="qty != null">
+        or QTY = #{qty}
+      </if>
+      <if test="unit != null and unit != ''">
+        or UNIT = #{unit}
+      </if>
+      <if test="lcId != null and lcId != ''">
+        or LC_ID = #{lcId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
+    insert into EMS_PRODPLAN_ROUND_WEIGHT (FID, PRODATE, MATERIALCODE,
+      MATERIALNAME, QTY, UNIT,LC_ID,REMARK)
+    values (#{fid,jdbcType=VARCHAR}, #{prodate,jdbcType=VARCHAR}, #{materialcode,jdbcType=VARCHAR},
+      #{materialname,jdbcType=VARCHAR}, #{qty,jdbcType=DECIMAL}, #{unit,jdbcType=VARCHAR},
+      #{lcId,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
+    insert into EMS_PRODPLAN_ROUND_WEIGHT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fid != null">
+        FID,
+      </if>
+      <if test="prodate != null">
+        PRODATE,
+      </if>
+      <if test="materialcode != null">
+        MATERIALCODE,
+      </if>
+      <if test="materialname != null">
+        MATERIALNAME,
+      </if>
+      <if test="qty != null">
+        QTY,
+      </if>
+      <if test="unit != null">
+        UNIT,
+      </if>
+      <if test="lcId != null">
+        LC_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fid != null">
+        #{fid,jdbcType=VARCHAR},
+      </if>
+      <if test="prodate != null">
+        #{prodate,jdbcType=VARCHAR},
+      </if>
+      <if test="materialcode != null">
+        #{materialcode,jdbcType=VARCHAR},
+      </if>
+      <if test="materialname != null">
+        #{materialname,jdbcType=VARCHAR},
+      </if>
+      <if test="qty != null">
+        #{qty,jdbcType=DECIMAL},
+      </if>
+      <if test="unit != null">
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="lcId != null">
+        #{lcId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
+    update EMS_PRODPLAN_ROUND_WEIGHT
+    set PRODATE = #{prodate,jdbcType=VARCHAR},
+      MATERIALCODE = #{materialcode,jdbcType=VARCHAR},
+      MATERIALNAME = #{materialname,jdbcType=VARCHAR},
+      QTY = #{qty,jdbcType=DECIMAL},
+      UNIT = #{unit,jdbcType=VARCHAR},
+      LC_ID = #{lcId,jdbcType=VARCHAR}
+    where FID = #{fid,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.ems.emsprodplanroundweight.model.EmsProdplanRoundWeight">
+    update EMS_PRODPLAN_ROUND_WEIGHT
+    <set>
+      <if test="prodate != null">
+        PRODATE = #{prodate,jdbcType=VARCHAR},
+      </if>
+      <if test="materialcode != null">
+        MATERIALCODE = #{materialcode,jdbcType=VARCHAR},
+      </if>
+      <if test="materialname != null">
+        MATERIALNAME = #{materialname,jdbcType=VARCHAR},
+      </if>
+      <if test="qty != null">
+        QTY = #{qty,jdbcType=DECIMAL},
+      </if>
+      <if test="unit != null">
+        UNIT = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="lcId != null">
+        LC_ID = #{lcId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        REMARK = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where FID = #{fid,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where FID = #{fid,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_PRODPLAN_ROUND_WEIGHT 
+      (FID, 
+      PRODATE, MATERIALCODE, MATERIALNAME, 
+      QTY, UNIT, LC_ID
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.fid,jdbcType=VARCHAR}, 
+      #{item.prodate,jdbcType=VARCHAR}, #{item.materialcode,jdbcType=VARCHAR}, #{item.materialname,jdbcType=VARCHAR}, 
+      #{item.qty,jdbcType=DECIMAL}, #{item.unit,jdbcType=VARCHAR}, #{item.lcId,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update EMS_PRODPLAN_ROUND_WEIGHT
+     set
+       FID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.fid,jdbcType=VARCHAR}
+       </foreach>
+       ,PRODATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.prodate,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIALCODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.materialcode,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIALNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.materialname,jdbcType=VARCHAR}
+       </foreach>
+       ,QTY=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.qty,jdbcType=DECIMAL}
+       </foreach>
+       ,UNIT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.unit,jdbcType=VARCHAR}
+       </foreach>
+       ,LC_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FID" close="end">
+          when #{item.fid,jdbcType=VARCHAR} then #{item.lcId,jdbcType=VARCHAR}
+       </foreach>
+     where FID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.fid,jdbcType=VARCHAR}
+     </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from EMS_PRODPLAN_ROUND_WEIGHT
+    where FID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+</mapper>

src/main/java/com/steerinfo/ems/emsprodplanroundweight/model/EmsProdplanRoundWeight.java

@@ -1,138 +1,149 @@
-package com.steerinfo.ems.emsprodplanroundweight.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-@ApiModel(value="null")
-public class EmsProdplanRoundWeight implements IBasePO<String> {
-    /**
-     * ID(FID,VARCHAR,100)
-     */
-    @ApiModelProperty(value="ID",required=true)
-    private String fid;
-
-    /**
-     * 时间(PRODATE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="时间",required=false)
-    private String prodate;
-
-    /**
-     * 物料编码(MATERIALCODE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="物料编码",required=false)
-    private String materialcode;
-
-    /**
-     * 物料名称(MATERIALNAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="物料名称",required=false)
-    private String materialname;
-
-    /**
-     * 完工量(QTY,DECIMAL,0)
-     */
-    @ApiModelProperty(value="完工量",required=false)
-    private BigDecimal qty;
-
-    /**
-     * 单位(UNIT,VARCHAR,2)
-     */
-    @ApiModelProperty(value="单位",required=false)
-    private String unit;
-
-    /**
-     * 轮次id(LC_ID,VARCHAR,100)
-     */
-    @ApiModelProperty(value="轮次id",required=false)
-    private String lcId;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.fid;
-    }
-
-    @Override
-    public void setId(String fid) {
-        this.fid = fid == null ? null : fid.trim();
-    }
-
-    public String getFid() {
-        return fid;
-    }
-
-    public void setFid(String fid) {
-        this.fid = fid == null ? null : fid.trim();
-    }
-
-    public String getProdate() {
-        return prodate;
-    }
-
-    public void setProdate(String prodate) {
-        this.prodate = prodate == null ? null : prodate.trim();
-    }
-
-    public String getMaterialcode() {
-        return materialcode;
-    }
-
-    public void setMaterialcode(String materialcode) {
-        this.materialcode = materialcode == null ? null : materialcode.trim();
-    }
-
-    public String getMaterialname() {
-        return materialname;
-    }
-
-    public void setMaterialname(String materialname) {
-        this.materialname = materialname == null ? null : materialname.trim();
-    }
-
-    public BigDecimal getQty() {
-        return qty;
-    }
-
-    public void setQty(BigDecimal qty) {
-        this.qty = qty;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit == null ? null : unit.trim();
-    }
-
-    public String getLcId() {
-        return lcId;
-    }
-
-    public void setLcId(String lcId) {
-        this.lcId = lcId == null ? null : lcId.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", fid=").append(fid);
-        sb.append(", prodate=").append(prodate);
-        sb.append(", materialcode=").append(materialcode);
-        sb.append(", materialname=").append(materialname);
-        sb.append(", qty=").append(qty);
-        sb.append(", unit=").append(unit);
-        sb.append(", lcId=").append(lcId);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
+package com.steerinfo.ems.emsprodplanroundweight.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="null")
+public class EmsProdplanRoundWeight implements IBasePO<String> {
+    /**
+     * ID(FID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="ID",required=true)
+    private String fid;
+
+    /**
+     * 时间(PRODATE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="时间",required=false)
+    private String prodate;
+
+    /**
+     * 物料编码(MATERIALCODE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物料编码",required=false)
+    private String materialcode;
+
+    /**
+     * 物料名称(MATERIALNAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String materialname;
+
+    /**
+     * 完工量(QTY,DECIMAL,0)
+     */
+    @ApiModelProperty(value="完工量",required=false)
+    private BigDecimal qty;
+
+    /**
+     * 单位(UNIT,VARCHAR,2)
+     */
+    @ApiModelProperty(value="单位",required=false)
+    private String unit;
+
+    /**
+     * 轮次id(LC_ID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="轮次id",required=false)
+    private String lcId;
+
+    @ApiModelProperty(value="备注",required=false)
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.fid;
+    }
+
+    @Override
+    public void setId(String fid) {
+        this.fid = fid == null ? null : fid.trim();
+    }
+
+    public String getFid() {
+        return fid;
+    }
+
+    public void setFid(String fid) {
+        this.fid = fid == null ? null : fid.trim();
+    }
+
+    public String getProdate() {
+        return prodate;
+    }
+
+    public void setProdate(String prodate) {
+        this.prodate = prodate == null ? null : prodate.trim();
+    }
+
+    public String getMaterialcode() {
+        return materialcode;
+    }
+
+    public void setMaterialcode(String materialcode) {
+        this.materialcode = materialcode == null ? null : materialcode.trim();
+    }
+
+    public String getMaterialname() {
+        return materialname;
+    }
+
+    public void setMaterialname(String materialname) {
+        this.materialname = materialname == null ? null : materialname.trim();
+    }
+
+    public BigDecimal getQty() {
+        return qty;
+    }
+
+    public void setQty(BigDecimal qty) {
+        this.qty = qty;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    public String getLcId() {
+        return lcId;
+    }
+
+    public void setLcId(String lcId) {
+        this.lcId = lcId == null ? null : lcId.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", fid=").append(fid);
+        sb.append(", prodate=").append(prodate);
+        sb.append(", materialcode=").append(materialcode);
+        sb.append(", materialname=").append(materialname);
+        sb.append(", qty=").append(qty);
+        sb.append(", unit=").append(unit);
+        sb.append(", lcId=").append(lcId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
 }

src/main/java/com/steerinfo/ems/emsprodplanroundweight/service/impl/EmsProdplanRoundWeightServiceImpl.java

@@ -96,6 +96,7 @@ public class EmsProdplanRoundWeightServiceImpl extends BaseServiceImpl<EmsProdpl
             model.setMaterialname(item.getMaterialname());
             model.setProdate(item.getProdate());
             model.setUnit(item.getUnit());
+            model.setRemark(item.getRemark());
             EmsProdplanRoundWeight emsProdplanRoundWeight = emsProdplanRoundWeightMapper.selectByPrimaryKey(model.getFid());
             if(emsProdplanRoundWeight !=  null){
                 emsProdplanRoundWeightMapper.updateByPrimaryKeySelective(model);

src/main/java/com/steerinfo/ems/trmcalpointvalue/controller/TRmCalpointValueController.java

@@ -505,7 +505,7 @@ public class TRmCalpointValueController extends BaseRESTfulController {
      * @throws ParseException
      */
 	@GetMapping(value = "/restartWdata")
-	public RESTfulResult restartWdata(@RequestParam String itemId,@RequestParam String startClock,@RequestParam String endClock) throws ParseException {
+	public RESTfulResult restartWdata(@RequestParam String itemId,@RequestParam String startClock,@RequestParam String endClock) throws Exception {
 
 		tRmCalpointService.resData(itemId,startClock, endClock);
 		return success();

src/main/java/com/steerinfo/feigen/model/GxWeight.java

@@ -21,6 +21,7 @@ public class GxWeight {
     private String materialname;
     private String fid;
     private String roundid;
+    private String remark;
 
     public String getRoundid() {
         return roundid;
@@ -85,4 +86,12 @@ public class GxWeight {
     public void setProdate(String prodate) {
         this.prodate = prodate;
     }
-}
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}