后端提交

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/mapper/MeterWorkCarActFirstBakMapper.xml

@@ -10,20 +10,31 @@
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
     <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
     <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="UPLOAD_MAN_NO" jdbcType="VARCHAR" property="uploadManNo" />
+    <result column="UPLOAD_MAN_NAME" jdbcType="VARCHAR" property="uploadManName" />
+    <result column="UPLOAD_TIME" jdbcType="TIMESTAMP" property="uploadTime" />
+    <result column="UPLOAD_FLAG" jdbcType="VARCHAR" property="uploadFlag" />
+    <result column="NOTE" jdbcType="VARCHAR" property="note" />
   </resultMap>
   <sql id="columns">
     ACTUAL_FIRST_NO, CAR_NO, METER_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-    BASE_SPOT_NO, BASE_SPOT_NAME
+    BASE_SPOT_NO, BASE_SPOT_NAME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, UPLOAD_MAN_NO, 
+    UPLOAD_MAN_NAME, UPLOAD_TIME, UPLOAD_FLAG, NOTE
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_FIRST_NO, t.CAR_NO, t.METER_WEIGHT, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
-    t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME
+    t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME, t.UPLOAD_MAN_NO, t.UPLOAD_MAN_NAME, t.UPLOAD_TIME, t.UPLOAD_FLAG, 
+    t.NOTE
   </sql>
   <sql id="select">
-    SELECT <include refid="columns" /> FROM METER_WORK_CAR_ACT_FIRST_BAK
+    SELECT <include refid="columns"/> FROM METER_WORK_CAR_ACT_FIRST_BAK
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM METER_WORK_CAR_ACT_FIRST_BAK t
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_CAR_ACT_FIRST_BAK t
   </sql>
   <sql id="where">
     <where> 
@@ -51,6 +62,30 @@
       <if test="baseSpotName != null and baseSpotName != ''">
         and BASE_SPOT_NAME = #{baseSpotName}
       </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        and UPLOAD_MAN_NO = #{uploadManNo}
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        and UPLOAD_MAN_NAME = #{uploadManName}
+      </if>
+      <if test="uploadTime != null">
+        and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG = #{uploadFlag}
+      </if>
+      <if test="note != null and note != ''">
+        and NOTE = #{note}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -79,6 +114,30 @@
       <if test="baseSpotName != null and baseSpotName != ''">
         and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
       </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        and UPLOAD_MAN_NO LIKE '%${uploadManNo}%'
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        and UPLOAD_MAN_NAME LIKE '%${uploadManName}%'
+      </if>
+      <if test="uploadTime != null">
+        and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG LIKE '%${uploadFlag}%'
+      </if>
+      <if test="note != null and note != ''">
+        and NOTE LIKE '%${note}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -109,14 +168,44 @@
       <if test="baseSpotName != null and baseSpotName != ''">
         or BASE_SPOT_NAME = #{baseSpotName}
       </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        or UPLOAD_MAN_NO = #{uploadManNo}
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        or UPLOAD_MAN_NAME = #{uploadManName}
+      </if>
+      <if test="uploadTime != null">
+        or TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = '#{uploadTime}'
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        or UPLOAD_FLAG = #{uploadFlag}
+      </if>
+      <if test="note != null and note != ''">
+        or NOTE = #{note}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
     insert into METER_WORK_CAR_ACT_FIRST_BAK (ACTUAL_FIRST_NO, CAR_NO, METER_WEIGHT, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      BASE_SPOT_NO, BASE_SPOT_NAME)
+      BASE_SPOT_NO, BASE_SPOT_NAME, UPDATE_MAN_NO, 
+      UPDATE_MAN_NAME, UPDATE_TIME, UPLOAD_MAN_NO, 
+      UPLOAD_MAN_NAME, UPLOAD_TIME, UPLOAD_FLAG, 
+      NOTE)
     values (#{actualFirstNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR})
+      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, 
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{uploadManNo,jdbcType=VARCHAR}, 
+      #{uploadManName,jdbcType=VARCHAR}, #{uploadTime,jdbcType=TIMESTAMP}, #{uploadFlag,jdbcType=VARCHAR}, 
+      #{note,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
     insert into METER_WORK_CAR_ACT_FIRST_BAK
@@ -145,6 +234,30 @@
       <if test="baseSpotName != null">
         BASE_SPOT_NAME,
       </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="uploadManNo != null">
+        UPLOAD_MAN_NO,
+      </if>
+      <if test="uploadManName != null">
+        UPLOAD_MAN_NAME,
+      </if>
+      <if test="uploadTime != null">
+        UPLOAD_TIME,
+      </if>
+      <if test="uploadFlag != null">
+        UPLOAD_FLAG,
+      </if>
+      <if test="note != null">
+        NOTE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualFirstNo != null">
@@ -171,6 +284,30 @@
       <if test="baseSpotName != null">
         #{baseSpotName,jdbcType=VARCHAR},
       </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadManNo != null">
+        #{uploadManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadManName != null">
+        #{uploadManName,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadTime != null">
+        #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadFlag != null">
+        #{uploadFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="note != null">
+        #{note,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
@@ -181,7 +318,15 @@
       CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
-      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR}
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      UPLOAD_MAN_NO = #{uploadManNo,jdbcType=VARCHAR},
+      UPLOAD_MAN_NAME = #{uploadManName,jdbcType=VARCHAR},
+      UPLOAD_TIME = #{uploadTime,jdbcType=TIMESTAMP},
+      UPLOAD_FLAG = #{uploadFlag,jdbcType=VARCHAR},
+      NOTE = #{note,jdbcType=VARCHAR}
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
@@ -208,82 +353,145 @@
       <if test="baseSpotName != null">
         BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
       </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadManNo != null">
+        UPLOAD_MAN_NO = #{uploadManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadManName != null">
+        UPLOAD_MAN_NAME = #{uploadManName,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadTime != null">
+        UPLOAD_TIME = #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadFlag != null">
+        UPLOAD_FLAG = #{uploadFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="note != null">
+        NOTE = #{note,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select" />
+    <include refid="select"/>
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </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 METER_WORK_CAR_ACT_FIRST_BAK 
       (ACTUAL_FIRST_NO, 
       CAR_NO, METER_WEIGHT, CREATE_MAN_NO, 
       CREATE_MAN_NAME, CREATE_TIME, 
-      BASE_SPOT_NO, BASE_SPOT_NAME)
+      BASE_SPOT_NO, BASE_SPOT_NAME, UPDATE_MAN_NO, 
+      UPDATE_MAN_NAME, UPDATE_TIME, 
+      UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, 
+      UPLOAD_FLAG, NOTE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualFirstNo,jdbcType=VARCHAR}, 
       #{item.carNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR}, 
       #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR} from dual  
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, 
+      #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.uploadManNo,jdbcType=VARCHAR}, #{item.uploadManName,jdbcType=VARCHAR}, #{item.uploadTime,jdbcType=TIMESTAMP}, 
+      #{item.uploadFlag,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
      update METER_WORK_CAR_ACT_FIRST_BAK
      set
        ACTUAL_FIRST_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
        </foreach>
        ,CAR_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
        </foreach>
        ,METER_WEIGHT=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
        </foreach>
        ,CREATE_MAN_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
        </foreach>
        ,BASE_SPOT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
        </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPLOAD_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.uploadManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPLOAD_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.uploadManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPLOAD_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.uploadTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPLOAD_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.uploadFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.note,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_FIRST_NO in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualFirstNo,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_CAR_ACT_FIRST_BAK
     where ACTUAL_FIRST_NO in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/model/MeterWorkCarActFirstBak.java

@@ -3,7 +3,6 @@ package com.steerinfo.meterwork.meterworkcaractfirstbak.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -57,6 +56,54 @@ public class MeterWorkCarActFirstBak implements IBasePO<String> {
     @ApiModelProperty(value="计量点名称",required=false)
     private String baseSpotName;
 
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人名称(UPDATE_MAN_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="修改人名称",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 上传人编号(UPLOAD_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="上传人编号",required=false)
+    private String uploadManNo;
+
+    /**
+     * 上传人名称(UPLOAD_MAN_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="上传人名称",required=false)
+    private String uploadManName;
+
+    /**
+     * 上传人时间(UPLOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="上传人时间",required=false)
+    private Date uploadTime;
+
+    /**
+     * 是否上传新系统（0：未上传；1：已上传）(UPLOAD_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否上传新系统（0：未上传；1：已上传）",required=false)
+    private String uploadFlag;
+
+    /**
+     * 原因(NOTE,VARCHAR,200)
+     */
+    @ApiModelProperty(value="原因",required=false)
+    private String note;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -133,6 +180,70 @@ public class MeterWorkCarActFirstBak implements IBasePO<String> {
         this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
     }
 
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUploadManNo() {
+        return uploadManNo;
+    }
+
+    public void setUploadManNo(String uploadManNo) {
+        this.uploadManNo = uploadManNo == null ? null : uploadManNo.trim();
+    }
+
+    public String getUploadManName() {
+        return uploadManName;
+    }
+
+    public void setUploadManName(String uploadManName) {
+        this.uploadManName = uploadManName == null ? null : uploadManName.trim();
+    }
+
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag == null ? null : uploadFlag.trim();
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note == null ? null : note.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -147,6 +258,14 @@ public class MeterWorkCarActFirstBak implements IBasePO<String> {
         sb.append(", createTime=").append(createTime);
         sb.append(", baseSpotNo=").append(baseSpotNo);
         sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", uploadManNo=").append(uploadManNo);
+        sb.append(", uploadManName=").append(uploadManName);
+        sb.append(", uploadTime=").append(uploadTime);
+        sb.append(", uploadFlag=").append(uploadFlag);
+        sb.append(", note=").append(note);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -25,6 +25,7 @@ import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayAct
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.model.MeterWorkRailwayScheduledHelp;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.StringUtils;
@@ -1344,7 +1345,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次空皮", notes = "一定要有委托才能才能进行洁净")
+    @ApiOperation(value = "动轨计量终端从表数据处理批量匹配一次历史皮", notes = "一定要有委托才能才能进行洁净")
     @Transactional
     @PostMapping(value = "/DynamicBatchMatchHisTareWeight")
     public RESTfulResult DynamicBatchMatchHisTareWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
@@ -1358,4 +1359,35 @@ throw new MarkerMetException(500, "操作异常！！");
             return rm;
         }
     }
+
+    @ApiOperation(value = "web端一次轨道衡数据处理批量匹配标识皮", notes = "")
+    @Transactional
+    @PostMapping(value = "/WebBatchMatchidentifyWeight")
+    public RESTfulResult WebBatchMatchidentifyWeight(@RequestBody List<HashMap> models) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActFirstService.WebBatchMatchidentifyWeight(models);
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
+
+    @ApiOperation(value = "静态轨道衡自助计量保存", notes = "")
+    @Transactional
+    @PostMapping(value = "/saveAutoScale")
+    public RESTfulResult saveAutoScale(@RequestBody  CommonCombination<MeterWorkRailwayActFirst, MeterWorkRailwayActFirst, MeterWorkRailwayActual, MeterWorkRailwayScheduledHelp> com) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActFirstService.saveAutoScale(com);
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3600,17 +3600,18 @@
   <select id="batchMatchView" parameterType="java.util.HashMap" resultType="HashMap">
     select A.create_time create_Time,
          A.actual_first_no actual_first_no,
+         A.prediction_no prediction_no,
          A.lc_no lc_No,
          A.railway_no railway_No,
-         A.meter_weight meter_Weight,
+         A.meter_weight/1000 meter_Weight,
          A.weight_type weight_Type,
          A.value_flag vlaue_Flag,
          A.is_pre_sacale is_Pre_Sacale,
-         C.meter_weight his_Tare_Weight,
+         C.meter_weight/1000 his_Tare_Weight,
          A.conveyance_type conveyance_Type,
-         A.railway_factory_weight railway_Factory_Weight,
+         A.railway_factory_weight/1000 railway_Factory_Weight,
          B.CARRIAGE_CODE carriage_Code,
-         B.CARRIAGE_WEIGHT carriage_Weight
+         B.CARRIAGE_WEIGHT/1000 carriage_Weight
     from meter_work_railway_act_first A
     left join meter_base_railway_carriage_weight B
       on A.conveyance_type = B.Carriage_Code

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -7,6 +7,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
+import com.steerinfo.meterwork.dto.CommonCombination;
 import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
@@ -14,6 +15,7 @@ import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayAc
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.model.MeterWorkRailwayScheduledHelp;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import org.springframework.transaction.annotation.Transactional;
@@ -137,5 +139,11 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult DynamicBatchMatchFirstWeight(List<MeterWorkRailwayReceived> receivedList);
     //批量匹配历史皮
     RESTfulResult DynamicBatchMatchHisTareWeight(List<MeterWorkRailwayReceived> receivedList);
+
+
+    //静态轨道衡数据处理接口
+    RESTfulResult WebBatchMatchidentifyWeight(List<HashMap> models);
+
+    RESTfulResult saveAutoScale(CommonCombination<MeterWorkRailwayActFirst, MeterWorkRailwayActFirst, MeterWorkRailwayActual, MeterWorkRailwayScheduledHelp> com);
 }
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service.impl;
 
+import com.fasterxml.jackson.databind.node.BigIntegerNode;
 import com.google.inject.internal.cglib.proxy.$UndeclaredThrowableException;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
@@ -24,6 +25,7 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.constants.DbConstants;
+import com.steerinfo.meterwork.dto.CommonCombination;
 import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
@@ -473,12 +475,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctRailwayNo(HashMap<String, Object> param) {
-
         String[] lcNoTemp = param.get("lcNo").toString().split(",");
-//        param.remove("lcNo");
         param.put("lcNoTemp", lcNoTemp);
-        for (String str:
-                lcNoTemp) {
+        for (String str: lcNoTemp) {
             if(str.equals("")) {
                 param.put("lcNoNull", "1");
                 break;
@@ -486,17 +485,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 param.put("lcNoNull", "");
             }
         }
+        List<MeterWorkRailwayActFirst> templist = meterWorkRailwayActFirstMapper.distinctRailwayNo(param);
         List<String> list = new ArrayList<>();
-        try{
-             list = meterWorkRailwayActFirstMapper.distinctRailwayNo(param)
-                    .stream()
-                    .map(MeterWorkRailwayActFirst::getRailwayNo)
-                    .collect(Collectors.toList());
-            if(list==null && list.isEmpty()) {
+        if(templist != null && !templist.isEmpty() ) {
+            try{
+                list = templist.stream().map(MeterWorkRailwayActFirst::getRailwayNo ).distinct().collect(Collectors.toList());
+                if(list==null && list.isEmpty()) {
+                    list.add("");
+                }
+            }catch (Exception e) {
+                e.printStackTrace();
                 list.add("");
             }
-        }catch (Exception e) {
-            list.add("");
         }
         return list;
     }
@@ -5877,14 +5877,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 Assert.isTrue(receivedModel.getPredictionNo() != null && StringUtils.isNotEmpty(receivedModel.getPredictionNo()), "所选择的数据中包含没有委托的数据，不能洁净");
             }
             int count = 0;
-            //将从表数据的车号所对应有效的AI标识皮进行结净,未找到Ai标识皮就跳过
+            //将从表数据的车号所对应有效的AI标识皮进行结净,未找到历史皮就跳过
             for (MeterWorkRailwayReceived receivedModel: receivedList) {
                 HashMap obj = new HashMap();
                 obj.put("railwayNo", receivedModel.getRailwayNo());
                 obj.put("valueFlag", "1");
-                List<MeterBaseRailwayCarriageWeight> carriageWeightList = meterBaseRailwayCarriageWeightMapper.selectByParameters(obj);
-                if(carriageWeightList.size() >= 1) {
-                    MeterBaseRailwayCarriageWeight carriageWeightModel = carriageWeightList.get(0);
+                List<MeterWorkRailwayActFirst> firstWeightList = meterWorkRailwayActFirstMapper.selectByParameters(obj);
+                if(firstWeightList.size() == 1) {
+                    MeterWorkRailwayActFirst firstWeightModel = firstWeightList.get(0);
+                    //查找到一条有效的数据并且这条数据小于从表重量才进行洁净，否则跳过
+                    if(receivedModel.getMeterWeight().compareTo(firstWeightModel.getMeterWeight()) <= 0) {
+                        continue;
+                    }
 
                     MeterWorkRailwayActFirst grossModel = new MeterWorkRailwayActFirst();
                     MeterWorkRailwayActFirst tareModel = new MeterWorkRailwayActFirst();
@@ -5897,14 +5901,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     BeanUtils.copyProperties(receivedModel, grossModel);
                     grossModel.setLcNo(receivedModel.getRailwayModelNo());
                     meterWorkRailwayActFirstMapper.insertSelective(grossModel);
-                    BeanUtils.copyProperties(grossModel, tareModel);
-                    tareModel.setMeterWeight(new BigDecimal(carriageWeightModel.getCarriageWeight()));
 
                     //更新预报数
                     railwayScale.setValueFlag(DbConstants.NET);
                     railwayScale.setUpdateTime(new Date());
                     railwayScale.setUpdateManNo("system");
-                    railwayScale.setUpdateManName("标准皮匹配委托洁净更新");
+                    railwayScale.setUpdateManName("空皮匹配委托洁净更新");
                     railwayScale.setUploadFlag("1");
                     railwayScale.setValueFlag("2");
                     railwayScale.setPredictionType("1");
@@ -5912,13 +5914,26 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     grossModel.setValueFlag(DbConstants.NET);
                     grossModel.setWeightType("0");
-                    grossModel.setNote("标准皮匹配委托洁净更新");
+                    grossModel.setNote("空皮匹配委托洁净更新");
                     grossModel.setUpdateTime(new Date());
+                    grossModel.setWeightType("0");
                     grossModel.setIsPreSacale("1");
                     grossModel.setPredictionNo(railwayScale.getPredictionNo());
                     grossModel.setPredictionType("1");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
 
+                    tareModel.setValueFlag(DbConstants.NET);
+                    tareModel.setWeightType("1");
+                    tareModel.setNote("空皮匹配委托洁净更新");
+                    tareModel.setUpdateTime(new Date());
+                    tareModel.setIsPreSacale("1");
+                    tareModel.setPredictionNo(railwayScale.getPredictionNo());
+                    tareModel.setPredictionType("1");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+
+                    //保存历史皮重
+                    doSaveTare(tareModel);
+
                     //添加第二次毛重数据
                     SimpleDateFormat sdfFormat = new SimpleDateFormat("yyyyMMdd");
                     String afl = sdfFormat.format(new Date());
@@ -5932,7 +5947,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setTareWeight(tareModel.getMeterWeight());
                     actualRow.setNetTime(new Date());
                     actualRow.setNetMode(DbConstants.TYPE);
-                    actualRow.setNote("标准皮配委托洁净更新");
+                    actualRow.setNote("空皮配委托洁净更新");
                     actualRow.setNetMode("2");
                     actualRow.setUploadFlag("1");
                     actualRow.setIsPreSacale("1");
@@ -5947,7 +5962,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             rm.setSucceed();
             rm.setCode("200");
-            rm.setMessage("操作成功,总共"+ receivedList.size() +"条数据，共有：" + count + "条数据匹配标准皮成功");
+            rm.setMessage("操作成功,总共"+ receivedList.size() +"条数据，共有：" + count + "条数据匹配空皮成功");
         }catch(Exception e) {
             e.printStackTrace();
             rm.setMessage("操作异常：>>>" + e.getMessage());
@@ -5957,7 +5972,288 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     public RESTfulResult DynamicBatchMatchHisTareWeight(List<MeterWorkRailwayReceived> receivedList) {
-        return null;
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            //判断从表数据中是否包含委托编号
+            for (MeterWorkRailwayReceived receivedModel: receivedList) {
+                Assert.isTrue(receivedModel.getPredictionNo() != null && StringUtils.isNotEmpty(receivedModel.getPredictionNo()), "所选择的数据中包含没有委托的数据，不能洁净");
+            }
+            int count = 0;
+            //将从表数据的车号所对应有效的AI标识皮进行结净,未找到Ai标识皮就跳过
+            for (MeterWorkRailwayReceived receivedModel: receivedList) {
+                HashMap obj = new HashMap();
+                obj.put("railwayNo", receivedModel.getRailwayNo());
+                obj.put("valueFlag", "1");
+                List<MeterBaseRailwayHisTareData> hisTareWeightList = meterBaseRailwayHisTareDataMapper.selectByParameters(obj);
+                if(hisTareWeightList.size() >= 1) {
+                    MeterBaseRailwayHisTareData hisTareWeightModel = hisTareWeightList.get(0);
+
+                    MeterWorkRailwayActFirst grossModel = new MeterWorkRailwayActFirst();
+                    MeterWorkRailwayActFirst tareModel = new MeterWorkRailwayActFirst();
+                    MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
+                    PreRailwayScale railwayScale = new PreRailwayScale();
+                    //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
+                    meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(receivedModel.getActualFirstNo());
+
+                    //从表赋值grossModel、历史皮也赋值tareModel并修改重量
+                    BeanUtils.copyProperties(receivedModel, grossModel);
+                    grossModel.setLcNo(receivedModel.getRailwayModelNo());
+                    meterWorkRailwayActFirstMapper.insertSelective(grossModel);
+                    BeanUtils.copyProperties(grossModel, tareModel);
+                    tareModel.setMeterWeight(new BigDecimal(hisTareWeightModel.getMeterWeight()));
+
+                    //更新预报数
+                    railwayScale.setValueFlag(DbConstants.NET);
+                    railwayScale.setUpdateTime(new Date());
+                    railwayScale.setUpdateManNo("system");
+                    railwayScale.setUpdateManName("历史皮匹配委托洁净更新");
+                    railwayScale.setUploadFlag("1");
+                    railwayScale.setValueFlag("2");
+                    railwayScale.setPredictionType("1");
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(railwayScale);
+
+                    grossModel.setValueFlag(DbConstants.NET);
+                    grossModel.setWeightType("0");
+                    grossModel.setNote("历史皮匹配委托洁净更新");
+                    grossModel.setUpdateTime(new Date());
+                    grossModel.setIsPreSacale("1");
+                    grossModel.setPredictionNo(railwayScale.getPredictionNo());
+                    grossModel.setPredictionType("1");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+
+                    //添加第二次毛重数据
+                    SimpleDateFormat sdfFormat = new SimpleDateFormat("yyyyMMdd");
+                    String afl = sdfFormat.format(new Date());
+                    MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), railwayScale.getPredictionNo());
+                    BeanUtils.copyProperties(mwca, actualRow);
+
+                    //添加结净数据
+                    actualRow.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                    //    String no = PublicMethod.IdCreate(3);
+                    //    actualRow1.setActualNo(no);
+                    actualRow.setTareWeight(tareModel.getMeterWeight());
+                    actualRow.setNetTime(new Date());
+                    actualRow.setNetMode(DbConstants.TYPE);
+                    actualRow.setNote("历史皮匹配委托洁净更新");
+                    actualRow.setNetMode("2");
+                    actualRow.setUploadFlag("1");
+                    actualRow.setIsPreSacale("1");
+                    actualRow.setValueFlag("1");
+                    actualRow.setPredictionType("1");
+                    actualRow.setPredictionNo(railwayScale.getPredictionNo());
+                    actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                    meterWorkRailwayActualMapper.insertSelective(actualRow);
+
+                    count++;
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,总共"+ receivedList.size() +"条数据，共有：" + count + "条数据匹配历史皮成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult WebBatchMatchidentifyWeight(List<HashMap> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            //将一次数据表的与标识皮进行洁净
+            for (HashMap model: models) {
+                MeterWorkRailwayActFirst firstModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.get("ACTUAL_FIRST_NO") == null ? "": model.get("ACTUAL_FIRST_NO").toString());
+                BigDecimal identifyWeight = new BigDecimal(0);
+                String scaleNo = null;
+                if(model.get("IDENTIFY_WEIGHT") != null && StringUtils.isNotEmpty(model.get("IDENTIFY_WEIGHT").toString())) {
+                    identifyWeight = new BigDecimal(model.get("IDENTIFY_WEIGHT").toString()).multiply(new BigDecimal(1000));
+                }
+                if(model.get("PREDICTION_NO") != null && StringUtils.isNotEmpty(model.get("PREDICTION_NO").toString())) {
+                    scaleNo = model.get("PREDICTION_NO").toString();
+                }
+                if(firstModel != null && identifyWeight.compareTo(new BigDecimal(0)) > 0) {
+
+                    MeterWorkRailwayActFirst grossModel = new MeterWorkRailwayActFirst();
+                    MeterWorkRailwayActFirst tareModel = new MeterWorkRailwayActFirst();
+                    MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
+                    if(scaleNo != null && StringUtils.isNotEmpty(scaleNo)) {
+                        PreRailwayScale railwayScale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
+
+                        //从表赋值grossModel、标识皮也赋值tareModel并修改重量
+                        BeanUtils.copyProperties(firstModel, grossModel);
+                        BeanUtils.copyProperties(grossModel, tareModel);
+                        tareModel.setMeterWeight(identifyWeight);
+
+                        //更新预报数
+                        railwayScale.setValueFlag(DbConstants.NET);
+                        railwayScale.setUpdateTime(new Date());
+                        railwayScale.setUpdateManNo("system");
+                        railwayScale.setUpdateManName("标识皮匹配委托洁净更新");
+                        railwayScale.setUploadFlag("1");
+                        railwayScale.setValueFlag("2");
+                        railwayScale.setPredictionType("1");
+                        preRailwayScaleMapper.updateByPrimaryKeySelective(railwayScale);
+
+                        grossModel.setValueFlag(DbConstants.NET);
+                        grossModel.setWeightType("0");
+                        grossModel.setNote("标识皮匹配委托洁净更新");
+                        grossModel.setUpdateTime(new Date());
+                        grossModel.setIsPreSacale("1");
+                        grossModel.setPredictionNo(railwayScale.getPredictionNo());
+                        grossModel.setPredictionType("1");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+
+                        //添加第二次毛重数据
+                        SimpleDateFormat sdfFormat = new SimpleDateFormat("yyyyMMdd");
+                        String afl = sdfFormat.format(new Date());
+                        MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), railwayScale.getPredictionNo());
+                        BeanUtils.copyProperties(mwca, actualRow);
+
+                        //添加结净数据
+                        actualRow.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                        //    String no = PublicMethod.IdCreate(3);
+                        //    actualRow1.setActualNo(no);
+                        actualRow.setTareWeight(tareModel.getMeterWeight());
+                        actualRow.setNetTime(new Date());
+                        actualRow.setNetMode(DbConstants.TYPE);
+                        actualRow.setNote("标识皮匹配委托洁净更新");
+                        actualRow.setNetMode("2");
+                        actualRow.setUploadFlag("1");
+                        actualRow.setIsPreSacale("1");
+                        actualRow.setValueFlag("1");
+                        actualRow.setPredictionType("1");
+                        actualRow.setPredictionNo(railwayScale.getPredictionNo());
+                        actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                        meterWorkRailwayActualMapper.insertSelective(actualRow);
+                    }else {
+                        //从表赋值grossModel、标识皮也赋值tareModel并修改重量
+                        BeanUtils.copyProperties(firstModel, grossModel);
+                        BeanUtils.copyProperties(grossModel, tareModel);
+                        tareModel.setMeterWeight(identifyWeight);
+
+                        grossModel.setValueFlag(DbConstants.NET);
+                        grossModel.setWeightType("0");
+                        grossModel.setNote("标识皮无委托洁净更新");
+                        grossModel.setUpdateTime(new Date());
+                        grossModel.setIsPreSacale("0");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+
+                        //添加第二次毛重数据
+                        SimpleDateFormat sdfFormat = new SimpleDateFormat("yyyyMMdd");
+                        String afl = sdfFormat.format(new Date());
+                        MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                        BeanUtils.copyProperties(mwca, actualRow);
+
+                        //添加结净数据
+                        actualRow.setActualNo(afl + meterWorkRailwayActualMapper.getNewID(afl));
+                        //    String no = PublicMethod.IdCreate(3);
+                        //    actualRow1.setActualNo(no);
+                        actualRow.setTareWeight(tareModel.getMeterWeight());
+                        actualRow.setNetTime(new Date());
+                        actualRow.setNetMode(DbConstants.TYPE);
+                        actualRow.setNote("标识皮无委托洁净更新");
+                        actualRow.setNetMode("2");
+                        actualRow.setUploadFlag("1");
+                        actualRow.setIsPreSacale("0");
+                        actualRow.setValueFlag("1");
+                        actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                        meterWorkRailwayActualMapper.insertSelective(actualRow);
+                    }
+                    count++;
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,总共"+ models.size() +"条数据，共有：" + count + "条数据匹配标识皮成功");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult saveAutoScale(CommonCombination<MeterWorkRailwayActFirst, MeterWorkRailwayActFirst, MeterWorkRailwayActual, MeterWorkRailwayScheduledHelp> com) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+
+            List<MeterWorkRailwayActFirst> firsts = new ArrayList<>();
+            List<MeterWorkRailwayActual> actuals = new ArrayList<>();
+            HashMap<String, Object> map = new HashMap<>();
+
+            com.getOne().setActualFirstNo(sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(sdf.format(new Date())));
+            meterWorkRailwayActFirstMapper.insertSelective(com.getOne());
+            firsts.add(com.getOne());
+            if(com.getTwo() != null) {
+                int i = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(com.getTwo());
+                if( i  == 1) {
+                    firsts.add(com.getTwo());
+                }
+            }
+            if(com.getThree() != null) {
+                if(com.getTwo() != null) {
+                    if(com.getOne().getMeterWeight().compareTo(com.getTwo().getMeterWeight()) > 0) {
+                        com.getThree().setActualFirst1No(com.getOne().getActualFirstNo());
+                    }else {
+                        com.getThree().setActualFirst2No(com.getOne().getActualFirstNo());
+                    }
+                }
+                com.getThree().setActualNo(sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(sdf.format(new Date())));
+                int i = meterWorkRailwayActualMapper.insertSelective(com.getThree());
+                MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(com.getThree().getActualFirst2No());
+                doSaveTare(tareModel);
+                //如果有委托号就更新委托状态，
+                if( i  == 1) {
+                    actuals.add(com.getThree());
+                    if(com.getThree().getPredictionNo() != null && StringUtils.isNotEmpty(com.getThree().getPredictionNo())) {
+                        PreRailwayScale scaleModel = preRailwayScaleMapper.selectByPrimaryKey(com.getThree().getPredictionNo());
+                        scaleModel.setValueFlag("2");
+                        scaleModel.setUpdateManNo("Systems");
+                        scaleModel.setUpdateManName("自助计量结净更新");
+                        scaleModel.setUpdateTime(new Date());
+                        scaleModel.setUploadFlag("1");
+                        scaleModel.setPredictionType("1");
+                        preRailwayScaleMapper.updateByPrimaryKeySelective(scaleModel);
+                    }
+                }
+            }else {
+                if(com.getOne().getPredictionNo() != null && StringUtils.isNotEmpty(com.getOne().getPredictionNo())) {
+                    PreRailwayScale scaleModel = preRailwayScaleMapper.selectByPrimaryKey(com.getOne().getPredictionNo());
+                    scaleModel.setValueFlag("4");
+                    scaleModel.setUpdateManNo("Systems");
+                    scaleModel.setUpdateManName("自助计量结净更新");
+                    scaleModel.setUpdateTime(new Date());
+                    scaleModel.setUploadFlag("1");
+                    scaleModel.setPredictionType("1");
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(scaleModel);
+                }
+            }
+
+            if(com.getFour() != null) {
+                com.getFour().setHelpId(sdf.format(new Date()) + meterWorkRailwayScheduledHelpMapper.getNewID(sdf.format(new Date())));
+                meterWorkRailwayScheduledHelpMapper.insertSelective(com.getFour());
+            }
+
+            map.put("firsts", firsts);
+            map.put("actuals", actuals);
+            rm.setSucceed();
+            rm.setData(map);
+            rm.setMessage("操作成功");
+        }catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
+        }
+        return rm;
     }
 
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -8,6 +8,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.service.IMeterWorkRailwayReceivedService;
+import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -48,6 +49,9 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             RESTfulResult rm = new RESTfulResult();
             rm.setCode("200");
             rm.setData(model.getActualFirstNo());
+            if(model.getRailwayNo() == null && StringUtils.isEmpty(model.getRailwayNo())) {
+                model.setRailwayNo("车号异常");
+            }
 //            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 //            String afl = sdf.format(new Date());
 //            String no = meterWorkRailwayReceivedMapper.getNewID(afl);