后端修改

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.xml

@@ -19,25 +19,27 @@
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
     <result column="METER_NUM" jdbcType="DECIMAL" property="meterNum" />
     <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight" />
+    <result column="SPOT_AREA_NO" jdbcType="VARCHAR" property="spotAreaNo" />
+    <result column="SPOT_AREA_NAME" jdbcType="VARCHAR" property="spotAreaName" />
   </resultMap>
   <sql id="columns">
     DATA_NO, BASE_SPOT_NO, BASE_SPOT_NAME, CAR_NO, METER_NAME, METER_TIME, START_TIME, 
     END_TIME, WARN_TIME, UP_WEIGHT, AVG_WEIGHT, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
-    CREATE_TIME, METER_NUM, METER_WEIGHT
+    CREATE_TIME, METER_NUM, METER_WEIGHT, SPOT_AREA_NO, SPOT_AREA_NAME
   </sql>
   <sql id="columns_alias">
     t.DATA_NO, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.CAR_NO, t.METER_NAME, t.METER_TIME, 
     t.START_TIME, t.END_TIME, t.WARN_TIME, t.UP_WEIGHT, t.AVG_WEIGHT, t.VALUE_FLAG, t.CREATE_MAN_NO, 
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.METER_NUM, t.METER_WEIGHT
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.METER_NUM, t.METER_WEIGHT, t.SPOT_AREA_NO, t.SPOT_AREA_NAME
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_TERM_TARE_DATA
+    SELECT <include refid="columns" /> FROM METER_BASE_TERM_TARE_DATA
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_TERM_TARE_DATA t
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_TERM_TARE_DATA t
   </sql>
   <sql id="where">
-    <where>
+    <where> 
       <if test="dataNo != null and dataNo != ''">
         and DATA_NO = #{dataNo}
       </if>
@@ -89,10 +91,16 @@
       <if test="meterWeight != null">
         and METER_WEIGHT = #{meterWeight}
       </if>
+      <if test="spotAreaNo != null and spotAreaNo != ''">
+        and SPOT_AREA_NO = #{spotAreaNo}
+      </if>
+      <if test="spotAreaName != null and spotAreaName != ''">
+        and SPOT_AREA_NAME = #{spotAreaName}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where>
+    <where> 
       <if test="dataNo != null and dataNo != ''">
         and DATA_NO LIKE '%${dataNo}%'
       </if>
@@ -144,6 +152,12 @@
       <if test="meterWeight != null">
         and METER_WEIGHT = #{meterWeight}
       </if>
+      <if test="spotAreaNo != null and spotAreaNo != ''">
+        and SPOT_AREA_NO LIKE '%${spotAreaNo}%'
+      </if>
+      <if test="spotAreaName != null and spotAreaName != ''">
+        and SPOT_AREA_NAME LIKE '%${spotAreaName}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -201,6 +215,12 @@
       <if test="meterWeight != null">
         or METER_WEIGHT = #{meterWeight}
       </if>
+      <if test="spotAreaNo != null and spotAreaNo != ''">
+        or SPOT_AREA_NO = #{spotAreaNo}
+      </if>
+      <if test="spotAreaName != null and spotAreaName != ''">
+        or SPOT_AREA_NAME = #{spotAreaName}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasetermtaredata.model.MeterBaseTermTareData">
     insert into METER_BASE_TERM_TARE_DATA (DATA_NO, BASE_SPOT_NO, BASE_SPOT_NAME, 
@@ -208,13 +228,15 @@
       START_TIME, END_TIME, WARN_TIME, 
       UP_WEIGHT, AVG_WEIGHT, VALUE_FLAG, 
       CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      METER_NUM, METER_WEIGHT)
+      METER_NUM, METER_WEIGHT, SPOT_AREA_NO, 
+      SPOT_AREA_NAME)
     values (#{dataNo,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
       #{carNo,jdbcType=VARCHAR}, #{meterName,jdbcType=VARCHAR}, #{meterTime,jdbcType=TIMESTAMP}, 
       #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{warnTime,jdbcType=TIMESTAMP}, 
       #{upWeight,jdbcType=DECIMAL}, #{avgWeight,jdbcType=DECIMAL}, #{valueFlag,jdbcType=VARCHAR}, 
       #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{meterNum,jdbcType=DECIMAL}, #{meterWeight,jdbcType=DECIMAL})
+      #{meterNum,jdbcType=DECIMAL}, #{meterWeight,jdbcType=DECIMAL}, #{spotAreaNo,jdbcType=VARCHAR}, 
+      #{spotAreaName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasetermtaredata.model.MeterBaseTermTareData">
     insert into METER_BASE_TERM_TARE_DATA
@@ -270,6 +292,12 @@
       <if test="meterWeight != null">
         METER_WEIGHT,
       </if>
+      <if test="spotAreaNo != null">
+        SPOT_AREA_NO,
+      </if>
+      <if test="spotAreaName != null">
+        SPOT_AREA_NAME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="dataNo != null">
@@ -323,6 +351,12 @@
       <if test="meterWeight != null">
         #{meterWeight,jdbcType=DECIMAL},
       </if>
+      <if test="spotAreaNo != null">
+        #{spotAreaNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotAreaName != null">
+        #{spotAreaName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasetermtaredata.model.MeterBaseTermTareData">
@@ -342,7 +376,9 @@
       CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       METER_NUM = #{meterNum,jdbcType=DECIMAL},
-      METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL}
+      METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      SPOT_AREA_NO = #{spotAreaNo,jdbcType=VARCHAR},
+      SPOT_AREA_NAME = #{spotAreaName,jdbcType=VARCHAR}
     where DATA_NO = #{dataNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasetermtaredata.model.MeterBaseTermTareData">
@@ -396,22 +432,26 @@
       <if test="meterWeight != null">
         METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
       </if>
+      <if test="spotAreaNo != null">
+        SPOT_AREA_NO = #{spotAreaNo,jdbcType=VARCHAR},
+      </if>
+      <if test="spotAreaName != null">
+        SPOT_AREA_NAME = #{spotAreaName,jdbcType=VARCHAR},
+      </if>
     </set>
     where DATA_NO = #{dataNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where DATA_NO = #{dataNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by CREATE_TIME  desc
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by CREATE_TIME  desc
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_BASE_TERM_TARE_DATA 
@@ -421,7 +461,8 @@
       END_TIME, WARN_TIME, UP_WEIGHT, 
       AVG_WEIGHT, VALUE_FLAG, CREATE_MAN_NO, 
       CREATE_MAN_NAME, CREATE_TIME, 
-      METER_NUM, METER_WEIGHT)
+      METER_NUM, METER_WEIGHT, SPOT_AREA_NO, 
+      SPOT_AREA_NAME)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.dataNo,jdbcType=VARCHAR}, 
@@ -430,89 +471,98 @@
       #{item.endTime,jdbcType=TIMESTAMP}, #{item.warnTime,jdbcType=TIMESTAMP}, #{item.upWeight,jdbcType=DECIMAL}, 
       #{item.avgWeight,jdbcType=DECIMAL}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
       #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.meterNum,jdbcType=DECIMAL}, #{item.meterWeight,jdbcType=DECIMAL} from dual  
+      #{item.meterNum,jdbcType=DECIMAL}, #{item.meterWeight,jdbcType=DECIMAL}, #{item.spotAreaNo,jdbcType=VARCHAR}, 
+      #{item.spotAreaName,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
      update METER_BASE_TERM_TARE_DATA
      set
        DATA_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.dataNo,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
        </foreach>
        ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
        </foreach>
        ,METER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterName,jdbcType=VARCHAR}
        </foreach>
        ,METER_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterTime,jdbcType=TIMESTAMP}
        </foreach>
        ,START_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.startTime,jdbcType=TIMESTAMP}
        </foreach>
        ,END_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.endTime,jdbcType=TIMESTAMP}
        </foreach>
        ,WARN_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.warnTime,jdbcType=TIMESTAMP}
        </foreach>
        ,UP_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.upWeight,jdbcType=DECIMAL}
        </foreach>
        ,AVG_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.avgWeight,jdbcType=DECIMAL}
        </foreach>
        ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
        </foreach>
        ,METER_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterNum,jdbcType=DECIMAL}
        </foreach>
        ,METER_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case DATA_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
           when #{item.dataNo,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
        </foreach>
+       ,SPOT_AREA_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.spotAreaNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SPOT_AREA_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.spotAreaName,jdbcType=VARCHAR}
+       </foreach>
      where DATA_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.dataNo,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_TERM_TARE_DATA
     where DATA_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -605,6 +655,12 @@
   <select id="selectWhereCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select * from METER_BASE_TERM_TARE_DATA
     where CAR_NO = '${carNo}'
+    <if test="spotAreaNo != null and spotAreaNo != ''">
+      and SPOT_AREA_NO = #{spotAreaNo}
+    </if>
+    <if test="spotAreaName != null and spotAreaName != ''">
+      and SPOT_AREA_NAME = #{spotAreaName}
+    </if>
     ORDER BY CREATE_TIME desc
   </select>
 
@@ -619,12 +675,13 @@
   <select id = "getTermTareData" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 = 1
-        <if test="carNo != null and carNo != ''">
-          and car_No = #{carNo}
-        </if>
-        and rownum = 1
-        and value_flag = '0'
-        and end_time >= sysdate
+    <if test="carNo != null and carNo != ''">
+      and car_No = #{carNo}
+    </if>
+    and rownum = 1
+    and value_flag = '0'
+    and end_time >= sysdate
     order by create_time desc
   </select>
+  
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/model/MeterBaseTermTareData.java

@@ -1,16 +1,18 @@
 package com.steerinfo.baseinfo.meterbasetermtaredata.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;
 
+@ApiModel(value="期限皮重数据维护表")
 public class MeterBaseTermTareData implements IBasePO<String> {
     /**
-     * 数据编号(DATA_NO,VARCHAR,20)
+     * 数据编号（YYYYMMDD+4位流水）(DATA_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="数据编号",required=true)
+    @ApiModelProperty(value="数据编号（YYYYMMDD+4位流水）",required=true)
     private String dataNo;
 
     /**
@@ -34,49 +36,49 @@ public class MeterBaseTermTareData implements IBasePO<String> {
     /**
      * 皮重计量员(METER_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="皮重计量员",required=true)
+    @ApiModelProperty(value="皮重计量员",required=false)
     private String meterName;
 
     /**
-     * 皮重计量时间(METER_TIME,TIMESTAMP,7)
+     * 皮重计量时间(YYYY-MM-DD HH:mm:ss)(METER_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="皮重计量时间",required=true)
+    @ApiModelProperty(value="皮重计量时间(YYYY-MM-DD HH:mm:ss)",required=true)
     private Date meterTime;
 
     /**
-     * 有效开始时间(START_TIME,TIMESTAMP,7)
+     * 有效开始时间(YYYY-MM-DD HH:mm:ss)(START_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="有效开始时间",required=true)
+    @ApiModelProperty(value="有效开始时间(YYYY-MM-DD HH:mm:ss)",required=true)
     private Date startTime;
 
     /**
-     * 有效结束时间(END_TIME,TIMESTAMP,7)
+     * 有效结束时间(YYYY-MM-DD HH:mm:ss)(END_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="有效结束时间",required=true)
+    @ApiModelProperty(value="有效结束时间(YYYY-MM-DD HH:mm:ss)",required=true)
     private Date endTime;
 
     /**
-     * 提醒留皮时间(WARN_TIME,TIMESTAMP,7)
+     * 提醒留皮时间(YYYY-MM-DD HH:mm:ss)(WARN_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="提醒留皮时间",required=true)
+    @ApiModelProperty(value="提醒留皮时间(YYYY-MM-DD HH:mm:ss)",required=true)
     private Date warnTime;
 
     /**
-     * 上一次皮重(UP_WEIGHT,DECIMAL,10)
+     * 上一次皮重(KG)(UP_WEIGHT,DECIMAL,10)
      */
-    @ApiModelProperty(value="上一次皮重",required=true)
+    @ApiModelProperty(value="上一次皮重(KG)",required=false)
     private Long upWeight;
 
     /**
-     * 平均皮重(AVG_WEIGHT,DECIMAL,10)
+     * 平均皮重(KG)(AVG_WEIGHT,DECIMAL,10)
      */
-    @ApiModelProperty(value="平均皮重",required=true)
+    @ApiModelProperty(value="平均皮重(KG)",required=false)
     private Long avgWeight;
 
     /**
-     * 状态(VALUE_FLAG,VARCHAR,1)
+     * 状态(0：有效；1：无效)(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态",required=true)
+    @ApiModelProperty(value="状态(0：有效；1：无效)",required=true)
     private String valueFlag;
 
     /**
@@ -92,23 +94,35 @@ public class MeterBaseTermTareData implements IBasePO<String> {
     private String createManName;
 
     /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     * 创建时间(YYYY-MM-DD HH:mm:SS)(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="创建时间",required=true)
+    @ApiModelProperty(value="创建时间(YYYY-MM-DD HH:mm:SS)",required=true)
     private Date createTime;
 
     /**
      * 皮重次数(METER_NUM,DECIMAL,10)
      */
-    @ApiModelProperty(value="皮重次数",required=true)
+    @ApiModelProperty(value="皮重次数",required=false)
     private Long meterNum;
 
     /**
-     * 皮重数据(METER_WEIGHT,DECIMAL,10)
+     * 皮重数据(KG)(METER_WEIGHT,DECIMAL,10)
      */
-    @ApiModelProperty(value="皮重数据",required=true)
+    @ApiModelProperty(value="皮重数据(KG)",required=true)
     private BigDecimal meterWeight;
 
+    /**
+     * 计量点所属区域编码(SPOT_AREA_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点所属区域编码",required=false)
+    private String spotAreaNo;
+
+    /**
+     * 计量点所属区域名称(SPOT_AREA_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点所属区域名称",required=false)
+    private String spotAreaName;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -257,6 +271,22 @@ public class MeterBaseTermTareData implements IBasePO<String> {
         this.meterWeight = meterWeight;
     }
 
+    public String getSpotAreaNo() {
+        return spotAreaNo;
+    }
+
+    public void setSpotAreaNo(String spotAreaNo) {
+        this.spotAreaNo = spotAreaNo == null ? null : spotAreaNo.trim();
+    }
+
+    public String getSpotAreaName() {
+        return spotAreaName;
+    }
+
+    public void setSpotAreaName(String spotAreaName) {
+        this.spotAreaName = spotAreaName == null ? null : spotAreaName.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -280,6 +310,8 @@ public class MeterBaseTermTareData implements IBasePO<String> {
         sb.append(", createTime=").append(createTime);
         sb.append(", meterNum=").append(meterNum);
         sb.append(", meterWeight=").append(meterWeight);
+        sb.append(", spotAreaNo=").append(spotAreaNo);
+        sb.append(", spotAreaName=").append(spotAreaName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -8,6 +8,8 @@ import com.steerinfo.baseinfo.meterbasehistaredetail.mapper.MeterBaseHisTareDeta
 import com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
+import com.steerinfo.baseinfo.meterbasespotinfo.mapper.MeterBaseSpotInfoMapper;
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.baseinfo.meterbasetermtarecar.mapper.MeterBaseTermTareCarMapper;
 import com.steerinfo.baseinfo.meterbasetermtarecar.model.MeterBaseTermTareCar;
 import com.steerinfo.baseinfo.meterbasetermtaretime.mapper.MeterBaseTermTareTimeMapper;
@@ -61,6 +63,9 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
     @Resource
     private MeterBaseCarMapper meterBaseCarMapper;
 
+    @Resource
+    private MeterBaseSpotInfoMapper meterBaseSpotInfoMapper;
+
     @Resource
     private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
 
@@ -322,14 +327,19 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
             }
 
             //根据车号查询期限表的期限皮重信息
+            MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(modelTemp.getBaseSpotNo());
             HashMap<String, Object> map = new HashMap();
             map.put("carNo", carNo);
+            map.put("spotAreaNo", spotInfo.getSpotAreaNo());
+            map.put("spotAreaName", spotInfo.getSpotAreaName());
             MeterBaseTermTareData modelTerm = meterBaseTermTareDataMapper.selectWhereCarNo(map);
             //设置数据编号
             MeterBaseTermTareData model = new MeterBaseTermTareData();
             //设置计量点编号、名称、车号
             model.setBaseSpotName(baseSpotName);
             model.setBaseSpotNo(baseSpotNo);
+            model.setSpotAreaNo(spotInfo.getSpotAreaNo());
+            model.setSpotAreaName(spotInfo.getSpotAreaName());
             model.setCarNo(carNo);
             //设置皮重时间、开始时间、结束时间、提醒留皮时间
             HashMap<String, Object> tareTimemap = new HashMap();
@@ -428,31 +438,34 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
-            HashMap<String, Object> map = new HashMap<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             parmas.put("valueFlag", "0");
             List<MeterBaseTermTareData> models = meterBaseTermTareDataMapper.selectByParameters(parmas);
-
             if(models.size() >= 1) {
-                MeterBaseTermTareData model = models.get(0);
-                //判断期限皮过期时间
-                Date startTime = sdf.parse(sdf.format(model.getEndTime()));
-                Date endTime = sdf.parse(sdf.format(new Date()));
-                long from = startTime.getTime();
-                long to = endTime.getTime();
-                int day = (int)(from - to)/(60*60*24*1000);
-                int hour = (int)(from - to)/(60*60*1000);
-                int minutes = (int)(from - to)/(60*1000) - (hour*60);
-                if(startTime.compareTo(endTime) > 0) {
-                    map.put("flag", "1");
-                }else {
-                    map.put("flag", "0");
+                //MeterBaseTermTareData model = models.get(0);
+                List<HashMap> maps = new ArrayList<>();
+                for(MeterBaseTermTareData model: models) {
+                    //判断期限皮过期时间
+                    HashMap<String, Object> map = new HashMap<>();
+                    Date startTime = sdf.parse(sdf.format(model.getEndTime()));
+                    Date endTime = sdf.parse(sdf.format(new Date()));
+                    long from = startTime.getTime();
+                    long to = endTime.getTime();
+                    int day = (int)(from - to)/(60*60*24*1000);
+                    int hour = (int)(from - to)/(60*60*1000);
+                    int minutes = (int)(from - to)/(60*1000) - (hour*60);
+                    if(startTime.compareTo(endTime) > 0) {
+                        map.put("flag", "1");
+                    }else {
+                        map.put("flag", "0");
+                    }
+                    map.put("model", model);
+                    map.put("day", abs(day));
+                    map.put("hour", abs(hour));
+                    map.put("minutes", abs(minutes));
+                    maps.add(map);
                 }
-                map.put("model", model);
-                map.put("day", abs(day));
-                map.put("hour", abs(hour));
-                map.put("minutes", abs(minutes));
-                rm.setData(map);
+                rm.setData(maps);
                 rm.setSucceed();
                 rm.setMessage("操作成功");
                 rm.setCode("200");

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -1373,7 +1373,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         logModel.setCreateManName(userName);
         logModel.setCreateTime(new Date());
         logModel.setOperationPage("web端-汽车衡净重数据维护");
-        logModel.setOperationFunction("毛皮分解");
+        logModel.setOperationFunction("撤销委托");
         logModel.setOperationId(mwcaquery.getActualNo());
         logModel.setOperationPredictionNo(mwcaquery.getPredictionNo());
         logModel.setOperationCarnNo(mwcaquery.getCarNo());

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -5406,8 +5406,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
 
             //新增期限皮重信息
+            MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(tareModel.getBaseSpotNo());
             HashMap<String, Object> map = new HashMap<>();
             map.put("carNo", tareModel.getCarNo());
+            map.put("spotAreaNo", spotInfo.getSpotAreaNo());
+            map.put("spotAreaName", spotInfo.getSpotAreaName());
             List<MeterBaseTermTareData> upModels = meterBaseTermTareDataMapper.selectByParameters(map);
             MeterBaseTermTareData termData = new MeterBaseTermTareData();
             if (upModels.size() >= 1) {
@@ -5416,6 +5419,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if (termData.getDataNo() != null) {
                 termData.setBaseSpotNo(tareModel.getBaseSpotNo());
                 termData.setBaseSpotName(tareModel.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
                 termData.setMeterTime(tareModel.getCreateTime());
@@ -5441,6 +5446,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 termData.setDataNo(sdf.format(new Date()) + no);
                 termData.setBaseSpotNo(tareModel.getBaseSpotNo());
                 termData.setBaseSpotName(tareModel.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
                 termData.setMeterTime(tareModel.getCreateTime());
@@ -6487,8 +6494,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             doSaveHisTare(tareFirst01);
 
             //保存期限皮重信息
+            MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(tareModel.getBaseSpotNo());
             HashMap<String, Object> map = new HashMap<>();
             map.put("carNo", tareModel.getCarNo());
+            map.put("spotAreaNo", spotInfo.getSpotAreaNo());
+            map.put("spotAreaName", spotInfo.getSpotAreaName());
             List<MeterBaseTermTareData> upModels = meterBaseTermTareDataMapper.selectByParameters(map);
             MeterBaseTermTareData termData = new MeterBaseTermTareData();
             if (upModels.size() >= 1) {
@@ -6497,6 +6507,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if (termData.getDataNo() != null) {
                 termData.setBaseSpotNo(tareModel.getBaseSpotNo());
                 termData.setBaseSpotName(tareModel.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
                 termData.setMeterTime(tareModel.getCreateTime());
@@ -6516,6 +6528,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 termData.setDataNo(sdf.format(new Date()) + no1);
                 termData.setBaseSpotNo(tareModel.getBaseSpotNo());
                 termData.setBaseSpotName(tareModel.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
                 termData.setMeterTime(tareModel.getCreateTime());
@@ -6781,8 +6795,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.insertSelective(tare);
 
             //将皮重数据保存或更新到期限皮中
+            MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(tare.getBaseSpotNo());
             HashMap<String, Object> map = new HashMap<>();
             map.put("carNo", tare.getCarNo());
+            map.put("spotAreaNo", spotInfo.getSpotAreaNo());
+            map.put("spotAreaName", spotInfo.getSpotAreaName());
             List<MeterBaseTermTareData> upModels = meterBaseTermTareDataMapper.selectByParameters(map);
             MeterBaseTermTareData termData = new MeterBaseTermTareData();
             if (upModels.size() >= 1) {
@@ -6791,6 +6808,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if (termData.getDataNo() != null) {
                 termData.setBaseSpotNo(tare.getBaseSpotNo());
                 termData.setBaseSpotName(tare.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tare.getCarNo());
                 termData.setMeterName(tare.getCreateManName());
                 termData.setMeterTime(tare.getCreateTime());
@@ -6810,6 +6829,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 termData.setDataNo(sdf.format(new Date()) + no1);
                 termData.setBaseSpotNo(tare.getBaseSpotNo());
                 termData.setBaseSpotName(tare.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tare.getCarNo());
                 termData.setMeterName(tare.getCreateManName());
                 termData.setMeterTime(tare.getCreateTime());
@@ -6966,8 +6987,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.insertSelective(tare);
 
             //将皮重数据保存或更新到期限皮中
+            MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(tare.getBaseSpotNo());
             HashMap<String, Object> map = new HashMap<>();
             map.put("carNo", tare.getCarNo());
+            map.put("spotAreaNo", spotInfo.getSpotAreaNo());
+            map.put("spotAreaName", spotInfo.getSpotAreaName());
             List<MeterBaseTermTareData> upModels = meterBaseTermTareDataMapper.selectByParameters(map);
             MeterBaseTermTareData termData = new MeterBaseTermTareData();
             if (upModels.size() >= 1) {
@@ -6976,6 +7000,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if (termData.getDataNo() != null) {
                 termData.setBaseSpotNo(tare.getBaseSpotNo());
                 termData.setBaseSpotName(tare.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tare.getCarNo());
                 termData.setMeterName(tare.getCreateManName());
                 termData.setMeterTime(tare.getCreateTime());
@@ -6995,6 +7021,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 termData.setDataNo(sdf.format(new Date()) + no1);
                 termData.setBaseSpotNo(tare.getBaseSpotNo());
                 termData.setBaseSpotName(tare.getBaseSpotName());
+                termData.setSpotAreaNo(spotInfo.getSpotAreaNo());
+                termData.setSpotAreaName(spotInfo.getSpotAreaName());
                 termData.setCarNo(tare.getCarNo());
                 termData.setMeterName(tare.getCreateManName());
                 termData.setMeterTime(tare.getCreateTime());
@@ -7022,7 +7050,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
 //                String actualNo = afl1 + imTareNO;
                 String actualNo = PublicMethod.IdCreate(3);
-
                 imTare.setActualFirstNo(actualNo);
                 imTare.setMeterTypeNo(tare.getMeterTypeNo());
                 imTare.setMeterTypeName(tare.getMeterTypeName());

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

@@ -410,8 +410,33 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (model.getPredictionNo() != null && model.getPredictionNo().equals("")) {
                 throw new MarkerMetException(500, "已匹配委托的数据不可再废除!!");
             }
+
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
+
             model.setValueFlag("0");
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationFunction("作废");
+            logModel.setOperationId(model.getActualFirstNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
             if (model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if (scale != null && StringUtils.isNotEmpty(scale.getPredictionNo())) {
@@ -425,6 +450,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                 }
             }
+            
             return num;
         } catch (MarkerMetException e) {
             throw e;
@@ -442,6 +468,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (model.getValueFlag().equals(DbConstants.NET)) {
                 throw new MarkerMetException(500, "该状态无法启用");
             }
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             HashMap map = new HashMap();
             map.put("actualFirstNo", model.getActualFirstNo());
             List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.selectByAcatualFristNo(map);
@@ -473,6 +509,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }*/
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
 
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationFunction("启用");
+            logModel.setOperationId(model.getActualFirstNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if (scale != null && StringUtils.isNotEmpty(scale.getPredictionNo())) {
@@ -499,7 +547,34 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     public int updateCar(MeterWorkRailwayActFirst model) {
         try {
             ckeckcar(model);
+
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
+            MeterWorkRailwayActFirst modelTemp = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationFunction("车号修改");
+            logModel.setOperationId(model.getActualFirstNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            logModel.setOperationBeforeFix(modelTemp.getRailwayNo());
+            logModel.setOperationAfterFix(model.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
             return num;
         } catch (MarkerMetException e) {
             throw e;
@@ -3494,6 +3569,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 throw new MarkerMetException(500, "该条数据还未匹配！！");
             }
 
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
+
             PreRailwayScale pls = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             if (pls.getValueFlag().equals("9")) {
                 throw new MarkerMetException(500, "该条数据匹配的委托已结算不能解除委托！！");
@@ -3508,6 +3594,20 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             mwcaf.setValueFlag("1");
             mwcaf.setIsPreSacale("0");
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationFunction("撤销委托");
+            logModel.setOperationId(model.getActualFirstNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            logModel.setOperationBeforeFix(model.toString());
+            logModel.setOperationAfterFix(mwcaf.toString());
+            meterBaseOperationLogMapper.insertSelective(logModel);
             return num;
         } catch (MarkerMetException e) {
             throw e;
@@ -3602,7 +3702,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             logModel.setCreateManNo(userId);
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
-            logModel.setOperationPage("一次数据维护");
+            logModel.setOperationPage("Web端-静轨一次数据维护");
             logModel.setOperationFunction("匹配委托");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(predictionNo);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -534,10 +534,10 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
                 rm.setMessage("一次数据编号不能为空！！");
                 return rm;
             }
-            if(com.steerinfo.util.StringUtils.isEmpty(Notes)){
-                rm.setMessage("异地计量原因不能为空！！");
-                return rm;
-            }
+//            if(com.steerinfo.util.StringUtils.isEmpty(Notes)){
+//                rm.setMessage("异地计量原因不能为空！！");
+//                return rm;
+//            }
             rm = meterWorkRailwayActualService.cleanByfirstNoAndNotes(actFirstNo01, actFirstNo02, predictionNo, Notes);
             return rm;
         } catch (MarkerMetException e) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -570,6 +570,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
+
             //勾选的两个一次数据为空，报错
             if((actFirstNo01 == null || StringUtils.isEmpty(actFirstNo01)) || (actFirstNo02 == null || StringUtils.isEmpty(actFirstNo02))) {
                 rm.setMessage("未选择两个一次记录");