提交修改

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.xml

@@ -11,14 +11,29 @@
     <result column="METER_MAN_NO" jdbcType="VARCHAR" property="meterManNo" />
     <result column="METER_MAN_NAME" jdbcType="VARCHAR" property="meterManName" />
     <result column="METER_NOTE_SOURCE" jdbcType="VARCHAR" property="meterNoteSource" />
+    <result column="NOTE_TYPE_NO" jdbcType="VARCHAR" property="noteTypeNo" />
+    <result column="NOTE_TYPE_NAME" jdbcType="VARCHAR" property="noteTypeName" />
+    <result column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <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="MONITOR_NOTE" jdbcType="VARCHAR" property="monitorNote" />
   </resultMap>
   <sql id="columns">
     NOTE_NO, BASE_SPOT_NO, BASE_SPOT_NAME, OPERATION_CONTENT, OPERATION_TIME, CAR_NO, 
-    METER_MAN_NO, METER_MAN_NAME, METER_NOTE_SOURCE
+    METER_MAN_NO, METER_MAN_NAME, METER_NOTE_SOURCE, NOTE_TYPE_NO, NOTE_TYPE_NAME, PREDICTION_NO, 
+    MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+    UPDATE_TIME, MONITOR_NOTE
   </sql>
   <sql id="columns_alias">
     t.NOTE_NO, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.OPERATION_CONTENT, t.OPERATION_TIME, 
-    t.CAR_NO, t.METER_MAN_NO, t.METER_MAN_NAME, t.METER_NOTE_SOURCE
+    t.CAR_NO, t.METER_MAN_NO, t.METER_MAN_NAME, t.METER_NOTE_SOURCE, t.NOTE_TYPE_NO, 
+    t.NOTE_TYPE_NAME, t.PREDICTION_NO, t.MEMO, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, 
+    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MONITOR_NOTE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_MONITOR_NOTE
@@ -28,6 +43,9 @@
   </sql>
   <sql id="where">
     <where> 
+      <if test="noteNo != null and noteNo != ''">
+        and NOTE_NO = #{noteNo}
+      </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and BASE_SPOT_NO = #{baseSpotNo}
       </if>
@@ -52,10 +70,46 @@
       <if test="meterNoteSource != null and meterNoteSource != ''">
         and METER_NOTE_SOURCE = #{meterNoteSource}
       </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO = #{noteTypeNo}
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME = #{noteTypeName}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </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="monitorNote != null and monitorNote != ''">
+        and MONITOR_NOTE = #{monitorNote}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
     <where> 
+      <if test="noteNo != null and noteNo != ''">
+        and NOTE_NO LIKE '%${noteNo}%'
+      </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
       </if>
@@ -80,6 +134,39 @@
       <if test="meterNoteSource != null and meterNoteSource != ''">
         and METER_NOTE_SOURCE LIKE '%${meterNoteSource}%'
       </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        and NOTE_TYPE_NO LIKE '%${noteTypeNo}%'
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        and NOTE_TYPE_NAME LIKE '%${noteTypeName}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </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="monitorNote != null and monitorNote != ''">
+        and MONITOR_NOTE LIKE '%${monitorNote}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -113,16 +200,55 @@
       <if test="meterNoteSource != null and meterNoteSource != ''">
         or METER_NOTE_SOURCE = #{meterNoteSource}
       </if>
+      <if test="noteTypeNo != null and noteTypeNo != ''">
+        or NOTE_TYPE_NO = #{noteTypeNo}
+      </if>
+      <if test="noteTypeName != null and noteTypeName != ''">
+        or NOTE_TYPE_NAME = #{noteTypeName}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        or PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </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="monitorNote != null and monitorNote != ''">
+        or MONITOR_NOTE = #{monitorNote}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote">
     insert into METER_MONITOR_NOTE (NOTE_NO, BASE_SPOT_NO, BASE_SPOT_NAME, 
       OPERATION_CONTENT, OPERATION_TIME, CAR_NO, 
-      METER_MAN_NO, METER_MAN_NAME, METER_NOTE_SOURCE
-      )
+      METER_MAN_NO, METER_MAN_NAME, METER_NOTE_SOURCE, 
+      NOTE_TYPE_NO, NOTE_TYPE_NAME, PREDICTION_NO, 
+      MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, MONITOR_NOTE)
     values (#{noteNo,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
-      #{operationContent,jdbcType=VARCHAR},#{operationTime,jdbcType=VARCHAR},#{carNo,jdbcType=VARCHAR},
-      #{meterManNo,jdbcType=VARCHAR}, #{meterManName,jdbcType=VARCHAR}, #{meterNoteSource,jdbcType=VARCHAR}
-      )
+      #{operationContent,jdbcType=VARCHAR}, #{operationTime,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
+      #{meterManNo,jdbcType=VARCHAR}, #{meterManName,jdbcType=VARCHAR}, #{meterNoteSource,jdbcType=VARCHAR}, 
+      #{noteTypeNo,jdbcType=VARCHAR}, #{noteTypeName,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, 
+      #{memo,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{monitorNote,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote">
     insert into METER_MONITOR_NOTE
@@ -154,6 +280,39 @@
       <if test="meterNoteSource != null">
         METER_NOTE_SOURCE,
       </if>
+      <if test="noteTypeNo != null">
+        NOTE_TYPE_NO,
+      </if>
+      <if test="noteTypeName != null">
+        NOTE_TYPE_NAME,
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </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="monitorNote != null">
+        MONITOR_NOTE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="noteNo != null">
@@ -183,6 +342,39 @@
       <if test="meterNoteSource != null">
         #{meterNoteSource,jdbcType=VARCHAR},
       </if>
+      <if test="noteTypeNo != null">
+        #{noteTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeName != null">
+        #{noteTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </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="monitorNote != null">
+        #{monitorNote,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote">
@@ -194,7 +386,18 @@
       CAR_NO = #{carNo,jdbcType=VARCHAR},
       METER_MAN_NO = #{meterManNo,jdbcType=VARCHAR},
       METER_MAN_NAME = #{meterManName,jdbcType=VARCHAR},
-      METER_NOTE_SOURCE = #{meterNoteSource,jdbcType=VARCHAR}
+      METER_NOTE_SOURCE = #{meterNoteSource,jdbcType=VARCHAR},
+      NOTE_TYPE_NO = #{noteTypeNo,jdbcType=VARCHAR},
+      NOTE_TYPE_NAME = #{noteTypeName,jdbcType=VARCHAR},
+      PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      MONITOR_NOTE = #{monitorNote,jdbcType=VARCHAR}
     where NOTE_NO = #{noteNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote">
@@ -224,6 +427,39 @@
       <if test="meterNoteSource != null">
         METER_NOTE_SOURCE = #{meterNoteSource,jdbcType=VARCHAR},
       </if>
+      <if test="noteTypeNo != null">
+        NOTE_TYPE_NO = #{noteTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noteTypeName != null">
+        NOTE_TYPE_NAME = #{noteTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </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="monitorNote != null">
+        MONITOR_NOTE = #{monitorNote,jdbcType=VARCHAR},
+      </if>
     </set>
     where NOTE_NO = #{noteNo,jdbcType=VARCHAR}
   </update>
@@ -234,27 +470,31 @@
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="where"/>
-    order by  OPERATION_TIME desc
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
-    order by  OPERATION_TIME desc
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_MONITOR_NOTE 
       (NOTE_NO, 
       BASE_SPOT_NO, BASE_SPOT_NAME, OPERATION_CONTENT, 
       OPERATION_TIME, CAR_NO, METER_MAN_NO, 
-      METER_MAN_NAME, METER_NOTE_SOURCE
-      )
+      METER_MAN_NAME, METER_NOTE_SOURCE, 
+      NOTE_TYPE_NO, NOTE_TYPE_NAME, PREDICTION_NO, 
+      MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, MONITOR_NOTE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.noteNo,jdbcType=VARCHAR}, 
       #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.operationContent,jdbcType=VARCHAR}, 
       #{item.operationTime,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.meterManNo,jdbcType=VARCHAR}, 
-      #{item.meterManName,jdbcType=VARCHAR}, #{item.meterNoteSource,jdbcType=VARCHAR}
-       from dual  
+      #{item.meterManName,jdbcType=VARCHAR}, #{item.meterNoteSource,jdbcType=VARCHAR}, 
+      #{item.noteTypeNo,jdbcType=VARCHAR}, #{item.noteTypeName,jdbcType=VARCHAR}, #{item.predictionNo,jdbcType=VARCHAR}, 
+      #{item.memo,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.monitorNote,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -296,6 +536,50 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
           when #{item.noteNo,jdbcType=VARCHAR} then #{item.meterNoteSource,jdbcType=VARCHAR}
        </foreach>
+       ,NOTE_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.noteTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.noteTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,PREDICTION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MONITOR_NOTE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case NOTE_NO" close="end">
+          when #{item.noteNo,jdbcType=VARCHAR} then #{item.monitorNote,jdbcType=VARCHAR}
+       </foreach>
      where NOTE_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.noteNo,jdbcType=VARCHAR}
@@ -310,55 +594,5 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(NOTE_NO, LENGTH(NOTE_NO) - 4))),0) + 1,5,'0') NOTE_NO
-    FROM METER_MONITOR_NOTE where instr(NOTE_NO,#{afl,jdbcType=VARCHAR})>0
-  </select>
-
-  <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    SELECT <include refid="columns"/> from METER_MONITOR_NOTE_VIEW
-    <where>
-      <if test="baseSpotNo != null and baseSpotNo != ''">
-        and BASE_SPOT_NO = #{baseSpotNo}
-      </if>
-      <if test="baseSpotName != null and baseSpotName != ''">
-        and BASE_SPOT_NAME = #{baseSpotName}
-      </if>
-      <if test="operationTime1 != null and operationTime1 != ''">
-        and OPERATION_TIME >= #{operationTime1}
-      </if>
-      <if test="operationTime2 != null and operationTime2!= ''">
-        and OPERATION_TIME &lt;= #{operationTime2}
-      </if>
-      <if test="meterNoteSource != null and meterNoteSource != ''">
-        and METER_NOTE_SOURCE = #{meterNoteSource}
-      </if>
-        and base_spot_no in
-       (select t1.base_spot_no
-        from METER_BASE_SPOT_INFO t1
-        where t1.spot_type_no = #{spotTypeNo})
-    </where>
-    order  by OPERATION_TIME desc
-  </select>
-
-  <select id="selectByTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    SELECT <include refid="columns"/> from METER_MONITOR_NOTE
-    where BASE_SPOT_NO = #{baseSpotNo} and CAR_NO = #{carNo}
-     and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') >= to_date(#{operationTime},'yyyy-mm-dd HH24:mi:ss')-3/24/60
-     and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') &lt;= to_date(#{operationTime},'yyyy-mm-dd HH24:mi:ss') + 1/(24*60)
-  </select>
-
-  <select id="selectByType" parameterType="java.lang.String" resultMap="BaseResultMap">
-    SELECT <include refid="columns"/> from METER_MONITOR_NOTE
-    <where>
-       1 = 1
-      <if test="meterNoteSource != null and meterNoteSource != ''">
-        and METER_NOTE_SOURCE = #{meterNoteSource}
-      </if>
-      and base_spot_no in
-      (select t1.base_spot_no
-         from METER_BASE_SPOT_INFO t1
-        where t1.spot_type_no = #{spotTypeNo})
-    </where>
-  </select>
+  
 </mapper>

src/main/java/com/steerinfo/metermonitor/metermonitornote/model/MeterMonitorNote.java

@@ -1,13 +1,16 @@
 package com.steerinfo.metermonitor.metermonitornote.model;
 
 import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 
+@ApiModel(value="计量操作日志表")
 public class MeterMonitorNote implements IBasePO<String> {
     /**
-     * 操作编号(NOTE_NO,VARCHAR,40)
+     * 操作编号(GUID)(NOTE_NO,VARCHAR,40)
      */
-    @ApiModelProperty(value="操作编号",required=true)
+    @ApiModelProperty(value="操作编号(GUID)",required=true)
     private String noteNo;
 
     /**
@@ -23,15 +26,15 @@ public class MeterMonitorNote implements IBasePO<String> {
     private String baseSpotName;
 
     /**
-     * 操作内容(OPERATION_CONTENT,VARCHAR,20)
+     * 操作内容|日志内容(OPERATION_CONTENT,VARCHAR,400)
      */
-    @ApiModelProperty(value="操作内容",required=true)
+    @ApiModelProperty(value="操作内容|日志内容",required=true)
     private String operationContent;
 
     /**
-     * 操作时间(OPERATION_TIME,VARCHAR,40)
+     * 操作时间|记录时间(YYYY-MM-DD HH:mm:SS)(OPERATION_TIME,VARCHAR,40)
      */
-    @ApiModelProperty(value="操作时间",required=true)
+    @ApiModelProperty(value="操作时间|记录时间(YYYY-MM-DD HH:mm:SS)",required=true)
     private String operationTime;
 
     /**
@@ -53,11 +56,77 @@ public class MeterMonitorNote implements IBasePO<String> {
     private String meterManName;
 
     /**
-     * 日志来源(METER_NOTE_SOURCE,VARCHAR,1)
+     * 日志来源(0智能计量终端,1自助取码终端,2计量监控终端 3微信小程序 4远程计量终端)(METER_NOTE_SOURCE,VARCHAR,1)
      */
-    @ApiModelProperty(value="日志来源",required=false)
+    @ApiModelProperty(value="日志来源(0智能计量终端,1自助取码终端,2计量监控终端 3微信小程序 4远程计量终端)",required=false)
     private String meterNoteSource;
 
+    /**
+     * 计量日志类型编码(NOTE_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量日志类型编码",required=false)
+    private String noteTypeNo;
+
+    /**
+     * 计量日志类型名称(NOTE_TYPE_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量日志类型名称",required=false)
+    private String noteTypeName;
+
+    /**
+     * 预报编号(PREDICTION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="预报编号",required=false)
+    private String predictionNo;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 监控界面提示信息(MONITOR_NOTE,VARCHAR,400)
+     */
+    @ApiModelProperty(value="监控界面提示信息",required=false)
+    private String monitorNote;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -142,6 +211,94 @@ public class MeterMonitorNote implements IBasePO<String> {
         this.meterNoteSource = meterNoteSource == null ? null : meterNoteSource.trim();
     }
 
+    public String getNoteTypeNo() {
+        return noteTypeNo;
+    }
+
+    public void setNoteTypeNo(String noteTypeNo) {
+        this.noteTypeNo = noteTypeNo == null ? null : noteTypeNo.trim();
+    }
+
+    public String getNoteTypeName() {
+        return noteTypeName;
+    }
+
+    public void setNoteTypeName(String noteTypeName) {
+        this.noteTypeName = noteTypeName == null ? null : noteTypeName.trim();
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    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 getMonitorNote() {
+        return monitorNote;
+    }
+
+    public void setMonitorNote(String monitorNote) {
+        this.monitorNote = monitorNote == null ? null : monitorNote.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -157,6 +314,17 @@ public class MeterMonitorNote implements IBasePO<String> {
         sb.append(", meterManNo=").append(meterManNo);
         sb.append(", meterManName=").append(meterManName);
         sb.append(", meterNoteSource=").append(meterNoteSource);
+        sb.append(", noteTypeNo=").append(noteTypeNo);
+        sb.append(", noteTypeName=").append(noteTypeName);
+        sb.append(", predictionNo=").append(predictionNo);
+        sb.append(", memo=").append(memo);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", monitorNote=").append(monitorNote);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -640,10 +640,10 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "车号汇总统计汇总", notes = "根据传入时间和车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime) {
+    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime, String dataSource) {
         RESTfulResult rm = failed();
         try {
-            List<String> rows = meterWorkCarActualService.distinctCarNo(carNo, startTime, endTime);
+            List<String> rows = meterWorkCarActualService.distinctCarNo(carNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3102,6 +3102,10 @@
        t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
        t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
        t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,
+       t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+       t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+       t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
+       t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
        t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
        t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
        t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
@@ -3115,6 +3119,10 @@
 
     <select id="manualAddPre" parameterType="java.lang.String" resultMap="BaseResultMap">
         select T3.prediction_no PREDICTION_NO, T3.notice_no NOTICE_NO, T3.car_no CAR_NO, T3.trailer_no TRAILER_NO, T3.matter_no MATTER_NO,
+               T3.voucher_identity, T3.voucher_item, T3.business_group, T3.temp_conveyance, T3.conveyance_type,
+               T3.resource_system, T3.group_package_amount, T3.group_package_unit, T3.package_amount,
+               T3.package_unit, T3.theory_amount, T3.measure_batch,T3.measure_batch_count,T3.sender_type,
+               T3.sender_remark,T3.receiver_type, T3.receiver_remark,T3.amount_unit,
                T3.matter_name MATTER_NAME, T3.contract_no CONTRACT_NO, T3.batch_no BATCH_NO, T3.customer_supplier_no CUSTOMER_SUPPLIER_NO,
                T3.customer_supplier_name CUSTOMER_SUPPLIER_NAME, T3.forwarding_unit_no FORWARDING_UNIT_NO, T3.forwarding_unit_name FORWARDING_UNIT_NAME,
                T3.receiving_uint_no RECEIVING_UINT_NO, T3.receiving_uint_name RECEIVING_UINT_NAME, T3.material_no MATERIAL_NO,
@@ -3135,6 +3143,10 @@
                t1.batch_no, t1.customer_supplier_no, t1.customer_supplier_name,
                t1.forwarding_unit_no, t1.forwarding_unit_name, t1.receiving_uint_no,
                t1.receiving_uint_name, t1.material_no, t1.material_name,
+               t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+               t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+               t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
+               t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
                t1.spec_no, t1.spec_name, t1.load_point_no, t1.load_point_name,
                t1.sample_no, t1.sample_voucher, t1.carrier_unit_no, t1.carrier_unit_name,
                t1.meter_type_no, t1.meter_type_name, t1.meter_process_no, t1.meter_process_edition_no,
@@ -3175,6 +3187,10 @@
        t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
        t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
        t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,
+       t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+       t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+       t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
+       t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
        t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
        t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
        t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
@@ -3369,6 +3385,9 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
+        <if test="dataSource != null and dataSource != null">
+            and  data_source = '${dataSource}'
+        </if>
     </select>
 
     <!--  <select id="selectRepeatCarNO" parameterType="java.util.HashMap" resultMap="BaseResultMap">

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -74,5 +74,5 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     int updateByZhuWai(List<MeterWorkCarActual> models);
 
     //根据传入时间和车号，查询给定时间段去重车号
-    List<String> distinctCarNo(String carNo, String startTime, String endTime);
+    List<String> distinctCarNo(String carNo, String startTime, String endTime, String dataSource);
 }

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

@@ -336,6 +336,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwcaf1.setUpdateManName("system");
             mwcaf1.setUpdateManName("二次计量洁净更新");
             mwcaf1.setUpdateTime(new Date());
+            mwcaf1.setDataSource("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
             // 皮重数据处理
             mwcaf2.setValueFlag(DbConstants.NET);
@@ -343,6 +344,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwcaf2.setUpdateManName("二次计量洁净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setValueFlag(DbConstants.NET);
+            mwcaf2.setDataSource("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf2);
 
             if (actualRow.getGrossTime().compareTo(actualRow.getTareTime()) == 1) {
@@ -359,6 +361,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
             actualRow.setActualNo(sdf.format(new Date()) + no);
             actualRow.setNote(note);
+            actualRow.setDataSource("1");
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow);
             return actualRow;
@@ -394,6 +397,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcafg.setUpdateManName("system");
                 mwcafg.setUpdateManName("二次计量解除更新");
                 mwcafg.setUpdateTime(new Date());
+                mwcafg.setDataSource("1");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcafg);
                 //皮重
                 MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
@@ -407,12 +411,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         mwcaft.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
                         mwcaft.setUpdateManName("system");
                         mwcaft.setUpdateManName("二次计量解除作废");
+                        mwcaft.setDataSource("1");
                         mwcaft.setUpdateTime(new Date());
                     } else {
                         mwcaft.setValueFlag(DbConstants.VALID);
                         mwcaft.setUpdateManName("system");
                         mwcaft.setUpdateManName("二次计量解除更新");
                         mwcaft.setNote(model.getNote());
+                        mwcaft.setDataSource("1");
                         mwcaft.setUpdateTime(new Date());
                     }
                     meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaft);
@@ -1216,11 +1222,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String carNo, String startTime, String endTime) {
+    public List<String> distinctCarNo(String carNo, String startTime, String endTime, String dataSource) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("carNo", carNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
+        obj.put("dataSource", dataSource);
         List<String> list = meterWorkCarActualMapper.distinctCarNo(obj).stream().map(MeterWorkCarActual::getCarNo).collect(Collectors.toList());
         return list;
     }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -830,12 +830,12 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         return rm;
     }
 
-    @ApiOperation(value = "车号汇总统计汇总", notes = "根据传入时间和车号，查询给定时间段去重车号")
+    @ApiOperation(value = "车号汇总统计汇总-网页", notes = "根据传入时间和车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime) {
+    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime, String dataSource) {
         RESTfulResult rm = failed();
         try {
-            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime);
+            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2458,19 +2458,23 @@
         order by  CREATE_TIME desc
     </select>
     <select id="selectAndMatch" parameterType="java.lang.String" resultMap="BaseResultMap">
-   select t.ACTUAL_FIRST_NO, t1.PREDICTION_NO, t1.NOTICE_NO, t1.CAR_NO, t1.TRAILER_NO, t1.MATTER_NO,
-    t1.MATTER_NAME, t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME,
-    t1.FORWARDING_UNIT_NO, t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME,
-    t1.MATERIAL_NO, t1.MATERIAL_NAME, t1.SPEC_NO, t1.SPEC_NAME, t1.SHIPMENT_GROSS_WEIGHT,
-    t1.SHIPMENT_NET_WEIGHT, t1.SHIPMENT_NUM, t1.BIND_CARD_NO, t1.LOAD_POINT_NO, t1.LOAD_POINT_NAME,
-    t1.SAMPLE_NO, t1.SAMPLE_VOUCHER, t1.CARRIER_UNIT_NO, t1.CARRIER_UNIT_NAME, t1.PREDICTION_TYPE,
-    t1.PREDICTION_COMBINATION, t1.METER_TYPE_NO, t1.METER_TYPE_NAME, t1.RAILWAY_NO, t1.METER_PROCESS_NO,
-    t1.METER_PROCESS_EDITION_NO, t.METER_WEIGHT, t.ADD_WEIGHT, t.METER_NUM, t.WEIGHT_TYPE,
-    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME,
-    t.METER_CLASS, t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
-    t.UPDATE_TIME, t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE
-    from METER_WORK_CAR_ACTUAL_FIRST t,PRE_TRACK_SCALE t1
-    where t.ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR} and t1.PREDICTION_NO= #{predictionNo,jdbcType=VARCHAR}
+      select t.ACTUAL_FIRST_NO, t1.PREDICTION_NO, t1.NOTICE_NO, t1.CAR_NO, t1.TRAILER_NO, t1.MATTER_NO,
+        t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+        t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+        t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
+        t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
+        t1.MATTER_NAME, t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME,
+        t1.FORWARDING_UNIT_NO, t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME,
+        t1.MATERIAL_NO, t1.MATERIAL_NAME, t1.SPEC_NO, t1.SPEC_NAME, t1.SHIPMENT_GROSS_WEIGHT,
+        t1.SHIPMENT_NET_WEIGHT, t1.SHIPMENT_NUM, t1.BIND_CARD_NO, t1.LOAD_POINT_NO, t1.LOAD_POINT_NAME,
+        t1.SAMPLE_NO, t1.SAMPLE_VOUCHER, t1.CARRIER_UNIT_NO, t1.CARRIER_UNIT_NAME, t1.PREDICTION_TYPE,
+        t1.PREDICTION_COMBINATION, t1.METER_TYPE_NO, t1.METER_TYPE_NAME, t1.RAILWAY_NO, t1.METER_PROCESS_NO,
+        t1.METER_PROCESS_EDITION_NO, t.METER_WEIGHT, t.ADD_WEIGHT, t.METER_NUM, t.WEIGHT_TYPE,
+        t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME,
+        t.METER_CLASS, t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
+        t.UPDATE_TIME, t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE
+        from METER_WORK_CAR_ACTUAL_FIRST t,PRE_TRACK_SCALE t1
+        where t.ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR} and t1.PREDICTION_NO= #{predictionNo,jdbcType=VARCHAR}
   </select>
     <select id="selectAndRemove" parameterType="java.lang.String" resultMap="BaseResultMap">
     select TRAILER_NO,CAR_NO,ACTUAL_FIRST_NO, METER_WEIGHT, ADD_WEIGHT, METER_NUM, WEIGHT_TYPE,
@@ -2776,5 +2780,8 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
+      <if test="dataSource != null and dataSource != null">
+        and  data_source = '${dataSource}'
+      </if>
     </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -97,5 +97,5 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
     RESTfulResult doCraneNetDbWf(MeterWorkCarActualFirst one, MeterWorkCarActual two, MeterMonitorNote three) throws Exception;
 
     //根据传入时间和车号，查询给定时间段去重车号
-    List<String> distinctCarNo(String carNo, String startTime, String endTime);
+    List<String> distinctCarNo(String carNo, String startTime, String endTime, String dataSource);
 }

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

@@ -158,7 +158,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Transactional(rollbackFor = Exception.class)
     public int checkandadd(MeterWorkCarActualFirst model) throws MarkerMetException {
         try {
-            ckeck(model);
+            ckeck1(model);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
             String no = meterWorkCarActualFirstMapper.getNewID(afl);
@@ -642,6 +642,24 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return pageInfo;
     }
 
+    private void ckeck1(MeterWorkCarActualFirst model) throws MarkerMetException {
+        if (model.getCarNo() == null || model.getCarNo().equals("")) {
+            throw new MarkerMetException(500, "车号不能为空");
+        }
+        if (model.getBaseSpotNo() == null || model.getBaseSpotNo().equals("")) {
+            throw new MarkerMetException(500, "计量点编号不能为空");
+        }
+        if (model.getBaseSpotName() == null || model.getBaseSpotName().equals("")) {
+            throw new MarkerMetException(500, "计量点名称不能为空");
+        }
+        if (StringUtils.isEmpty(model.getActualFirstNo())) {
+            model.setValueFlag(DbConstants.VALID);
+            model.setCheckFlag(DbConstants.INVALID);
+        } else {
+            model.setUpdateTime(new Date());
+        }
+    }
+
 
     private void ckeck(MeterWorkCarActualFirst model) throws MarkerMetException {
         if (model.getCarNo() == null || model.getCarNo().equals("")) {
@@ -2221,11 +2239,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String carNo, String startTime, String endTime) {
+    public List<String> distinctCarNo(String carNo, String startTime, String endTime, String dataSource) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("carNo", carNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
+        obj.put("dataSource", dataSource);
         List<String> list = meterWorkCarActualFirstMapper.distinctCarNo(obj).stream().map(MeterWorkCarActualFirst::getCarNo).collect(Collectors.toList());
         return list;
     }

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

@@ -373,10 +373,10 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "火车号汇总统计汇总-网页", notes = "根据传入时间和火车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String railwayNo, String startTime, String endTime) {
+    public RESTfulResult distinctCarNo(String railwayNo, String startTime, String endTime, String dataSource) {
         RESTfulResult rm = failed();
         try {
-            List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayNo, startTime, endTime);
+            List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/model/MeterWorkRailwayActFirst.java

@@ -422,6 +422,138 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
     @ApiModelProperty(value="原产地",required=false)
     private String sourceArea;
 
+    /**
+     * 主凭据号(VOUCHER_IDENTITY,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据号",required=false)
+    private String voucherIdentity;
+
+    /**
+     * 主凭据行(VOUCHER_ITEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据行",required=false)
+    private String voucherItem;
+
+    /**
+     * 主业务类型组(BUSINESS_GROUP,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主业务类型组",required=false)
+    private String businessGroup;
+
+    /**
+     * 临时牌号(TEMP_CONVEYANCE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="临时牌号",required=false)
+    private String tempConveyance;
+
+    /**
+     * 车型(CONVEYANCE_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String conveyanceType;
+
+    /**
+     * 委托源系统(RESOURCE_SYSTEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="委托源系统",required=false)
+    private String resourceSystem;
+
+    /**
+     * 分组计件件量(GROUP_PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="分组计件件量",required=false)
+    private Long groupPackageAmount;
+
+    /**
+     * 分组计量单位(GROUP_PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="分组计量单位",required=false)
+    private String groupPackageUnit;
+
+    /**
+     * 标准件数(PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="标准件数",required=false)
+    private Long packageAmount;
+
+    /**
+     * 计件单位(PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计件单位",required=false)
+    private String packageUnit;
+
+    /**
+     * 理论量(THEORY_AMOUNT,DECIMAL,16)
+     */
+    @ApiModelProperty(value="理论量",required=false)
+    private BigDecimal theoryAmount;
+
+    /**
+     * 计量组批号(MEASURE_BATCH,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量组批号",required=false)
+    private String measureBatch;
+
+    /**
+     * 计量组批车数(MEASURE_BATCH_COUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="计量组批车数",required=false)
+    private Long measureBatchCount;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="发货点类型",required=false)
+    private String senderType;
+
+    /**
+     * 发货点备注(SENDER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货点备注",required=false)
+    private String senderRemark;
+
+    /**
+     * 收货点类型(RECEIVER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String receiverType;
+
+    /**
+     * 收货点备注(RECEIVER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货点备注",required=false)
+    private String receiverRemark;
+
+    /**
+     * 计量单位(AMOUNT_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量单位",required=false)
+    private String amountUnit;
+
+    /**
+     * 计量对象类型(MEASURE_OBJECT_TYPE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="计量对象类型",required=false)
+    private String measureObjectType;
+
+    /**
+     * 计量任务号(MEASURE_TASK_NUM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量任务号",required=false)
+    private String measureTaskNum;
+
+    /**
+     * 数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
+     */
+    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
+    private String dataSource;
+
+    /**
+     * 操作原因(NOTE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="操作原因",required=false)
+    private String note;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -986,6 +1118,182 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
         this.sourceArea = sourceArea == null ? null : sourceArea.trim();
     }
 
+    public String getVoucherIdentity() {
+        return voucherIdentity;
+    }
+
+    public void setVoucherIdentity(String voucherIdentity) {
+        this.voucherIdentity = voucherIdentity == null ? null : voucherIdentity.trim();
+    }
+
+    public String getVoucherItem() {
+        return voucherItem;
+    }
+
+    public void setVoucherItem(String voucherItem) {
+        this.voucherItem = voucherItem == null ? null : voucherItem.trim();
+    }
+
+    public String getBusinessGroup() {
+        return businessGroup;
+    }
+
+    public void setBusinessGroup(String businessGroup) {
+        this.businessGroup = businessGroup == null ? null : businessGroup.trim();
+    }
+
+    public String getTempConveyance() {
+        return tempConveyance;
+    }
+
+    public void setTempConveyance(String tempConveyance) {
+        this.tempConveyance = tempConveyance == null ? null : tempConveyance.trim();
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType == null ? null : conveyanceType.trim();
+    }
+
+    public String getResourceSystem() {
+        return resourceSystem;
+    }
+
+    public void setResourceSystem(String resourceSystem) {
+        this.resourceSystem = resourceSystem == null ? null : resourceSystem.trim();
+    }
+
+    public Long getGroupPackageAmount() {
+        return groupPackageAmount;
+    }
+
+    public void setGroupPackageAmount(Long groupPackageAmount) {
+        this.groupPackageAmount = groupPackageAmount;
+    }
+
+    public String getGroupPackageUnit() {
+        return groupPackageUnit;
+    }
+
+    public void setGroupPackageUnit(String groupPackageUnit) {
+        this.groupPackageUnit = groupPackageUnit == null ? null : groupPackageUnit.trim();
+    }
+
+    public Long getPackageAmount() {
+        return packageAmount;
+    }
+
+    public void setPackageAmount(Long packageAmount) {
+        this.packageAmount = packageAmount;
+    }
+
+    public String getPackageUnit() {
+        return packageUnit;
+    }
+
+    public void setPackageUnit(String packageUnit) {
+        this.packageUnit = packageUnit == null ? null : packageUnit.trim();
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public String getMeasureBatch() {
+        return measureBatch;
+    }
+
+    public void setMeasureBatch(String measureBatch) {
+        this.measureBatch = measureBatch == null ? null : measureBatch.trim();
+    }
+
+    public Long getMeasureBatchCount() {
+        return measureBatchCount;
+    }
+
+    public void setMeasureBatchCount(Long measureBatchCount) {
+        this.measureBatchCount = measureBatchCount;
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark == null ? null : senderRemark.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getReceiverRemark() {
+        return receiverRemark;
+    }
+
+    public void setReceiverRemark(String receiverRemark) {
+        this.receiverRemark = receiverRemark == null ? null : receiverRemark.trim();
+    }
+
+    public String getAmountUnit() {
+        return amountUnit;
+    }
+
+    public void setAmountUnit(String amountUnit) {
+        this.amountUnit = amountUnit == null ? null : amountUnit.trim();
+    }
+
+    public String getMeasureObjectType() {
+        return measureObjectType;
+    }
+
+    public void setMeasureObjectType(String measureObjectType) {
+        this.measureObjectType = measureObjectType == null ? null : measureObjectType.trim();
+    }
+
+    public String getMeasureTaskNum() {
+        return measureTaskNum;
+    }
+
+    public void setMeasureTaskNum(String measureTaskNum) {
+        this.measureTaskNum = measureTaskNum == null ? null : measureTaskNum.trim();
+    }
+
+    public String getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(String dataSource) {
+        this.dataSource = dataSource == null ? null : dataSource.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();
@@ -1061,6 +1369,28 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
         sb.append(", arrival=").append(arrival);
         sb.append(", station=").append(station);
         sb.append(", sourceArea=").append(sourceArea);
+        sb.append(", voucherIdentity=").append(voucherIdentity);
+        sb.append(", voucherItem=").append(voucherItem);
+        sb.append(", businessGroup=").append(businessGroup);
+        sb.append(", tempConveyance=").append(tempConveyance);
+        sb.append(", conveyanceType=").append(conveyanceType);
+        sb.append(", resourceSystem=").append(resourceSystem);
+        sb.append(", groupPackageAmount=").append(groupPackageAmount);
+        sb.append(", groupPackageUnit=").append(groupPackageUnit);
+        sb.append(", packageAmount=").append(packageAmount);
+        sb.append(", packageUnit=").append(packageUnit);
+        sb.append(", theoryAmount=").append(theoryAmount);
+        sb.append(", measureBatch=").append(measureBatch);
+        sb.append(", measureBatchCount=").append(measureBatchCount);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", senderRemark=").append(senderRemark);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", receiverRemark=").append(receiverRemark);
+        sb.append(", amountUnit=").append(amountUnit);
+        sb.append(", measureObjectType=").append(measureObjectType);
+        sb.append(", measureTaskNum=").append(measureTaskNum);
+        sb.append(", dataSource=").append(dataSource);
+        sb.append(", note=").append(note);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -48,7 +48,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     @Transactional(rollbackFor = Exception.class)
     PageList<MeterWorkRailwayActFirst> selectTa(Map<String, Object> parmas, Integer pageNum, Integer pageSize);
 
-    List<String> distinctCarNo(String railwayNo, String startTime, String endTime);
+    List<String> distinctCarNo(String railwayNo, String startTime, String endTime, String dataSource);
 
     List<MeterWorkRailwayActFirst> selectNet(String weightType, String railwayNo, String flag);
 

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

@@ -88,7 +88,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Transactional(rollbackFor = Exception.class)
     public int checkandadd(MeterWorkRailwayActFirst model) {
         try {
-            check(model);
+            check1(model);
+            model.setDataSource("1");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String no = meterWorkRailwayActFirstMapper.getNewID(sdf.format(new Date()));
             model.setActualFirstNo(sdf.format(new Date()) + no);
@@ -301,11 +302,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String railwayNo, String startTime, String endTime) {
+    public List<String> distinctCarNo(String railwayNo, String startTime, String endTime, String dataSource) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayNo", railwayNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
+        obj.put("dataSource", dataSource);
         List<String> list = meterWorkRailwayActFirstMapper.distinctCarNo(obj).stream().map(MeterWorkRailwayActFirst::getRailwayNo).collect(Collectors.toList());
         return list;
     }
@@ -563,6 +565,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             MeterWorkRailwayActFirst model = meterWorkRailwayActFirstMapper.selectAndMatch(actualFirstNo, predictionNo);
             model.setValueFlag("1");
+            model.setDataSource("1");
+            model.setUpdateTime(new Date());
+            model.setUpdateManNo("system");
+            model.setUpdateManName("火车一次计量匹配操作");
             prs.setUpdateTime(new Date());
             prs.setUpdateManNo("system");
             prs.setUpdateManName("火车一次计量匹配操作");
@@ -662,18 +668,32 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         }
     }
 
-    private void check(MeterWorkRailwayActFirst model) throws MarkerMetException {
+    private void check1(MeterWorkRailwayActFirst model) throws MarkerMetException {
         if ("001019001".equals(model.getRailwayTypeNo())) {
             if (model.getRailwayNo() == null || model.getRailwayNo().equals("")) {
                 throw new MarkerMetException(500, "火车车号不能为空");
             }
         }
 
-        if (model.getMeterTypeNo() == null || model.getMeterTypeNo().equals("")) {
-            throw new MarkerMetException(500, "业务类型编号不能为空");
+        if (model.getBaseSpotNo() == null || model.getBaseSpotNo().equals("")) {
+            throw new MarkerMetException(500, "计量点编号不能为空");
         }
-        if (model.getMeterTypeName() == null || model.getMeterTypeName().equals("")) {
-            throw new MarkerMetException(500, "业务类型名称不能为空");
+        if (model.getBaseSpotName() == null || model.getBaseSpotName().equals("")) {
+            throw new MarkerMetException(500, "计量点名称不能为空");
+        }
+        if (StringUtils.isEmpty(model.getActualFirstNo())) {
+            model.setValueFlag(DbConstants.VALID);
+            model.setCheckFlag(DbConstants.INVALID);
+        } else {
+            model.setUpdateTime(new Date());
+        }
+    }
+
+    private void check(MeterWorkRailwayActFirst model) throws MarkerMetException {
+        if ("001019001".equals(model.getRailwayTypeNo())) {
+            if (model.getRailwayNo() == null || model.getRailwayNo().equals("")) {
+                throw new MarkerMetException(500, "火车车号不能为空");
+            }
         }
         if (model.getBaseSpotNo() == null || model.getBaseSpotNo().equals("")) {
             throw new MarkerMetException(500, "计量点编号不能为空");

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

@@ -107,6 +107,24 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "新增数据", notes = "根据选中的毛重数据和输入的皮重新增一条净重数据")
+    @ApiImplicitParam(name = "meterWorkRailwayActual", value = "详细实体meterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
+    //@RequiresPermissions("meterworkrailwayactual:create")
+    @PostMapping(value = "/add")
+    public RESTfulResult addData(@ModelAttribute MeterWorkRailwayActual model) {
+        try {
+            int num = meterWorkRailwayActualService.addData(model);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("操作失败");
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterworkrailwayactual:view")
@@ -123,10 +141,10 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
 
     @ApiOperation(value = "火车号汇总统计汇总", notes = "根据传入时间和火车号，查询给定时间段去重车号")
     @GetMapping(value = "/distinctCarNo")
-    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime) {
+    public RESTfulResult distinctCarNo(String carNo, String startTime, String endTime, String dataSource) {
         RESTfulResult rm = failed();
         try {
-            List<String> rows = meterWorkRailwayActualService.distinctCarNo(carNo, startTime, endTime);
+            List<String> rows = meterWorkRailwayActualService.distinctCarNo(carNo, startTime, endTime, dataSource);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();
@@ -265,6 +283,54 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "取消发布", notes = "将洁净数据重置为未发布状态")
+    @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
+    @PostMapping(value = "/cancel")
+    public RESTfulResult cancel(@RequestBody MeterWorkRailwayActual model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkRailwayActualService.cancel(model);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("操作失败");
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value = "取消发布", notes = "将洁净数据重置为未发布状态")
+    @ApiImplicitParam(name = "model", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
+    @PostMapping(value = "/publish")
+    public RESTfulResult publish(@RequestBody MeterWorkRailwayActual model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkRailwayActualService.publish(model);
+            if (num >= 1) {
+                return success(num);
+            } else {
+                return failed("操作失败");
+            }
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "条件查询视图", notes = "根据传入参数进行查询")
     @GetMapping(value = "/selectView")
     public RESTfulResult selectView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.java

@@ -44,7 +44,7 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
      * @param obj
      * @return
      */
-    List<MeterWorkCarActualFirst> distinctCarNo(HashMap<String, Object> obj);
+    List<MeterWorkRailwayActual> distinctCarNo(HashMap<String, Object> obj);
 
     double getGrossAvg(HashMap actual);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -466,6 +466,156 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="原产地",required=false)
     private String sourceArea;
 
+    /**
+     * 主凭据号(VOUCHER_IDENTITY,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据号",required=false)
+    private String voucherIdentity;
+
+    /**
+     * 主凭据行(VOUCHER_ITEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据行",required=false)
+    private String voucherItem;
+
+    /**
+     * 主业务类型组(BUSINESS_GROUP,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主业务类型组",required=false)
+    private String businessGroup;
+
+    /**
+     * 临时牌号(TEMP_CONVEYANCE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="临时牌号",required=false)
+    private String tempConveyance;
+
+    /**
+     * 车型(CONVEYANCE_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String conveyanceType;
+
+    /**
+     * 委托源系统(RESOURCE_SYSTEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="委托源系统",required=false)
+    private String resourceSystem;
+
+    /**
+     * 分组计件件量(GROUP_PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="分组计件件量",required=false)
+    private Long groupPackageAmount;
+
+    /**
+     * 分组计量单位(GROUP_PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="分组计量单位",required=false)
+    private String groupPackageUnit;
+
+    /**
+     * 标准件数(PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="标准件数",required=false)
+    private Long packageAmount;
+
+    /**
+     * 计件单位(PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计件单位",required=false)
+    private String packageUnit;
+
+    /**
+     * 理论量(THEORY_AMOUNT,DECIMAL,16)
+     */
+    @ApiModelProperty(value="理论量",required=false)
+    private BigDecimal theoryAmount;
+
+    /**
+     * 计量组批号(MEASURE_BATCH,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量组批号",required=false)
+    private String measureBatch;
+
+    /**
+     * 计量组批车数(MEASURE_BATCH_COUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="计量组批车数",required=false)
+    private Long measureBatchCount;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="发货点类型",required=false)
+    private String senderType;
+
+    /**
+     * 发货点备注(SENDER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货点备注",required=false)
+    private String senderRemark;
+
+    /**
+     * 收货点类型(RECEIVER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String receiverType;
+
+    /**
+     * 收货点备注(RECEIVER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货点备注",required=false)
+    private String receiverRemark;
+
+    /**
+     * 计量单位(AMOUNT_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量单位",required=false)
+    private String amountUnit;
+
+    /**
+     * 计量对象类型(MEASURE_OBJECT_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量对象类型",required=false)
+    private String measureObjectType;
+
+    /**
+     * 计量任务号(MEASURE_TASK_NUM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量任务号",required=false)
+    private String measureTaskNum;
+
+    /**
+     * 票据类型(BILL_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="票据类型",required=false)
+    private String billType;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
+     */
+    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
+    private String dataSource;
+
+    /**
+     * 操作原因(NOTE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="操作原因",required=false)
+    private String note;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1086,6 +1236,206 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.sourceArea = sourceArea == null ? null : sourceArea.trim();
     }
 
+    public String getVoucherIdentity() {
+        return voucherIdentity;
+    }
+
+    public void setVoucherIdentity(String voucherIdentity) {
+        this.voucherIdentity = voucherIdentity == null ? null : voucherIdentity.trim();
+    }
+
+    public String getVoucherItem() {
+        return voucherItem;
+    }
+
+    public void setVoucherItem(String voucherItem) {
+        this.voucherItem = voucherItem == null ? null : voucherItem.trim();
+    }
+
+    public String getBusinessGroup() {
+        return businessGroup;
+    }
+
+    public void setBusinessGroup(String businessGroup) {
+        this.businessGroup = businessGroup == null ? null : businessGroup.trim();
+    }
+
+    public String getTempConveyance() {
+        return tempConveyance;
+    }
+
+    public void setTempConveyance(String tempConveyance) {
+        this.tempConveyance = tempConveyance == null ? null : tempConveyance.trim();
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType == null ? null : conveyanceType.trim();
+    }
+
+    public String getResourceSystem() {
+        return resourceSystem;
+    }
+
+    public void setResourceSystem(String resourceSystem) {
+        this.resourceSystem = resourceSystem == null ? null : resourceSystem.trim();
+    }
+
+    public Long getGroupPackageAmount() {
+        return groupPackageAmount;
+    }
+
+    public void setGroupPackageAmount(Long groupPackageAmount) {
+        this.groupPackageAmount = groupPackageAmount;
+    }
+
+    public String getGroupPackageUnit() {
+        return groupPackageUnit;
+    }
+
+    public void setGroupPackageUnit(String groupPackageUnit) {
+        this.groupPackageUnit = groupPackageUnit == null ? null : groupPackageUnit.trim();
+    }
+
+    public Long getPackageAmount() {
+        return packageAmount;
+    }
+
+    public void setPackageAmount(Long packageAmount) {
+        this.packageAmount = packageAmount;
+    }
+
+    public String getPackageUnit() {
+        return packageUnit;
+    }
+
+    public void setPackageUnit(String packageUnit) {
+        this.packageUnit = packageUnit == null ? null : packageUnit.trim();
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public String getMeasureBatch() {
+        return measureBatch;
+    }
+
+    public void setMeasureBatch(String measureBatch) {
+        this.measureBatch = measureBatch == null ? null : measureBatch.trim();
+    }
+
+    public Long getMeasureBatchCount() {
+        return measureBatchCount;
+    }
+
+    public void setMeasureBatchCount(Long measureBatchCount) {
+        this.measureBatchCount = measureBatchCount;
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark == null ? null : senderRemark.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getReceiverRemark() {
+        return receiverRemark;
+    }
+
+    public void setReceiverRemark(String receiverRemark) {
+        this.receiverRemark = receiverRemark == null ? null : receiverRemark.trim();
+    }
+
+    public String getAmountUnit() {
+        return amountUnit;
+    }
+
+    public void setAmountUnit(String amountUnit) {
+        this.amountUnit = amountUnit == null ? null : amountUnit.trim();
+    }
+
+    public String getMeasureObjectType() {
+        return measureObjectType;
+    }
+
+    public void setMeasureObjectType(String measureObjectType) {
+        this.measureObjectType = measureObjectType == null ? null : measureObjectType.trim();
+    }
+
+    public String getMeasureTaskNum() {
+        return measureTaskNum;
+    }
+
+    public void setMeasureTaskNum(String measureTaskNum) {
+        this.measureTaskNum = measureTaskNum == null ? null : measureTaskNum.trim();
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType == null ? null : billType.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(String dataSource) {
+        this.dataSource = dataSource == null ? null : dataSource.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();
@@ -1168,6 +1518,31 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", updateManName=").append(updateManName);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", sourceArea=").append(sourceArea);
+        sb.append(", voucherIdentity=").append(voucherIdentity);
+        sb.append(", voucherItem=").append(voucherItem);
+        sb.append(", businessGroup=").append(businessGroup);
+        sb.append(", tempConveyance=").append(tempConveyance);
+        sb.append(", conveyanceType=").append(conveyanceType);
+        sb.append(", resourceSystem=").append(resourceSystem);
+        sb.append(", groupPackageAmount=").append(groupPackageAmount);
+        sb.append(", groupPackageUnit=").append(groupPackageUnit);
+        sb.append(", packageAmount=").append(packageAmount);
+        sb.append(", packageUnit=").append(packageUnit);
+        sb.append(", theoryAmount=").append(theoryAmount);
+        sb.append(", measureBatch=").append(measureBatch);
+        sb.append(", measureBatchCount=").append(measureBatchCount);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", senderRemark=").append(senderRemark);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", receiverRemark=").append(receiverRemark);
+        sb.append(", amountUnit=").append(amountUnit);
+        sb.append(", measureObjectType=").append(measureObjectType);
+        sb.append(", measureTaskNum=").append(measureTaskNum);
+        sb.append(", billType=").append(billType);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", dataSource=").append(dataSource);
+        sb.append(", note=").append(note);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -31,6 +31,10 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
 
     int unaudit(List<MeterWorkRailwayActual> model);
 
+    int cancel(MeterWorkRailwayActual model);
+
+    int publish(MeterWorkRailwayActual model);
+
     MeterWorkRailwayActual clean(String actualFirstNo, String dataNo, String predictionNo);
 
     MeterWorkRailwayActual matchPrediction(String actualNo, String predictionNo, String note);
@@ -41,7 +45,9 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
 
     MeterWorkRailwayActual termclean(String actualFirstNo, String dataNo);
 
-    List<String> distinctCarNo(String carNo, String startTime, String endTime);
+    int addData(MeterWorkRailwayActual model);
+
+    List<String> distinctCarNo(String carNo, String startTime, String endTime, String dataSource);
 
     PageList<MeterWorkRailwayActual> selectView(HashMap parmas, Integer pageNum, Integer pageSize);
 

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

@@ -116,6 +116,62 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return flErr ? 0 : i;
     }
 
+    @Override
+    public int cancel(MeterWorkRailwayActual model) {
+        int i = 0;
+        if (model == null) {
+            throw new MarkerMetException(500, "参数为空！！");
+        }
+        if (model.getActualNo() == null || "".equals(model.getActualNo())) {
+            throw new MarkerMetException(500, "数据主键为空");
+        }
+        if (model.getPredictionNo() == null || "".equals(model.getPredictionNo()) || "1".equals(model.getValueFlag())) {
+            throw new MarkerMetException(500, "只有已匹配委托且已发布的数据才能进行撤销发布操作");
+        }
+
+        UserPayload userPayload = new UserPayload();
+        String userName = userPayload.getUserName();
+        String userId = userPayload.getId();
+        model.setValueFlag("1");
+        model.setUpdateTime(new Date());
+        model.setUpdateManName(userName);
+        model.setUpdateManNo(userId);
+        try {
+            meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+        } catch (Exception e) {
+            throw e;
+        }
+        return ++i;
+    }
+
+    @Override
+    public int publish(MeterWorkRailwayActual model) {
+        int i = 0;
+        if (model == null) {
+            throw new MarkerMetException(500, "参数为空！！");
+        }
+        if (model.getActualNo() == null || "".equals(model.getActualNo())) {
+            throw new MarkerMetException(500, "数据主键为空");
+        }
+        if (model.getPredictionNo() == null || "".equals(model.getPredictionNo()) || "2".equals(model.getValueFlag())) {
+            throw new MarkerMetException(500, "只有已匹配委托且未发布的数据才能进行数据发布操作");
+        }
+
+        UserPayload userPayload = new UserPayload();
+        String userName = userPayload.getUserName();
+        String userId = userPayload.getId();
+        model.setValueFlag("2");
+        model.setUpdateTime(new Date());
+        model.setUpdateManName(userName);
+        model.setUpdateManNo(userId);
+        try {
+            meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+        } catch (Exception e) {
+            throw e;
+        }
+        return ++i;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActual clean(String actualFirstNo, String dataNo, String predictionNo) throws MarkerMetException {
@@ -205,6 +261,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
             actualRow.setActualNo(sdf.format(new Date()) + no);
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
+            actualRow.setDataSource("1");
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
             //预报的处理
@@ -230,17 +287,17 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             throw new MarkerMetException(500, "洁净数据主键不能为空");
         }
         if (predictionNo == null || "".equals(predictionNo)) {
-            throw new MarkerMetException(500, "预报编号不能为空");
+            throw new MarkerMetException(500, "委托编号不能为空");
         }
         MeterWorkRailwayActual queryrow = meterWorkRailwayActualMapper.selectByPrimaryKey(actualNo);
         if (queryrow == null) {
             throw new MarkerMetException(500, "不存在对应的洁净数据");
-        } else if (!queryrow.getValueFlag().equals("3") || queryrow.getPredictionNo() != null) {
+        } else if (!queryrow.getValueFlag().equals("3") || queryrow.getPredictionNo() != null || "".equals(queryrow.getPredictionNo())) {
             throw new MarkerMetException(500, "只有未匹配的净重数据才能进行委托匹配操作");
         }
         PreRailwayScale prerow = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
         if (prerow == null) {
-            throw new MarkerMetException(500, "不存在对应的预报数据");
+            throw new MarkerMetException(500, "不存在对应的委托数据");
         } else if (!prerow.getValueFlag().equals("1")) {
             throw new MarkerMetException(500, "只有未使用的委托才能进行匹配委托操作");
         }
@@ -284,6 +341,66 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return mwca;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int addData (MeterWorkRailwayActual model) throws MarkerMetException {
+        if (model.getActualFirst1No() == null || "".equals(model.getActualFirst1No())) {
+            throw new MarkerMetException(500, "毛重数据主键不能为空");
+        }
+        if (model.getRailwayNo() == null || "".equals(model.getRailwayNo())) {
+            throw new MarkerMetException(500, "火车号不能为空");
+        }
+        if (model.getPredictionNo() == null || "".equals(model.getPredictionNo())) {
+            throw new MarkerMetException(500, "选中的毛重数据需要先匹配委托");
+        }
+        MeterWorkRailwayActFirst queryrow = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
+        if (queryrow == null) {
+            throw new MarkerMetException(500, "不存在对应的毛重数据");
+        }
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getId();
+        String userName = payload.getUserName();
+
+        // 处理一次计量数据
+        // 毛重
+        queryrow.setUpdateTime(new Date());
+        queryrow.setUpdateManName(userName + ": 一次数据输入历史皮重洁净操作");
+        queryrow.setUpdateManNo(userId);
+        queryrow.setValueFlag("2");
+        meterWorkRailwayActFirstMapper.updateByPrimaryKey(queryrow);
+
+        // 新增一条皮重
+        MeterWorkRailwayActFirst tarerow = new MeterWorkRailwayActFirst();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        Date time = new Date();
+        tarerow.setActualFirstNo(meterWorkRailwayActFirstMapper.getNewID(sdf.format(time)));
+        tarerow.setMeterWeight(model.getTareWeight());
+        tarerow.setCreateManName(userName);
+        tarerow.setCreateManNo(userId);
+        tarerow.setCreateTime(new Date());
+        tarerow.setMeterMode("3");
+        tarerow.setDataSource("1");
+        tarerow.setMemo("静轨一次计量数据输入历史皮重洁净操作新增皮重数据");
+        tarerow.setValueFlag("2");
+        meterWorkRailwayActFirstMapper.insertSelective(tarerow);
+
+        // 新增净重数据
+        model.setActualNo(meterWorkRailwayActualMapper.getNewID(sdf.format(new Date())));
+        model.setTareManName(userName);
+        model.setTareManNo(userId);
+        model.setTareTime(time);
+        model.setNetMode("2");
+        model.setTareMode("3");
+        model.setNetTime(time);
+        model.setNetManName(userName);
+        model.setNetManNo(userId);
+        model.setDataSource("1");
+        model.setValueFlag("1");
+//        mwca.setNote(note); 添加修改原因记录
+        int num = meterWorkRailwayActualMapper.insertSelective(model);
+        return num;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActual cleanPrediction (MeterWorkRailwayActual model) throws MarkerMetException {
@@ -352,28 +469,34 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 if (mwcaf1 == null) {
                     throw new MarkerMetException(500, "未查询到相应的毛重数据！！");
                 }
-                mwcaf1.setValueFlag(DbConstants.VALID);
-                mwcaf1.setUpdateManNo("system");
-                mwcaf1.setUpdateManName("静态衡解除操作");
-                mwcaf1.setUpdateTime(new Date());
-                meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf1);
+                // 清空委托信息
+                MeterWorkRailwayActFirst grossrow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
+                grossrow.setValueFlag("3");
+                grossrow.setUpdateManNo("system");
+                grossrow.setUpdateManName("静态衡解除操作");
+                grossrow.setDataSource("1");
+                grossrow.setUpdateTime(new Date());
+                meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossrow);
                 //皮重
                 MeterWorkRailwayActFirst mwcaf2 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
                 MeterBaseRailwayWeight mbrw = meterBaseRailwayWeightMapper.selectByPrimaryKey(model.getActualFirst2No());
-                if (mwcaf1 == null && mbrw == null) {
-                    throw new MarkerMetException(500, "未查询到相应的毛重数据！！");
+                if (mwcaf2 == null && mbrw == null) {
+                    throw new MarkerMetException(500, "未查询到相应的皮重数据！！");
                 }
-                if (mwcaf2 != null) {
-                    mwcaf2.setValueFlag(DbConstants.VALID);
-                    mwcaf2.setUpdateManNo("system");
-                    mwcaf2.setUpdateManName("静态衡解除操作");
-                    mwcaf2.setUpdateTime(new Date());
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf2);
+                // 清空委托信息
+                MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
+                if (tarerow != null) {
+                    tarerow.setValueFlag("3");
+                    tarerow.setUpdateManNo("system");
+                    tarerow.setUpdateManName("静态衡解除操作");
+                    tarerow.setUpdateTime(new Date());
+                    tarerow.setDataSource("1");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
                 }
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                     PreRailwayScale scale = new PreRailwayScale();
                     scale.setPredictionNo(model.getPredictionNo());
-                    scale.setValueFlag(DbConstants.IN); //使用中
+                    scale.setValueFlag("1"); //使用中
                     scale.setUpdateManNo("system");
                     scale.setUpdateManName("静态衡解除操作");
                     scale.setUpdateTime(new Date());
@@ -391,12 +514,13 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String railwayNo, String startTime, String endTime) {
+    public List<String> distinctCarNo(String railwayNo, String startTime, String endTime, String dataSource) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayNo", railwayNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
-        List<String> list = meterWorkRailwayActFirstMapper.distinctCarNo(obj).stream().map(MeterWorkRailwayActFirst::getRailwayNo).collect(Collectors.toList());
+        obj.put("dataSource", dataSource);
+        List<String> list = meterWorkRailwayActualMapper.distinctCarNo(obj).stream().map(MeterWorkRailwayActual::getRailwayNo).collect(Collectors.toList());
         return list;
     }
 

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -57,6 +57,34 @@
         <result column="RAILWAY_MODEL_NAME" jdbcType="VARCHAR" property="railwayModelName" />
         <result column="ARRIVAL" jdbcType="VARCHAR" property="arrival" />
         <result column="STATION" jdbcType="VARCHAR" property="station" />
+        <result column="VOUCHER_IDENTITY" jdbcType="VARCHAR" property="voucherIdentity" />
+        <result column="VOUCHER_ITEM" jdbcType="VARCHAR" property="voucherItem" />
+        <result column="BUSINESS_GROUP" jdbcType="VARCHAR" property="businessGroup" />
+        <result column="TEMP_CONVEYANCE" jdbcType="VARCHAR" property="tempConveyance" />
+        <result column="CONVEYANCE_TYPE" jdbcType="VARCHAR" property="conveyanceType" />
+        <result column="RESOURCE_SYSTEM" jdbcType="VARCHAR" property="resourceSystem" />
+        <result column="GROUP_PACKAGE_AMOUNT" jdbcType="DECIMAL" property="groupPackageAmount" />
+        <result column="GROUP_PACKAGE_UNIT" jdbcType="VARCHAR" property="groupPackageUnit" />
+        <result column="PACKAGE_AMOUNT" jdbcType="DECIMAL" property="packageAmount" />
+        <result column="PACKAGE_UNIT" jdbcType="VARCHAR" property="packageUnit" />
+        <result column="THEORY_AMOUNT" jdbcType="DECIMAL" property="theoryAmount" />
+        <result column="MEASURE_BATCH" jdbcType="VARCHAR" property="measureBatch" />
+        <result column="MEASURE_BATCH_COUNT" jdbcType="DECIMAL" property="measureBatchCount" />
+        <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
+        <result column="SENDER_REMARK" jdbcType="VARCHAR" property="senderRemark" />
+        <result column="RECEIVER_TYPE" jdbcType="VARCHAR" property="receiverType" />
+        <result column="RECEIVER_REMARK" jdbcType="VARCHAR" property="receiverRemark" />
+        <result column="TRUST_DEPARTMENT_NAME" jdbcType="VARCHAR" property="trustDepartmentName" />
+        <result column="TRUST_DEPARTMENT" jdbcType="VARCHAR" property="trustDepartment" />
+        <result column="TRUSTOR" jdbcType="VARCHAR" property="trustor" />
+        <result column="TRUST_DATE_TIME" jdbcType="TIMESTAMP" property="trustDateTime" />
+        <result column="TRUST_AVAILABILITY_TIME" jdbcType="TIMESTAMP" property="trustAvailabilityTime" />
+        <result column="TRUST_IP" jdbcType="VARCHAR" property="trustIp" />
+        <result column="STATION_TYPE" jdbcType="VARCHAR" property="stationType" />
+        <result column="MEASURE_STATION" jdbcType="VARCHAR" property="measureStation" />
+        <result column="MEASURE_STATION_NAME" jdbcType="VARCHAR" property="measureStationName" />
+        <result column="AMOUNT_UNIT" jdbcType="VARCHAR" property="amountUnit" />
+        <result column="TRUST_DAY" jdbcType="DECIMAL" property="trustDay" />
     </resultMap>
     <sql id="columns">
         PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, MATTER_NAME,
@@ -68,7 +96,13 @@
     EFFECTIVE_START_TIME, EFFECTIVE_END_TIME, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, MEMO,
     VALUE_FLAG, USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO,
     UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, P_VALUE_FLAG,
-    IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, ARRIVAL, STATION
+    IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, ARRIVAL, STATION,
+    VOUCHER_IDENTITY, VOUCHER_ITEM, BUSINESS_GROUP, TEMP_CONVEYANCE, CONVEYANCE_TYPE,
+    RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT,
+    THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+    RECEIVER_REMARK, TRUST_DEPARTMENT_NAME, TRUST_DEPARTMENT, TRUSTOR, TRUST_DATE_TIME,
+    TRUST_AVAILABILITY_TIME, TRUST_IP, STATION_TYPE, MEASURE_STATION, MEASURE_STATION_NAME,
+    AMOUNT_UNIT, TRUST_DAY
     </sql>
     <sql id="columns_alias">
         t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, t.MATTER_NAME,
@@ -81,7 +115,13 @@
     t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, t.MEMO, t.VALUE_FLAG, t.USED_TIME, t.CREATE_MAN_NO,
     t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
     t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.P_VALUE_FLAG, t.IS_CHEMICAL,
-    t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, t.ARRIVAL, t.STATION
+    t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, t.ARRIVAL, t.STATION, t.VOUCHER_IDENTITY,
+    t.VOUCHER_ITEM, t.BUSINESS_GROUP, t.TEMP_CONVEYANCE, t.CONVEYANCE_TYPE, t.RESOURCE_SYSTEM,
+    t.GROUP_PACKAGE_AMOUNT, t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT, t.PACKAGE_UNIT, t.THEORY_AMOUNT,
+    t.MEASURE_BATCH, t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, t.SENDER_REMARK, t.RECEIVER_TYPE,
+    t.RECEIVER_REMARK, t.TRUST_DEPARTMENT_NAME, t.TRUST_DEPARTMENT, t.TRUSTOR, t.TRUST_DATE_TIME,
+    t.TRUST_AVAILABILITY_TIME, t.TRUST_IP, t.STATION_TYPE, t.MEASURE_STATION, t.MEASURE_STATION_NAME,
+    t.AMOUNT_UNIT, t.TRUST_DAY
     </sql>
     <sql id="select">
         SELECT <include refid="columns"/> FROM PRE_RAILWAY_SCALE
@@ -256,6 +296,93 @@
             <if test="station != null and station != ''">
                 and STATION = #{station}
             </if>
+            <if test="voucherIdentity != null and voucherIdentity != ''">
+                and VOUCHER_IDENTITY = #{voucherIdentity}
+            </if>
+            <if test="voucherItem != null and voucherItem != ''">
+                and VOUCHER_ITEM = #{voucherItem}
+            </if>
+            <if test="businessGroup != null and businessGroup != ''">
+                and BUSINESS_GROUP = #{businessGroup}
+            </if>
+            <if test="tempConveyance != null and tempConveyance != ''">
+                and TEMP_CONVEYANCE = #{tempConveyance}
+            </if>
+            <if test="conveyanceType != null and conveyanceType != ''">
+                and CONVEYANCE_TYPE = #{conveyanceType}
+            </if>
+            <if test="resourceSystem != null and resourceSystem != ''">
+                and RESOURCE_SYSTEM = #{resourceSystem}
+            </if>
+            <if test="groupPackageAmount != null">
+                and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+            </if>
+            <if test="groupPackageUnit != null and groupPackageUnit != ''">
+                and GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+            </if>
+            <if test="packageAmount != null">
+                and PACKAGE_AMOUNT = #{packageAmount}
+            </if>
+            <if test="packageUnit != null and packageUnit != ''">
+                and PACKAGE_UNIT = #{packageUnit}
+            </if>
+            <if test="theoryAmount != null">
+                and THEORY_AMOUNT = #{theoryAmount}
+            </if>
+            <if test="measureBatch != null and measureBatch != ''">
+                and MEASURE_BATCH = #{measureBatch}
+            </if>
+            <if test="measureBatchCount != null">
+                and MEASURE_BATCH_COUNT = #{measureBatchCount}
+            </if>
+            <if test="senderType != null and senderType != ''">
+                and SENDER_TYPE = #{senderType}
+            </if>
+            <if test="senderRemark != null and senderRemark != ''">
+                and SENDER_REMARK = #{senderRemark}
+            </if>
+            <if test="receiverType != null and receiverType != ''">
+                and RECEIVER_TYPE = #{receiverType}
+            </if>
+            <if test="receiverRemark != null and receiverRemark != ''">
+                and RECEIVER_REMARK = #{receiverRemark}
+            </if>
+            <if test="trustDepartmentName != null and trustDepartmentName != ''">
+                and TRUST_DEPARTMENT_NAME = #{trustDepartmentName}
+            </if>
+            <if test="trustDepartment != null and trustDepartment != ''">
+                and TRUST_DEPARTMENT = #{trustDepartment}
+            </if>
+            <if test="trustor != null and trustor != ''">
+                and TRUSTOR = #{trustor}
+            </if>
+            <if test="trustDateTime != null">
+                and TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = #{trustDateTime}
+            </if>
+            <if test="trustAvailabilityTime != null">
+                and TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = #{trustAvailabilityTime}
+            </if>
+            <if test="trustIp != null and trustIp != ''">
+                and TRUST_IP = #{trustIp}
+            </if>
+            <if test="stationType != null and stationType != ''">
+                and STATION_TYPE = #{stationType}
+            </if>
+            <if test="measureStation != null and measureStation != ''">
+                and MEASURE_STATION = #{measureStation}
+            </if>
+            <if test="measureStationName != null and measureStationName != ''">
+                and MEASURE_STATION_NAME = #{measureStationName}
+            </if>
+            <if test="amountUnit != null and amountUnit != ''">
+                and AMOUNT_UNIT = #{amountUnit}
+            </if>
+            <if test="trustDay != null">
+                and TRUST_DAY = #{trustDay}
+            </if>
+            <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
+                and create_time between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -425,6 +552,93 @@
             <if test="station != null and station != ''">
                 and STATION LIKE '%${station}%'
             </if>
+            <if test="voucherIdentity != null and voucherIdentity != ''">
+                and VOUCHER_IDENTITY LIKE '%${voucherIdentity}%'
+            </if>
+            <if test="voucherItem != null and voucherItem != ''">
+                and VOUCHER_ITEM LIKE '%${voucherItem}%'
+            </if>
+            <if test="businessGroup != null and businessGroup != ''">
+                and BUSINESS_GROUP LIKE '%${businessGroup}%'
+            </if>
+            <if test="tempConveyance != null and tempConveyance != ''">
+                and TEMP_CONVEYANCE LIKE '%${tempConveyance}%'
+            </if>
+            <if test="conveyanceType != null and conveyanceType != ''">
+                and CONVEYANCE_TYPE LIKE '%${conveyanceType}%'
+            </if>
+            <if test="resourceSystem != null and resourceSystem != ''">
+                and RESOURCE_SYSTEM LIKE '%${resourceSystem}%'
+            </if>
+            <if test="groupPackageAmount != null">
+                and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+            </if>
+            <if test="groupPackageUnit != null and groupPackageUnit != ''">
+                and GROUP_PACKAGE_UNIT LIKE '%${groupPackageUnit}%'
+            </if>
+            <if test="packageAmount != null">
+                and PACKAGE_AMOUNT = #{packageAmount}
+            </if>
+            <if test="packageUnit != null and packageUnit != ''">
+                and PACKAGE_UNIT LIKE '%${packageUnit}%'
+            </if>
+            <if test="theoryAmount != null">
+                and THEORY_AMOUNT = #{theoryAmount}
+            </if>
+            <if test="measureBatch != null and measureBatch != ''">
+                and MEASURE_BATCH LIKE '%${measureBatch}%'
+            </if>
+            <if test="measureBatchCount != null">
+                and MEASURE_BATCH_COUNT = #{measureBatchCount}
+            </if>
+            <if test="senderType != null and senderType != ''">
+                and SENDER_TYPE LIKE '%${senderType}%'
+            </if>
+            <if test="senderRemark != null and senderRemark != ''">
+                and SENDER_REMARK LIKE '%${senderRemark}%'
+            </if>
+            <if test="receiverType != null and receiverType != ''">
+                and RECEIVER_TYPE LIKE '%${receiverType}%'
+            </if>
+            <if test="receiverRemark != null and receiverRemark != ''">
+                and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+            </if>
+            <if test="trustDepartmentName != null and trustDepartmentName != ''">
+                and TRUST_DEPARTMENT_NAME LIKE '%${trustDepartmentName}%'
+            </if>
+            <if test="trustDepartment != null and trustDepartment != ''">
+                and TRUST_DEPARTMENT LIKE '%${trustDepartment}%'
+            </if>
+            <if test="trustor != null and trustor != ''">
+                and TRUSTOR LIKE '%${trustor}%'
+            </if>
+            <if test="trustDateTime != null">
+                and TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = #{trustDateTime}
+            </if>
+            <if test="trustAvailabilityTime != null">
+                and TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = #{trustAvailabilityTime}
+            </if>
+            <if test="trustIp != null and trustIp != ''">
+                and TRUST_IP LIKE '%${trustIp}%'
+            </if>
+            <if test="stationType != null and stationType != ''">
+                and STATION_TYPE LIKE '%${stationType}%'
+            </if>
+            <if test="measureStation != null and measureStation != ''">
+                and MEASURE_STATION LIKE '%${measureStation}%'
+            </if>
+            <if test="measureStationName != null and measureStationName != ''">
+                and MEASURE_STATION_NAME LIKE '%${measureStationName}%'
+            </if>
+            <if test="amountUnit != null and amountUnit != ''">
+                and AMOUNT_UNIT LIKE '%${amountUnit}%'
+            </if>
+            <if test="trustDay != null">
+                and TRUST_DAY = #{trustDay}
+            </if>
+            <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
+                and create_time between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -596,6 +810,90 @@
         <if test="station != null and station != ''">
             or STATION = #{station}
         </if>
+        <if test="voucherIdentity != null and voucherIdentity != ''">
+            or VOUCHER_IDENTITY = #{voucherIdentity}
+        </if>
+        <if test="voucherItem != null and voucherItem != ''">
+            or VOUCHER_ITEM = #{voucherItem}
+        </if>
+        <if test="businessGroup != null and businessGroup != ''">
+            or BUSINESS_GROUP = #{businessGroup}
+        </if>
+        <if test="tempConveyance != null and tempConveyance != ''">
+            or TEMP_CONVEYANCE = #{tempConveyance}
+        </if>
+        <if test="conveyanceType != null and conveyanceType != ''">
+            or CONVEYANCE_TYPE = #{conveyanceType}
+        </if>
+        <if test="resourceSystem != null and resourceSystem != ''">
+            or RESOURCE_SYSTEM = #{resourceSystem}
+        </if>
+        <if test="groupPackageAmount != null">
+            or GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+        </if>
+        <if test="groupPackageUnit != null and groupPackageUnit != ''">
+            or GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+        </if>
+        <if test="packageAmount != null">
+            or PACKAGE_AMOUNT = #{packageAmount}
+        </if>
+        <if test="packageUnit != null and packageUnit != ''">
+            or PACKAGE_UNIT = #{packageUnit}
+        </if>
+        <if test="theoryAmount != null">
+            or THEORY_AMOUNT = #{theoryAmount}
+        </if>
+        <if test="measureBatch != null and measureBatch != ''">
+            or MEASURE_BATCH = #{measureBatch}
+        </if>
+        <if test="measureBatchCount != null">
+            or MEASURE_BATCH_COUNT = #{measureBatchCount}
+        </if>
+        <if test="senderType != null and senderType != ''">
+            or SENDER_TYPE = #{senderType}
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            or SENDER_REMARK = #{senderRemark}
+        </if>
+        <if test="receiverType != null and receiverType != ''">
+            or RECEIVER_TYPE = #{receiverType}
+        </if>
+        <if test="receiverRemark != null and receiverRemark != ''">
+            or RECEIVER_REMARK = #{receiverRemark}
+        </if>
+        <if test="trustDepartmentName != null and trustDepartmentName != ''">
+            or TRUST_DEPARTMENT_NAME = #{trustDepartmentName}
+        </if>
+        <if test="trustDepartment != null and trustDepartment != ''">
+            or TRUST_DEPARTMENT = #{trustDepartment}
+        </if>
+        <if test="trustor != null and trustor != ''">
+            or TRUSTOR = #{trustor}
+        </if>
+        <if test="trustDateTime != null">
+            or TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = '#{trustDateTime}'
+        </if>
+        <if test="trustAvailabilityTime != null">
+            or TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = '#{trustAvailabilityTime}'
+        </if>
+        <if test="trustIp != null and trustIp != ''">
+            or TRUST_IP = #{trustIp}
+        </if>
+        <if test="stationType != null and stationType != ''">
+            or STATION_TYPE = #{stationType}
+        </if>
+        <if test="measureStation != null and measureStation != ''">
+            or MEASURE_STATION = #{measureStation}
+        </if>
+        <if test="measureStationName != null and measureStationName != ''">
+            or MEASURE_STATION_NAME = #{measureStationName}
+        </if>
+        <if test="amountUnit != null and amountUnit != ''">
+            or AMOUNT_UNIT = #{amountUnit}
+        </if>
+        <if test="trustDay != null">
+            or TRUST_DAY = #{trustDay}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale">
         insert into PRE_RAILWAY_SCALE (PREDICTION_NO, NOTICE_NO, RAILWAY_NO,
@@ -616,7 +914,17 @@
                                        DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
                                        P_VALUE_FLAG, IS_CHEMICAL, LIMIT_WEIGHT,
                                        RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, ARRIVAL,
-                                       STATION)
+                                       STATION, VOUCHER_IDENTITY, VOUCHER_ITEM,
+                                       BUSINESS_GROUP, TEMP_CONVEYANCE, CONVEYANCE_TYPE,
+                                       RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+                                       PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT,
+                                       MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE,
+                                       SENDER_REMARK, RECEIVER_TYPE, RECEIVER_REMARK,
+                                       TRUST_DEPARTMENT_NAME, TRUST_DEPARTMENT, TRUSTOR,
+                                       TRUST_DATE_TIME, TRUST_AVAILABILITY_TIME,
+                                       TRUST_IP, STATION_TYPE, MEASURE_STATION,
+                                       MEASURE_STATION_NAME, AMOUNT_UNIT, TRUST_DAY
+        )
         values (#{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR},
                 #{railwayCarriageNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR},
                 #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, #{customerSupplierNo,jdbcType=VARCHAR},
@@ -635,7 +943,17 @@
                 #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
                 #{pValueFlag,jdbcType=VARCHAR}, #{isChemical,jdbcType=VARCHAR}, #{limitWeight,jdbcType=DECIMAL},
                 #{railwayModelNo,jdbcType=VARCHAR}, #{railwayModelName,jdbcType=VARCHAR}, #{arrival,jdbcType=VARCHAR},
-                #{station,jdbcType=VARCHAR})
+                #{station,jdbcType=VARCHAR}, #{voucherIdentity,jdbcType=VARCHAR}, #{voucherItem,jdbcType=VARCHAR},
+                #{businessGroup,jdbcType=VARCHAR}, #{tempConveyance,jdbcType=VARCHAR}, #{conveyanceType,jdbcType=VARCHAR},
+                #{resourceSystem,jdbcType=VARCHAR}, #{groupPackageAmount,jdbcType=DECIMAL}, #{groupPackageUnit,jdbcType=VARCHAR},
+                #{packageAmount,jdbcType=DECIMAL}, #{packageUnit,jdbcType=VARCHAR}, #{theoryAmount,jdbcType=DECIMAL},
+                #{measureBatch,jdbcType=VARCHAR}, #{measureBatchCount,jdbcType=DECIMAL}, #{senderType,jdbcType=VARCHAR},
+                #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR}, #{receiverRemark,jdbcType=VARCHAR},
+                #{trustDepartmentName,jdbcType=VARCHAR}, #{trustDepartment,jdbcType=VARCHAR}, #{trustor,jdbcType=VARCHAR},
+                #{trustDateTime,jdbcType=TIMESTAMP}, #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+                #{trustIp,jdbcType=VARCHAR}, #{stationType,jdbcType=VARCHAR}, #{measureStation,jdbcType=VARCHAR},
+                #{measureStationName,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{trustDay,jdbcType=DECIMAL}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale">
         insert into PRE_RAILWAY_SCALE
@@ -805,6 +1123,90 @@
             <if test="station != null">
                 STATION,
             </if>
+            <if test="voucherIdentity != null">
+                VOUCHER_IDENTITY,
+            </if>
+            <if test="voucherItem != null">
+                VOUCHER_ITEM,
+            </if>
+            <if test="businessGroup != null">
+                BUSINESS_GROUP,
+            </if>
+            <if test="tempConveyance != null">
+                TEMP_CONVEYANCE,
+            </if>
+            <if test="conveyanceType != null">
+                CONVEYANCE_TYPE,
+            </if>
+            <if test="resourceSystem != null">
+                RESOURCE_SYSTEM,
+            </if>
+            <if test="groupPackageAmount != null">
+                GROUP_PACKAGE_AMOUNT,
+            </if>
+            <if test="groupPackageUnit != null">
+                GROUP_PACKAGE_UNIT,
+            </if>
+            <if test="packageAmount != null">
+                PACKAGE_AMOUNT,
+            </if>
+            <if test="packageUnit != null">
+                PACKAGE_UNIT,
+            </if>
+            <if test="theoryAmount != null">
+                THEORY_AMOUNT,
+            </if>
+            <if test="measureBatch != null">
+                MEASURE_BATCH,
+            </if>
+            <if test="measureBatchCount != null">
+                MEASURE_BATCH_COUNT,
+            </if>
+            <if test="senderType != null">
+                SENDER_TYPE,
+            </if>
+            <if test="senderRemark != null">
+                SENDER_REMARK,
+            </if>
+            <if test="receiverType != null">
+                RECEIVER_TYPE,
+            </if>
+            <if test="receiverRemark != null">
+                RECEIVER_REMARK,
+            </if>
+            <if test="trustDepartmentName != null">
+                TRUST_DEPARTMENT_NAME,
+            </if>
+            <if test="trustDepartment != null">
+                TRUST_DEPARTMENT,
+            </if>
+            <if test="trustor != null">
+                TRUSTOR,
+            </if>
+            <if test="trustDateTime != null">
+                TRUST_DATE_TIME,
+            </if>
+            <if test="trustAvailabilityTime != null">
+                TRUST_AVAILABILITY_TIME,
+            </if>
+            <if test="trustIp != null">
+                TRUST_IP,
+            </if>
+            <if test="stationType != null">
+                STATION_TYPE,
+            </if>
+            <if test="measureStation != null">
+                MEASURE_STATION,
+            </if>
+            <if test="measureStationName != null">
+                MEASURE_STATION_NAME,
+            </if>
+            <if test="amountUnit != null">
+                AMOUNT_UNIT,
+            </if>
+            <if test="trustDay != null">
+                TRUST_DAY,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="predictionNo != null">
@@ -972,6 +1374,90 @@
             <if test="station != null">
                 #{station,jdbcType=VARCHAR},
             </if>
+            <if test="voucherIdentity != null">
+                #{voucherIdentity,jdbcType=VARCHAR},
+            </if>
+            <if test="voucherItem != null">
+                #{voucherItem,jdbcType=VARCHAR},
+            </if>
+            <if test="businessGroup != null">
+                #{businessGroup,jdbcType=VARCHAR},
+            </if>
+            <if test="tempConveyance != null">
+                #{tempConveyance,jdbcType=VARCHAR},
+            </if>
+            <if test="conveyanceType != null">
+                #{conveyanceType,jdbcType=VARCHAR},
+            </if>
+            <if test="resourceSystem != null">
+                #{resourceSystem,jdbcType=VARCHAR},
+            </if>
+            <if test="groupPackageAmount != null">
+                #{groupPackageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupPackageUnit != null">
+                #{groupPackageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="packageAmount != null">
+                #{packageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="packageUnit != null">
+                #{packageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="theoryAmount != null">
+                #{theoryAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="measureBatch != null">
+                #{measureBatch,jdbcType=VARCHAR},
+            </if>
+            <if test="measureBatchCount != null">
+                #{measureBatchCount,jdbcType=DECIMAL},
+            </if>
+            <if test="senderType != null">
+                #{senderType,jdbcType=VARCHAR},
+            </if>
+            <if test="senderRemark != null">
+                #{senderRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverType != null">
+                #{receiverType,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverRemark != null">
+                #{receiverRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartmentName != null">
+                #{trustDepartmentName,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartment != null">
+                #{trustDepartment,jdbcType=VARCHAR},
+            </if>
+            <if test="trustor != null">
+                #{trustor,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDateTime != null">
+                #{trustDateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustAvailabilityTime != null">
+                #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustIp != null">
+                #{trustIp,jdbcType=VARCHAR},
+            </if>
+            <if test="stationType != null">
+                #{stationType,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStation != null">
+                #{measureStation,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStationName != null">
+                #{measureStationName,jdbcType=VARCHAR},
+            </if>
+            <if test="amountUnit != null">
+                #{amountUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDay != null">
+                #{trustDay,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale">
@@ -1029,7 +1515,35 @@
             RAILWAY_MODEL_NO = #{railwayModelNo,jdbcType=VARCHAR},
             RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR},
             ARRIVAL = #{arrival,jdbcType=VARCHAR},
-            STATION = #{station,jdbcType=VARCHAR}
+            STATION = #{station,jdbcType=VARCHAR},
+            VOUCHER_IDENTITY = #{voucherIdentity,jdbcType=VARCHAR},
+            VOUCHER_ITEM = #{voucherItem,jdbcType=VARCHAR},
+            BUSINESS_GROUP = #{businessGroup,jdbcType=VARCHAR},
+            TEMP_CONVEYANCE = #{tempConveyance,jdbcType=VARCHAR},
+            CONVEYANCE_TYPE = #{conveyanceType,jdbcType=VARCHAR},
+            RESOURCE_SYSTEM = #{resourceSystem,jdbcType=VARCHAR},
+            GROUP_PACKAGE_AMOUNT = #{groupPackageAmount,jdbcType=DECIMAL},
+            GROUP_PACKAGE_UNIT = #{groupPackageUnit,jdbcType=VARCHAR},
+            PACKAGE_AMOUNT = #{packageAmount,jdbcType=DECIMAL},
+            PACKAGE_UNIT = #{packageUnit,jdbcType=VARCHAR},
+            THEORY_AMOUNT = #{theoryAmount,jdbcType=DECIMAL},
+            MEASURE_BATCH = #{measureBatch,jdbcType=VARCHAR},
+            MEASURE_BATCH_COUNT = #{measureBatchCount,jdbcType=DECIMAL},
+            SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+            SENDER_REMARK = #{senderRemark,jdbcType=VARCHAR},
+            RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+            RECEIVER_REMARK = #{receiverRemark,jdbcType=VARCHAR},
+            TRUST_DEPARTMENT_NAME = #{trustDepartmentName,jdbcType=VARCHAR},
+            TRUST_DEPARTMENT = #{trustDepartment,jdbcType=VARCHAR},
+            TRUSTOR = #{trustor,jdbcType=VARCHAR},
+            TRUST_DATE_TIME = #{trustDateTime,jdbcType=TIMESTAMP},
+            TRUST_AVAILABILITY_TIME = #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+            TRUST_IP = #{trustIp,jdbcType=VARCHAR},
+            STATION_TYPE = #{stationType,jdbcType=VARCHAR},
+            MEASURE_STATION = #{measureStation,jdbcType=VARCHAR},
+            MEASURE_STATION_NAME = #{measureStationName,jdbcType=VARCHAR},
+            AMOUNT_UNIT = #{amountUnit,jdbcType=VARCHAR},
+            TRUST_DAY = #{trustDay,jdbcType=DECIMAL}
         where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale">
@@ -1197,6 +1711,90 @@
             <if test="station != null">
                 STATION = #{station,jdbcType=VARCHAR},
             </if>
+            <if test="voucherIdentity != null">
+                VOUCHER_IDENTITY = #{voucherIdentity,jdbcType=VARCHAR},
+            </if>
+            <if test="voucherItem != null">
+                VOUCHER_ITEM = #{voucherItem,jdbcType=VARCHAR},
+            </if>
+            <if test="businessGroup != null">
+                BUSINESS_GROUP = #{businessGroup,jdbcType=VARCHAR},
+            </if>
+            <if test="tempConveyance != null">
+                TEMP_CONVEYANCE = #{tempConveyance,jdbcType=VARCHAR},
+            </if>
+            <if test="conveyanceType != null">
+                CONVEYANCE_TYPE = #{conveyanceType,jdbcType=VARCHAR},
+            </if>
+            <if test="resourceSystem != null">
+                RESOURCE_SYSTEM = #{resourceSystem,jdbcType=VARCHAR},
+            </if>
+            <if test="groupPackageAmount != null">
+                GROUP_PACKAGE_AMOUNT = #{groupPackageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupPackageUnit != null">
+                GROUP_PACKAGE_UNIT = #{groupPackageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="packageAmount != null">
+                PACKAGE_AMOUNT = #{packageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="packageUnit != null">
+                PACKAGE_UNIT = #{packageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="theoryAmount != null">
+                THEORY_AMOUNT = #{theoryAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="measureBatch != null">
+                MEASURE_BATCH = #{measureBatch,jdbcType=VARCHAR},
+            </if>
+            <if test="measureBatchCount != null">
+                MEASURE_BATCH_COUNT = #{measureBatchCount,jdbcType=DECIMAL},
+            </if>
+            <if test="senderType != null">
+                SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+            </if>
+            <if test="senderRemark != null">
+                SENDER_REMARK = #{senderRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverType != null">
+                RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverRemark != null">
+                RECEIVER_REMARK = #{receiverRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartmentName != null">
+                TRUST_DEPARTMENT_NAME = #{trustDepartmentName,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartment != null">
+                TRUST_DEPARTMENT = #{trustDepartment,jdbcType=VARCHAR},
+            </if>
+            <if test="trustor != null">
+                TRUSTOR = #{trustor,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDateTime != null">
+                TRUST_DATE_TIME = #{trustDateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustAvailabilityTime != null">
+                TRUST_AVAILABILITY_TIME = #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustIp != null">
+                TRUST_IP = #{trustIp,jdbcType=VARCHAR},
+            </if>
+            <if test="stationType != null">
+                STATION_TYPE = #{stationType,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStation != null">
+                MEASURE_STATION = #{measureStation,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStationName != null">
+                MEASURE_STATION_NAME = #{measureStationName,jdbcType=VARCHAR},
+            </if>
+            <if test="amountUnit != null">
+                AMOUNT_UNIT = #{amountUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDay != null">
+                TRUST_DAY = #{trustDay,jdbcType=DECIMAL},
+            </if>
         </set>
         where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
     </update>
@@ -1207,12 +1805,10 @@
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="where"/>
-        order by CREATE_TIME desc
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="whereLike"/>
-        order by CREATE_TIME desc
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into PRE_RAILWAY_SCALE
@@ -1238,8 +1834,20 @@
         UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
         DELETE_TIME, P_VALUE_FLAG, IS_CHEMICAL,
         LIMIT_WEIGHT, RAILWAY_MODEL_NO,
-        RAILWAY_MODEL_NAME, ARRIVAL, STATION
-        )
+        RAILWAY_MODEL_NAME, ARRIVAL, STATION,
+        VOUCHER_IDENTITY, VOUCHER_ITEM,
+        BUSINESS_GROUP, TEMP_CONVEYANCE,
+        CONVEYANCE_TYPE, RESOURCE_SYSTEM,
+        GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+        PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT,
+        MEASURE_BATCH, MEASURE_BATCH_COUNT,
+        SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+        RECEIVER_REMARK, TRUST_DEPARTMENT_NAME,
+        TRUST_DEPARTMENT, TRUSTOR, TRUST_DATE_TIME,
+        TRUST_AVAILABILITY_TIME, TRUST_IP,
+        STATION_TYPE, MEASURE_STATION,
+        MEASURE_STATION_NAME, AMOUNT_UNIT,
+        TRUST_DAY)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.predictionNo,jdbcType=VARCHAR},
@@ -1264,8 +1872,20 @@
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR},
         #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.pValueFlag,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR},
         #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR},
-        #{item.railwayModelName,jdbcType=VARCHAR}, #{item.arrival,jdbcType=VARCHAR}, #{item.station,jdbcType=VARCHAR}
-        from dual
+        #{item.railwayModelName,jdbcType=VARCHAR}, #{item.arrival,jdbcType=VARCHAR}, #{item.station,jdbcType=VARCHAR},
+        #{item.voucherIdentity,jdbcType=VARCHAR}, #{item.voucherItem,jdbcType=VARCHAR},
+        #{item.businessGroup,jdbcType=VARCHAR}, #{item.tempConveyance,jdbcType=VARCHAR},
+        #{item.conveyanceType,jdbcType=VARCHAR}, #{item.resourceSystem,jdbcType=VARCHAR},
+        #{item.groupPackageAmount,jdbcType=DECIMAL}, #{item.groupPackageUnit,jdbcType=VARCHAR},
+        #{item.packageAmount,jdbcType=DECIMAL}, #{item.packageUnit,jdbcType=VARCHAR}, #{item.theoryAmount,jdbcType=DECIMAL},
+        #{item.measureBatch,jdbcType=VARCHAR}, #{item.measureBatchCount,jdbcType=DECIMAL},
+        #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR},
+        #{item.receiverRemark,jdbcType=VARCHAR}, #{item.trustDepartmentName,jdbcType=VARCHAR},
+        #{item.trustDepartment,jdbcType=VARCHAR}, #{item.trustor,jdbcType=VARCHAR}, #{item.trustDateTime,jdbcType=TIMESTAMP},
+        #{item.trustAvailabilityTime,jdbcType=TIMESTAMP}, #{item.trustIp,jdbcType=VARCHAR},
+        #{item.stationType,jdbcType=VARCHAR}, #{item.measureStation,jdbcType=VARCHAR},
+        #{item.measureStationName,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR},
+        #{item.trustDay,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -1491,6 +2111,118 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
             when #{item.predictionNo,jdbcType=VARCHAR} then #{item.station,jdbcType=VARCHAR}
         </foreach>
+        ,VOUCHER_IDENTITY=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.voucherIdentity,jdbcType=VARCHAR}
+        </foreach>
+        ,VOUCHER_ITEM=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.voucherItem,jdbcType=VARCHAR}
+        </foreach>
+        ,BUSINESS_GROUP=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.businessGroup,jdbcType=VARCHAR}
+        </foreach>
+        ,TEMP_CONVEYANCE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.tempConveyance,jdbcType=VARCHAR}
+        </foreach>
+        ,CONVEYANCE_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.conveyanceType,jdbcType=VARCHAR}
+        </foreach>
+        ,RESOURCE_SYSTEM=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.resourceSystem,jdbcType=VARCHAR}
+        </foreach>
+        ,GROUP_PACKAGE_AMOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.groupPackageAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,GROUP_PACKAGE_UNIT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.groupPackageUnit,jdbcType=VARCHAR}
+        </foreach>
+        ,PACKAGE_AMOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.packageAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,PACKAGE_UNIT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.packageUnit,jdbcType=VARCHAR}
+        </foreach>
+        ,THEORY_AMOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.theoryAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,MEASURE_BATCH=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureBatch,jdbcType=VARCHAR}
+        </foreach>
+        ,MEASURE_BATCH_COUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureBatchCount,jdbcType=DECIMAL}
+        </foreach>
+        ,SENDER_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+        </foreach>
+        ,SENDER_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.senderRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,RECEIVER_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receiverType,jdbcType=VARCHAR}
+        </foreach>
+        ,RECEIVER_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receiverRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DEPARTMENT_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDepartmentName,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DEPARTMENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDepartment,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUSTOR=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustor,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,TRUST_AVAILABILITY_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustAvailabilityTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,TRUST_IP=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustIp,jdbcType=VARCHAR}
+        </foreach>
+        ,STATION_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.stationType,jdbcType=VARCHAR}
+        </foreach>
+        ,MEASURE_STATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureStation,jdbcType=VARCHAR}
+        </foreach>
+        ,MEASURE_STATION_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureStationName,jdbcType=VARCHAR}
+        </foreach>
+        ,AMOUNT_UNIT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.amountUnit,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DAY=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDay,jdbcType=DECIMAL}
+        </foreach>
         where PREDICTION_NO in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.predictionNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/pretrack/prerailwayscale/model/PreRailwayScale.java

@@ -339,6 +339,174 @@ public class PreRailwayScale implements IBasePO<String> {
     @ApiModelProperty(value="发站",required=false)
     private String station;
 
+    /**
+     * 主凭据号(VOUCHER_IDENTITY,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据号",required=false)
+    private String voucherIdentity;
+
+    /**
+     * 主凭据行(VOUCHER_ITEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据行",required=false)
+    private String voucherItem;
+
+    /**
+     * 主业务类型组(BUSINESS_GROUP,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主业务类型组",required=false)
+    private String businessGroup;
+
+    /**
+     * 临时牌号(TEMP_CONVEYANCE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="临时牌号",required=false)
+    private String tempConveyance;
+
+    /**
+     * 车型(CONVEYANCE_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String conveyanceType;
+
+    /**
+     * 委托源系统(RESOURCE_SYSTEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="委托源系统",required=false)
+    private String resourceSystem;
+
+    /**
+     * 分组计件件量(GROUP_PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="分组计件件量",required=false)
+    private Long groupPackageAmount;
+
+    /**
+     * 分组计量单位(GROUP_PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="分组计量单位",required=false)
+    private String groupPackageUnit;
+
+    /**
+     * 标准件数(PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="标准件数",required=false)
+    private Long packageAmount;
+
+    /**
+     * 计件单位(PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计件单位",required=false)
+    private String packageUnit;
+
+    /**
+     * 理论量(THEORY_AMOUNT,DECIMAL,16)
+     */
+    @ApiModelProperty(value="理论量",required=false)
+    private BigDecimal theoryAmount;
+
+    /**
+     * 计量组批号(MEASURE_BATCH,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量组批号",required=false)
+    private String measureBatch;
+
+    /**
+     * 计量组批车数(MEASURE_BATCH_COUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="计量组批车数",required=false)
+    private Long measureBatchCount;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="发货点类型",required=false)
+    private String senderType;
+
+    /**
+     * 发货点备注(SENDER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货点备注",required=false)
+    private String senderRemark;
+
+    /**
+     * 收货点类型(RECEIVER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String receiverType;
+
+    /**
+     * 收货点备注(RECEIVER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货点备注",required=false)
+    private String receiverRemark;
+
+    /**
+     * 委托部门名称(TRUST_DEPARTMENT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="委托部门名称",required=false)
+    private String trustDepartmentName;
+
+    /**
+     * 签发部门编码(TRUST_DEPARTMENT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="签发部门编码",required=false)
+    private String trustDepartment;
+
+    /**
+     * 签发人(TRUSTOR,VARCHAR,30)
+     */
+    @ApiModelProperty(value="签发人",required=false)
+    private String trustor;
+
+    /**
+     * 签发时间(TRUST_DATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签发时间",required=false)
+    private Date trustDateTime;
+
+    /**
+     * 有效期截至时间(TRUST_AVAILABILITY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="有效期截至时间",required=false)
+    private Date trustAvailabilityTime;
+
+    /**
+     * 签发机器ip(TRUST_IP,VARCHAR,30)
+     */
+    @ApiModelProperty(value="签发机器ip",required=false)
+    private String trustIp;
+
+    /**
+     * 使用秤体类型(STATION_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="使用秤体类型",required=false)
+    private String stationType;
+
+    /**
+     * 使用站点编号(MEASURE_STATION,VARCHAR,30)
+     */
+    @ApiModelProperty(value="使用站点编号",required=false)
+    private String measureStation;
+
+    /**
+     * 使用站点(MEASURE_STATION_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="使用站点",required=false)
+    private String measureStationName;
+
+    /**
+     * 计量单位(AMOUNT_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量单位",required=false)
+    private String amountUnit;
+
+    /**
+     * 委托有效天数(TRUST_DAY,DECIMAL,1)
+     */
+    @ApiModelProperty(value="委托有效天数",required=false)
+    private Short trustDay;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -791,6 +959,230 @@ public class PreRailwayScale implements IBasePO<String> {
         this.station = station == null ? null : station.trim();
     }
 
+    public String getVoucherIdentity() {
+        return voucherIdentity;
+    }
+
+    public void setVoucherIdentity(String voucherIdentity) {
+        this.voucherIdentity = voucherIdentity == null ? null : voucherIdentity.trim();
+    }
+
+    public String getVoucherItem() {
+        return voucherItem;
+    }
+
+    public void setVoucherItem(String voucherItem) {
+        this.voucherItem = voucherItem == null ? null : voucherItem.trim();
+    }
+
+    public String getBusinessGroup() {
+        return businessGroup;
+    }
+
+    public void setBusinessGroup(String businessGroup) {
+        this.businessGroup = businessGroup == null ? null : businessGroup.trim();
+    }
+
+    public String getTempConveyance() {
+        return tempConveyance;
+    }
+
+    public void setTempConveyance(String tempConveyance) {
+        this.tempConveyance = tempConveyance == null ? null : tempConveyance.trim();
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType == null ? null : conveyanceType.trim();
+    }
+
+    public String getResourceSystem() {
+        return resourceSystem;
+    }
+
+    public void setResourceSystem(String resourceSystem) {
+        this.resourceSystem = resourceSystem == null ? null : resourceSystem.trim();
+    }
+
+    public Long getGroupPackageAmount() {
+        return groupPackageAmount;
+    }
+
+    public void setGroupPackageAmount(Long groupPackageAmount) {
+        this.groupPackageAmount = groupPackageAmount;
+    }
+
+    public String getGroupPackageUnit() {
+        return groupPackageUnit;
+    }
+
+    public void setGroupPackageUnit(String groupPackageUnit) {
+        this.groupPackageUnit = groupPackageUnit == null ? null : groupPackageUnit.trim();
+    }
+
+    public Long getPackageAmount() {
+        return packageAmount;
+    }
+
+    public void setPackageAmount(Long packageAmount) {
+        this.packageAmount = packageAmount;
+    }
+
+    public String getPackageUnit() {
+        return packageUnit;
+    }
+
+    public void setPackageUnit(String packageUnit) {
+        this.packageUnit = packageUnit == null ? null : packageUnit.trim();
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public String getMeasureBatch() {
+        return measureBatch;
+    }
+
+    public void setMeasureBatch(String measureBatch) {
+        this.measureBatch = measureBatch == null ? null : measureBatch.trim();
+    }
+
+    public Long getMeasureBatchCount() {
+        return measureBatchCount;
+    }
+
+    public void setMeasureBatchCount(Long measureBatchCount) {
+        this.measureBatchCount = measureBatchCount;
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark == null ? null : senderRemark.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getReceiverRemark() {
+        return receiverRemark;
+    }
+
+    public void setReceiverRemark(String receiverRemark) {
+        this.receiverRemark = receiverRemark == null ? null : receiverRemark.trim();
+    }
+
+    public String getTrustDepartmentName() {
+        return trustDepartmentName;
+    }
+
+    public void setTrustDepartmentName(String trustDepartmentName) {
+        this.trustDepartmentName = trustDepartmentName == null ? null : trustDepartmentName.trim();
+    }
+
+    public String getTrustDepartment() {
+        return trustDepartment;
+    }
+
+    public void setTrustDepartment(String trustDepartment) {
+        this.trustDepartment = trustDepartment == null ? null : trustDepartment.trim();
+    }
+
+    public String getTrustor() {
+        return trustor;
+    }
+
+    public void setTrustor(String trustor) {
+        this.trustor = trustor == null ? null : trustor.trim();
+    }
+
+    public Date getTrustDateTime() {
+        return trustDateTime;
+    }
+
+    public void setTrustDateTime(Date trustDateTime) {
+        this.trustDateTime = trustDateTime;
+    }
+
+    public Date getTrustAvailabilityTime() {
+        return trustAvailabilityTime;
+    }
+
+    public void setTrustAvailabilityTime(Date trustAvailabilityTime) {
+        this.trustAvailabilityTime = trustAvailabilityTime;
+    }
+
+    public String getTrustIp() {
+        return trustIp;
+    }
+
+    public void setTrustIp(String trustIp) {
+        this.trustIp = trustIp == null ? null : trustIp.trim();
+    }
+
+    public String getStationType() {
+        return stationType;
+    }
+
+    public void setStationType(String stationType) {
+        this.stationType = stationType == null ? null : stationType.trim();
+    }
+
+    public String getMeasureStation() {
+        return measureStation;
+    }
+
+    public void setMeasureStation(String measureStation) {
+        this.measureStation = measureStation == null ? null : measureStation.trim();
+    }
+
+    public String getMeasureStationName() {
+        return measureStationName;
+    }
+
+    public void setMeasureStationName(String measureStationName) {
+        this.measureStationName = measureStationName == null ? null : measureStationName.trim();
+    }
+
+    public String getAmountUnit() {
+        return amountUnit;
+    }
+
+    public void setAmountUnit(String amountUnit) {
+        this.amountUnit = amountUnit == null ? null : amountUnit.trim();
+    }
+
+    public Short getTrustDay() {
+        return trustDay;
+    }
+
+    public void setTrustDay(Short trustDay) {
+        this.trustDay = trustDay;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -852,6 +1244,34 @@ public class PreRailwayScale implements IBasePO<String> {
         sb.append(", railwayModelName=").append(railwayModelName);
         sb.append(", arrival=").append(arrival);
         sb.append(", station=").append(station);
+        sb.append(", voucherIdentity=").append(voucherIdentity);
+        sb.append(", voucherItem=").append(voucherItem);
+        sb.append(", businessGroup=").append(businessGroup);
+        sb.append(", tempConveyance=").append(tempConveyance);
+        sb.append(", conveyanceType=").append(conveyanceType);
+        sb.append(", resourceSystem=").append(resourceSystem);
+        sb.append(", groupPackageAmount=").append(groupPackageAmount);
+        sb.append(", groupPackageUnit=").append(groupPackageUnit);
+        sb.append(", packageAmount=").append(packageAmount);
+        sb.append(", packageUnit=").append(packageUnit);
+        sb.append(", theoryAmount=").append(theoryAmount);
+        sb.append(", measureBatch=").append(measureBatch);
+        sb.append(", measureBatchCount=").append(measureBatchCount);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", senderRemark=").append(senderRemark);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", receiverRemark=").append(receiverRemark);
+        sb.append(", trustDepartmentName=").append(trustDepartmentName);
+        sb.append(", trustDepartment=").append(trustDepartment);
+        sb.append(", trustor=").append(trustor);
+        sb.append(", trustDateTime=").append(trustDateTime);
+        sb.append(", trustAvailabilityTime=").append(trustAvailabilityTime);
+        sb.append(", trustIp=").append(trustIp);
+        sb.append(", stationType=").append(stationType);
+        sb.append(", measureStation=").append(measureStation);
+        sb.append(", measureStationName=").append(measureStationName);
+        sb.append(", amountUnit=").append(amountUnit);
+        sb.append(", trustDay=").append(trustDay);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();