tpy -2022-01-06

src/main/java/com/steerinfo/ems/emsprodplanmonth/mapper/EmsProdplanMonthMapper.xml

@@ -19,14 +19,15 @@
     <result column="YXF_WEIGHT" jdbcType="DECIMAL" property="yxf_weight" />
     <result column="KXF_WEIGHT" jdbcType="DECIMAL" property="kxf_weight" />
     <result column="SQNO" jdbcType="DECIMAL" property="sqno" />
+    <result column="WEIGHT_ORIGIN" jdbcType="DECIMAL" property="weightOrigin"/>
   </resultMap>
   <sql id="columns">
     ID, PRODUCTID, WORKPROCID, MAY, WEIGHT_MONTH, WEIGHT_DAY, UNIT, JXDAYS, CREATETIME, 
-    CREATEMAN, UPDATETIME, UPDATEMAN, MEMO,STATE,YXF_WEIGHT,KXF_WEIGHT,SQNO
+    CREATEMAN, UPDATETIME, UPDATEMAN, MEMO,STATE,YXF_WEIGHT,KXF_WEIGHT,SQNO,WEIGHT_ORIGIN
   </sql>
   <sql id="columns_alias">
     t.ID, t.PRODUCTID, t.WORKPROCID, t.MAY, t.WEIGHT_MONTH, t.WEIGHT_DAY, t.UNIT, t.JXDAYS, 
-    t.CREATETIME, t.CREATEMAN, t.UPDATETIME, t.UPDATEMAN, t.MEMO,T.STATE
+    t.CREATETIME, t.CREATEMAN, t.UPDATETIME, t.UPDATEMAN, t.MEMO,t.STATE,t.WEIGHT_ORIGIN
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM EMS_PRODPLAN_MONTH
@@ -35,7 +36,7 @@
     SELECT <include refid="columns_alias"/> FROM EMS_PRODPLAN_MONTH t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="id != null and id != ''">
         and ID = #{id}
       </if>
@@ -171,12 +172,13 @@
       MAY, WEIGHT_MONTH, WEIGHT_DAY, 
       UNIT, JXDAYS, CREATETIME, 
       CREATEMAN, UPDATETIME, UPDATEMAN, STATE,
-      MEMO,YXF_WEIGHT,KXF_WEIGHT,SQNO)
+      MEMO,YXF_WEIGHT,KXF_WEIGHT,SQNO,WEIGHT_ORIGIN)
     values (#{id,jdbcType=VARCHAR}, #{productid,jdbcType=VARCHAR}, #{workprocid,jdbcType=VARCHAR}, 
       #{may,jdbcType=TIMESTAMP}, #{weightMonth,jdbcType=DECIMAL}, #{weightDay,jdbcType=DECIMAL}, 
       #{unit,jdbcType=VARCHAR}, #{jxdays,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, 
       #{createman,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{updateman,jdbcType=VARCHAR}, 
-     #{state,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR},#{yxf_weight,jdbcType=DECIMAL},#{kxf_weight,jdbcType=DECIMAL},#{sqno,jdbcType=DECIMAL})
+     #{state,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR},#{yxf_weight,jdbcType=DECIMAL},
+     #{kxf_weight,jdbcType=DECIMAL},#{sqno,jdbcType=DECIMAL},#{weightOrigin,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.ems.emsprodplanmonth.model.EmsProdplanMonth">
     insert into EMS_PRODPLAN_MONTH
@@ -220,6 +222,9 @@
       <if test="memo != null">
         MEMO,
       </if>
+      <if test="weightOrigin != null">
+        WEIGHT_ORIGIN,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -261,6 +266,9 @@
       <if test="memo != null">
         #{memo,jdbcType=VARCHAR},
       </if>
+      <if test="weightOrigin != null">
+        #{weightOrigin,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.ems.emsprodplanmonth.model.EmsProdplanMonth">
@@ -320,6 +328,9 @@
       <if test="memo != null">
         MEMO = #{memo,jdbcType=VARCHAR},
       </if>
+      <if test="weightOrigin != null">
+        WEIGHT_ORIGIN = #{weightOrigin,jdbcType=DECIMAL},
+      </if>
     </set>
     where ID = #{id,jdbcType=VARCHAR}
   </update>

src/main/java/com/steerinfo/ems/emsprodplanmonth/model/EmsProdplanMonth.java

@@ -98,6 +98,8 @@ public class EmsProdplanMonth implements IBasePO<String> {
     private BigDecimal kxf_weight;
     @ApiModelProperty(value = "序号",required = false)
     private Long sqno;
+    @ApiModelProperty(value = "源计划",required = false)
+    private BigDecimal weightOrigin;
 
     public Long getSqno() {
         return sqno;
@@ -266,6 +268,13 @@ public class EmsProdplanMonth implements IBasePO<String> {
         this.memo = memo == null ? null : memo.trim();
     }
 
+    public BigDecimal getWeightOrigin() {
+        return weightOrigin;
+    }
+
+    public void setWeightOrigin(BigDecimal weightOrigin) {
+        this.weightOrigin = weightOrigin;
+    }
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -289,6 +298,7 @@ public class EmsProdplanMonth implements IBasePO<String> {
         sb.append(", startTime=").append(startTime);
         sb.append(", endTime=").append(endTime);
         sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append(",weightOrigin=").append(weightOrigin);
         sb.append("]");
         return sb.toString();
     }

src/main/java/com/steerinfo/ems/emsprodplanyear/controller/EmsProdplanYearController.java

@@ -247,6 +247,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     monModel.setWorkprocid(workProcid);
                     monModel.setWeightMonth(BigDecimal.valueOf(sumWeight));
                 }
+                monModel.setWeightOrigin(BigDecimal.valueOf(avgWeight[k]));
                 monModel.setWeightDay(BigDecimal.valueOf(avgWeight[k]));
                 monModel.setKxf_weight(BigDecimal.valueOf(avgWeight[k]));
                 monModel.setYxf_weight(BigDecimal.valueOf(0));
@@ -269,6 +270,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                         monModel.setKxf_weight(monList.get(0).getKxf_weight().add(monModel.getKxf_weight()));
                         monModel.setWeightMonth(monList.get(0).getWeightMonth().add(monModel.getWeightMonth()));
                         monModel.setWeightDay(monList.get(0).getWeightDay().add(monModel.getWeightDay()));
+                        monModel.setWeightOrigin(monList.get(0).getWeightOrigin().add(monModel.getWeightOrigin()));
                         monModel.setId(monList.get(0).getId());
                         emsProdplanMonthService.modify(monModel);
                     }
@@ -484,6 +486,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     monModel.setWorkprocid(workProcid);
                     monModel.setWeightMonth(BigDecimal.valueOf(sumWeight));
                 }
+                monModel.setWeightOrigin(BigDecimal.valueOf(avgWeight[k]));
                 monModel.setWeightDay(BigDecimal.valueOf(avgWeight[k]));
                 monModel.setKxf_weight(BigDecimal.valueOf(avgWeight[k]));
                 monModel.setYxf_weight(BigDecimal.valueOf(0));
@@ -506,10 +509,12 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                         if (i == 0){
                             monList.get(0).setWeightMonth(BigDecimal.valueOf(0));
                             monList.get(0).setWeightDay(BigDecimal.valueOf(0));
+                            monList.get(0).setWeightOrigin(BigDecimal.valueOf(0));
                         }
                         //monModel.setKxf_weight(monList.get(0).getKxf_weight().add(monModel.getKxf_weight()));
                         monModel.setWeightMonth(monList.get(0).getWeightMonth().add(monModel.getWeightMonth()));
                         monModel.setWeightDay(monList.get(0).getWeightDay().add(monModel.getWeightDay()));
+                        monModel.setWeightOrigin(monList.get(0).getWeightOrigin().add(monModel.getWeightOrigin()));
                         monModel.setId(monList.get(0).getId());
                         emsProdplanMonthService.modify(monModel);
                     } else  {