'提交'

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/controller/MeterWorkCarActualBakController.java

@@ -821,6 +821,25 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "车号汇总统计汇总", notes = "根据传入时间和车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctCarNo")
+    public RESTfulResult distinctCarNoPost(@RequestBody(required = false) HashMap<String, Object> params) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkCarActualBakService.distinctCarNo(params);
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "计量票据录入", notes = "根据MeterWorkCarActual对象创建")
     @ApiImplicitParam(name = "MeterWorkCarActual", value = "详细实体MeterWorkCarActual", required = true, dataType = "MeterWorkCarActual")
     @PostMapping(value = "/checkandadditional")

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/mapper/MeterWorkCarActualBakMapper.xml

@@ -3527,6 +3527,12 @@
     SELECT distinct car_No
     from METER_WORK_CAR_ACTUAL_BAK
     where VALUE_FLAG != '0'
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and NET_SPOT3_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <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>
@@ -3558,6 +3564,12 @@
     <include refid="select"/>
     <where>
       1=1
+      <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+        and NET_SPOT3_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO LIKE '%${actualNo}%'
       </if>
@@ -4182,4 +4194,4 @@
       and matter_name LIKE '%${matterName}%'
     </if>
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/controller/MeterWorkCarActualFirstBakController.java

@@ -1053,6 +1053,36 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
 //            String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
 //            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
 
+//            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, baseSpotNo, matterName, predictionNo, forwardingUnitName,receivingUintName,valueFlag);
+            List<String> rows = meterWorkCarActualFirstBakService.distinctCarNo(param);
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value = "车号汇总统计汇总-网页", notes = "根据传入时间和车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctCarNo")
+    public RESTfulResult distinctCarNoPost(@RequestBody(required = false) HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+//            String carNo = param.get("carNo") == null ? "":param.get("carNo").toString();
+//            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+//            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+//            String baseSpotNo = param.get("baseSpotNo") == null ? "": param.get("baseSpotNo").toString();
+//            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
+//            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
+//            String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
+//            String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
+//            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
+
 //            List<String> rows = meterWorkCarActualFirstService.distinctCarNo(carNo, startTime, endTime, baseSpotNo, matterName, predictionNo, forwardingUnitName,receivingUintName,valueFlag);
             List<String> rows = meterWorkCarActualFirstBakService.distinctCarNo(param);
             return success(rows);

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/mapper/MeterWorkCarActualFirstBakMapper.xml

@@ -2803,6 +2803,12 @@
     SELECT distinct car_No
     from METER_WORK_CAR_ACTUAL_FIRST_BAK
     where 1=1
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and BASE_SPOT_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <if test="carNo != null and carNo != ''">
       and CAR_NO like '%${carNo}%'
     </if>
@@ -2858,6 +2864,12 @@
     <if test="groupId != null and groupId != ''">
       and BASE_SPOT_NO in (SELECT METER_BASE_GROUP_SPOT.SPOT_ID FROM METER_BASE_GROUP_SPOT WHERE METER_BASE_GROUP_SPOT.GROUP_ID = #{groupId})
     </if>
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and BASE_SPOT_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     order by create_time desc
   </select>
 
@@ -2879,4 +2891,4 @@
     </if>
     order by create_time desc
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/controller/MeterWorkRailwayActFirstBakController.java

@@ -560,6 +560,20 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "一次数据维护-网页", notes = "根据传入时间和火车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctRailwayNo")
+    public RESTfulResult distinctRailwayNoPost(@RequestBody(required = false) HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkRailwayActFirstBakService.distinctRailwayNo(param);
+            return success(rows);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "一次数据维护-网页", notes = "根据传入开始时间、结束时间、轨道衡类型、车号、计量点编号、及连点去重列次编号")
     @PostMapping(value = "/distinctLcNo")
     public RESTfulResult distinctLcNo(@RequestBody HashMap param) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/mapper/MeterWorkRailwayActFirstBakMapper.xml

@@ -100,43 +100,43 @@
     <result column="LC_NO" jdbcType="VARCHAR" property="lcNo" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
-    RAILWAY_SPEED, MATTER_NO, MATTER_NAME, CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, 
-    CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-    RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, 
-    SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME, 
-    SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION, 
-    METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT, 
-    WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME, 
-    CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG, 
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-    CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, LIMIT_WEIGHT, 
-    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, RAILWAY_FACTORY_WEIGHT, WATER_NUM, ARRIVAL, 
-    STATION, SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, 
+    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+    RAILWAY_SPEED, MATTER_NO, MATTER_NAME, CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
+    CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+    RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
+    SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME,
+    SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION,
+    METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
+    WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
+    CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+    CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, LIMIT_WEIGHT,
+    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, RAILWAY_FACTORY_WEIGHT, WATER_NUM, ARRIVAL,
+    STATION, SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM,
     DATA_SOURCE, NOTE, TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15, CANCEL_TYPE, LC_NO
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, 
-    t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.MATTER_NO, t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, 
-    t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, 
-    t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, 
-    t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.BIND_CARD_NO, 
-    t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, 
-    t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_TYPE_NO, 
-    t.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, t.METER_WEIGHT, 
-    t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, 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, t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, 
-    t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, t.RAILWAY_FACTORY_WEIGHT, 
-    t.WATER_NUM, t.ARRIVAL, t.STATION, t.SOURCE_AREA, 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.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.DATA_SOURCE, t.NOTE, 
+    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO,
+    t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.MATTER_NO, t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO,
+    t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME,
+    t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO,
+    t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.BIND_CARD_NO,
+    t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO,
+    t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_TYPE_NO,
+    t.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, t.METER_WEIGHT,
+    t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, 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, t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME,
+    t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, t.RAILWAY_FACTORY_WEIGHT,
+    t.WATER_NUM, t.ARRIVAL, t.STATION, t.SOURCE_AREA, 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.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.DATA_SOURCE, t.NOTE,
     t.TRAIN_NUMBER_NO, t.IS_PRE_SACALE, t.HC15, t.CANCEL_TYPE, t.LC_NO
   </sql>
   <sql id="select">
@@ -146,7 +146,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_WORK_RAILWAY_ACT_FIRST_BAK t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO = #{actualFirstNo}
       </if>
@@ -438,7 +438,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
       </if>
@@ -742,7 +742,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_RAILWAY_ACT_FIRST_BAK
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -1031,70 +1031,70 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirstbak.model.MeterWorkRailwayActFirstBak">
     insert into METER_WORK_RAILWAY_ACT_FIRST_BAK (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO,
-      RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
-      RAILWAY_SPEED, MATTER_NO, MATTER_NAME, 
-      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, 
-      CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, 
-      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, 
-      MATERIAL_NO, MATERIAL_NAME, SPEC_NO, 
-      SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, 
-      SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, 
-      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, 
-      CARRIER_UNIT_NO, CARRIER_UNIT_NAME, PREDICTION_TYPE, 
-      PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME, 
-      METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-      METER_WEIGHT, WEIGHT_TYPE, METER_SORT_WEIGHT, 
-      METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, 
-      METER_CLASS, METER_GROUP, MEMO, 
-      VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, 
-      CHECK_MAN_NAME, CHECK_TIME, METER_MODE, 
-      RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, 
-      LIMIT_WEIGHT, RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, 
-      RAILWAY_FACTORY_WEIGHT, WATER_NUM, ARRIVAL, 
-      STATION, SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
-      MEASURE_TASK_NUM, DATA_SOURCE, NOTE, 
-      TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15, 
+      RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+      RAILWAY_SPEED, MATTER_NO, MATTER_NAME,
+      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
+      CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO,
+      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
+      MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
+      SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
+      SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO,
+      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER,
+      CARRIER_UNIT_NO, CARRIER_UNIT_NAME, PREDICTION_TYPE,
+      PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME,
+      METER_PROCESS_NO, METER_PROCESS_EDITION_NO,
+      METER_WEIGHT, WEIGHT_TYPE, METER_SORT_WEIGHT,
+      METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
+      CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME,
+      METER_CLASS, METER_GROUP, MEMO,
+      VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+      UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO,
+      CHECK_MAN_NAME, CHECK_TIME, METER_MODE,
+      RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL,
+      LIMIT_WEIGHT, RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME,
+      RAILWAY_FACTORY_WEIGHT, WATER_NUM, ARRIVAL,
+      STATION, SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
+      MEASURE_TASK_NUM, DATA_SOURCE, NOTE,
+      TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15,
       CANCEL_TYPE, LC_NO)
-    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
-      #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR}, 
-      #{railwaySpeed,jdbcType=DECIMAL}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
-      #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, #{customerSupplierNo,jdbcType=VARCHAR}, 
-      #{customerSupplierName,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR}, 
-      #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, #{receivingUintName,jdbcType=VARCHAR}, 
-      #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{specNo,jdbcType=VARCHAR}, 
-      #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL}, 
-      #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, #{loadPointNo,jdbcType=VARCHAR}, 
-      #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR}, #{sampleVoucher,jdbcType=VARCHAR}, 
-      #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR}, 
-      #{predictionCombination,jdbcType=VARCHAR}, #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, 
-      #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR}, 
-      #{meterWeight,jdbcType=DECIMAL}, #{weightType,jdbcType=VARCHAR}, #{meterSortWeight,jdbcType=DECIMAL}, 
-      #{meterBalanceWeight,jdbcType=DECIMAL}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
-      #{meterClass,jdbcType=VARCHAR}, #{meterGroup,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
-      #{valueFlag,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR}, 
-      #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, #{meterMode,jdbcType=VARCHAR}, 
-      #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR}, #{isChemical,jdbcType=VARCHAR}, 
-      #{limitWeight,jdbcType=DECIMAL}, #{railwayModelNo,jdbcType=VARCHAR}, #{railwayModelName,jdbcType=VARCHAR}, 
-      #{railwayFactoryWeight,jdbcType=DECIMAL}, #{waterNum,jdbcType=DECIMAL}, #{arrival,jdbcType=VARCHAR}, 
-      #{station,jdbcType=VARCHAR}, #{sourceArea,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}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR}, 
-      #{measureTaskNum,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{trainNumberNo,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{hc15,jdbcType=VARCHAR}, 
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR},
+      #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR},
+      #{railwaySpeed,jdbcType=DECIMAL}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR},
+      #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, #{customerSupplierNo,jdbcType=VARCHAR},
+      #{customerSupplierName,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR},
+      #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, #{receivingUintName,jdbcType=VARCHAR},
+      #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{specNo,jdbcType=VARCHAR},
+      #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL},
+      #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, #{loadPointNo,jdbcType=VARCHAR},
+      #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR}, #{sampleVoucher,jdbcType=VARCHAR},
+      #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR},
+      #{predictionCombination,jdbcType=VARCHAR}, #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR},
+      #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR},
+      #{meterWeight,jdbcType=DECIMAL}, #{weightType,jdbcType=VARCHAR}, #{meterSortWeight,jdbcType=DECIMAL},
+      #{meterBalanceWeight,jdbcType=DECIMAL}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR},
+      #{meterClass,jdbcType=VARCHAR}, #{meterGroup,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR},
+      #{valueFlag,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR},
+      #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, #{meterMode,jdbcType=VARCHAR},
+      #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR}, #{isChemical,jdbcType=VARCHAR},
+      #{limitWeight,jdbcType=DECIMAL}, #{railwayModelNo,jdbcType=VARCHAR}, #{railwayModelName,jdbcType=VARCHAR},
+      #{railwayFactoryWeight,jdbcType=DECIMAL}, #{waterNum,jdbcType=DECIMAL}, #{arrival,jdbcType=VARCHAR},
+      #{station,jdbcType=VARCHAR}, #{sourceArea,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}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR},
+      #{measureTaskNum,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR},
+      #{trainNumberNo,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{hc15,jdbcType=VARCHAR},
       #{cancelType,jdbcType=VARCHAR}, #{lcNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirstbak.model.MeterWorkRailwayActFirstBak">
@@ -2085,85 +2085,85 @@
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_WORK_RAILWAY_ACT_FIRST_BAK
       (ACTUAL_FIRST_NO,
-      PREDICTION_NO, NOTICE_NO, RAILWAY_NO, 
-      RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
-      RAILWAY_SPEED, MATTER_NO, MATTER_NAME, 
-      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, 
-      CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, 
-      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-      RECEIVING_UINT_NAME, MATERIAL_NO, 
-      MATERIAL_NAME, SPEC_NO, SPEC_NAME, 
-      SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, 
-      SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, 
-      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, 
-      CARRIER_UNIT_NO, CARRIER_UNIT_NAME, 
-      PREDICTION_TYPE, PREDICTION_COMBINATION, 
-      METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, 
-      METER_PROCESS_EDITION_NO, METER_WEIGHT, 
-      WEIGHT_TYPE, METER_SORT_WEIGHT, 
-      METER_BALANCE_WEIGHT, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, 
-      BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, 
-      METER_GROUP, MEMO, VALUE_FLAG, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-      CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, 
-      RAILWAY_TYPE_NAME, IS_CHEMICAL, 
-      LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME, RAILWAY_FACTORY_WEIGHT, 
-      WATER_NUM, ARRIVAL, STATION, 
-      SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
-      MEASURE_TASK_NUM, DATA_SOURCE, NOTE, 
-      TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15, 
+      PREDICTION_NO, NOTICE_NO, RAILWAY_NO,
+      RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+      RAILWAY_SPEED, MATTER_NO, MATTER_NAME,
+      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
+      CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO,
+      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+      RECEIVING_UINT_NAME, MATERIAL_NO,
+      MATERIAL_NAME, SPEC_NO, SPEC_NAME,
+      SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
+      SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO,
+      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER,
+      CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
+      PREDICTION_TYPE, PREDICTION_COMBINATION,
+      METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO,
+      METER_PROCESS_EDITION_NO, METER_WEIGHT,
+      WEIGHT_TYPE, METER_SORT_WEIGHT,
+      METER_BALANCE_WEIGHT, CREATE_MAN_NO,
+      CREATE_MAN_NAME, CREATE_TIME,
+      BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS,
+      METER_GROUP, MEMO, VALUE_FLAG,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+      CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO,
+      RAILWAY_TYPE_NAME, IS_CHEMICAL,
+      LIMIT_WEIGHT, RAILWAY_MODEL_NO,
+      RAILWAY_MODEL_NAME, RAILWAY_FACTORY_WEIGHT,
+      WATER_NUM, ARRIVAL, STATION,
+      SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
+      MEASURE_TASK_NUM, DATA_SOURCE, NOTE,
+      TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15,
       CANCEL_TYPE, LC_NO)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualFirstNo,jdbcType=VARCHAR}, 
-      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR}, 
-      #{item.railwayCarriageNo,jdbcType=VARCHAR}, #{item.railwayWorkNo,jdbcType=VARCHAR}, 
-      #{item.railwaySpeed,jdbcType=DECIMAL}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, 
-      #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR}, 
-      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR}, 
-      #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR}, 
-      #{item.receivingUintName,jdbcType=VARCHAR}, #{item.materialNo,jdbcType=VARCHAR}, 
-      #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, #{item.specName,jdbcType=VARCHAR}, 
-      #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL}, 
-      #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR}, 
-      #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR}, 
-      #{item.carrierUnitNo,jdbcType=VARCHAR}, #{item.carrierUnitName,jdbcType=VARCHAR}, 
-      #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR}, 
-      #{item.meterTypeNo,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR}, 
-      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, 
-      #{item.weightType,jdbcType=VARCHAR}, #{item.meterSortWeight,jdbcType=DECIMAL}, 
-      #{item.meterBalanceWeight,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR}, 
-      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.meterClass,jdbcType=VARCHAR}, 
-      #{item.meterGroup,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR}, 
-      #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR}, 
-      #{item.railwayTypeName,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR}, 
-      #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR}, 
-      #{item.railwayModelName,jdbcType=VARCHAR}, #{item.railwayFactoryWeight,jdbcType=DECIMAL}, 
-      #{item.waterNum,jdbcType=DECIMAL}, #{item.arrival,jdbcType=VARCHAR}, #{item.station,jdbcType=VARCHAR}, 
-      #{item.sourceArea,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.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR}, 
-      #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, 
-      #{item.trainNumberNo,jdbcType=VARCHAR}, #{item.isPreSacale,jdbcType=VARCHAR}, #{item.hc15,jdbcType=VARCHAR}, 
-      #{item.cancelType,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.actualFirstNo,jdbcType=VARCHAR},
+      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR},
+      #{item.railwayCarriageNo,jdbcType=VARCHAR}, #{item.railwayWorkNo,jdbcType=VARCHAR},
+      #{item.railwaySpeed,jdbcType=DECIMAL}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR},
+      #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR},
+      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR},
+      #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR},
+      #{item.receivingUintName,jdbcType=VARCHAR}, #{item.materialNo,jdbcType=VARCHAR},
+      #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, #{item.specName,jdbcType=VARCHAR},
+      #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL},
+      #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR},
+      #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR},
+      #{item.carrierUnitNo,jdbcType=VARCHAR}, #{item.carrierUnitName,jdbcType=VARCHAR},
+      #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR},
+      #{item.meterTypeNo,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR},
+      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL},
+      #{item.weightType,jdbcType=VARCHAR}, #{item.meterSortWeight,jdbcType=DECIMAL},
+      #{item.meterBalanceWeight,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR},
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.meterClass,jdbcType=VARCHAR},
+      #{item.meterGroup,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR},
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR},
+      #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR},
+      #{item.railwayTypeName,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR},
+      #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR},
+      #{item.railwayModelName,jdbcType=VARCHAR}, #{item.railwayFactoryWeight,jdbcType=DECIMAL},
+      #{item.waterNum,jdbcType=DECIMAL}, #{item.arrival,jdbcType=VARCHAR}, #{item.station,jdbcType=VARCHAR},
+      #{item.sourceArea,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.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR},
+      #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR},
+      #{item.trainNumberNo,jdbcType=VARCHAR}, #{item.isPreSacale,jdbcType=VARCHAR}, #{item.hc15,jdbcType=VARCHAR},
+      #{item.cancelType,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2553,14 +2553,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.lcNo,jdbcType=VARCHAR}
        </foreach>
-     where ACTUAL_FIRST_NO in 
+     where ACTUAL_FIRST_NO in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualFirstNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_RAILWAY_ACT_FIRST_BAK
-    where ACTUAL_FIRST_NO in 
+    where ACTUAL_FIRST_NO in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -3230,6 +3230,12 @@
     <include refid="select"/>
     <where>
       1 = 1
+      <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+        and BASE_SPOT_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
       </if>
@@ -3508,6 +3514,12 @@
     SELECT distinct RAILWAY_NO, create_time
     from METER_WORK_RAILWAY_ACT_FIRST_BAK
     where 1=1
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and BASE_SPOT_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <!--and RAILWAY_NO like '%${railwayNo}%'-->
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
@@ -3559,6 +3571,12 @@
     SELECT distinct LC_NO, railway_no, create_time
     from METER_WORK_RAILWAY_ACT_FIRST_BAK
     where 1=1
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and BASE_SPOT_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
@@ -3681,4 +3699,4 @@
     </if>
     order by carriage_Code desc, A.create_time desc
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/mapper/MeterWorkRailwayActualBakMapper.xml

@@ -114,47 +114,47 @@
     <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
-    MATTER_NAME, CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-    FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, 
-    MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_VOUCHER, 
-    CARRIER_UNIT_NO, CARRIER_UNIT_NAME, METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, 
-    METER_PROCESS_EDITION_NO, ACTUAL_FIRST1_NO, GROSS_WEIGHT, GROSS_MAN_NO, GROSS_MAN_NAME, 
-    GROSS_TIME, BASE_SPOT1_NO, BASE_SPOT1_NAME, GROSS_CLASS, GROSS_GROUP, GROSS_MODE, 
-    ACTUAL_FIRST2_NO, TARE_WEIGHT, TARE_MAN_NO, TARE_MAN_NAME, TARE_TIME, BASE_SPOT2_NO, 
-    BASE_SPOT2_NAME, TARE_CLASS, TARE_GROUP, TARE_MODE, NET_WEIGHT, NET_MAN_NO, NET_MAN_NAME, 
-    NET_TIME, NET_SPOT3_NO, NET_SPOT3_NAME, NET_CLASS, NET_GROUP, NET_MODE, VALUE_FLAG, 
-    UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, 
-    UPLOAD_TIME, SAMPLE_NO, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, MEMO, WATER_NUM, ARRIVAL, 
-    STATION, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, SOURCE_AREA, 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, 
-    AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, CREATE_TIME, 
-    DATA_SOURCE, NOTE, IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, PREDICTION_COMBINATION, 
+    ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO,
+    MATTER_NAME, CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+    FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
+    MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_VOUCHER,
+    CARRIER_UNIT_NO, CARRIER_UNIT_NAME, METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO,
+    METER_PROCESS_EDITION_NO, ACTUAL_FIRST1_NO, GROSS_WEIGHT, GROSS_MAN_NO, GROSS_MAN_NAME,
+    GROSS_TIME, BASE_SPOT1_NO, BASE_SPOT1_NAME, GROSS_CLASS, GROSS_GROUP, GROSS_MODE,
+    ACTUAL_FIRST2_NO, TARE_WEIGHT, TARE_MAN_NO, TARE_MAN_NAME, TARE_TIME, BASE_SPOT2_NO,
+    BASE_SPOT2_NAME, TARE_CLASS, TARE_GROUP, TARE_MODE, NET_WEIGHT, NET_MAN_NO, NET_MAN_NAME,
+    NET_TIME, NET_SPOT3_NO, NET_SPOT3_NAME, NET_CLASS, NET_GROUP, NET_MODE, VALUE_FLAG,
+    UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME,
+    UPLOAD_TIME, SAMPLE_NO, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, MEMO, WATER_NUM, ARRIVAL,
+    STATION, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, SOURCE_AREA, 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,
+    AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, CREATE_TIME,
+    DATA_SOURCE, NOTE, IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, PREDICTION_COMBINATION,
     BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, 
-    t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, 
-    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, 
-    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, 
-    t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.METER_TYPE_NO, t.METER_TYPE_NAME, 
-    t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, t.ACTUAL_FIRST1_NO, t.GROSS_WEIGHT, 
-    t.GROSS_MAN_NO, t.GROSS_MAN_NAME, t.GROSS_TIME, t.BASE_SPOT1_NO, t.BASE_SPOT1_NAME, 
-    t.GROSS_CLASS, t.GROSS_GROUP, t.GROSS_MODE, t.ACTUAL_FIRST2_NO, t.TARE_WEIGHT, t.TARE_MAN_NO, 
-    t.TARE_MAN_NAME, t.TARE_TIME, t.BASE_SPOT2_NO, t.BASE_SPOT2_NAME, t.TARE_CLASS, t.TARE_GROUP, 
-    t.TARE_MODE, t.NET_WEIGHT, t.NET_MAN_NO, t.NET_MAN_NAME, t.NET_TIME, t.NET_SPOT3_NO, 
-    t.NET_SPOT3_NAME, t.NET_CLASS, t.NET_GROUP, t.NET_MODE, t.VALUE_FLAG, t.UPLOAD_FLAG, 
-    t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.UPLOAD_MAN_NO, t.UPLOAD_MAN_NAME, 
-    t.UPLOAD_TIME, t.SAMPLE_NO, t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, t.MEMO, t.WATER_NUM, 
-    t.ARRIVAL, t.STATION, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.SOURCE_AREA, 
-    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.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, 
-    t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DATA_SOURCE, 
-    t.NOTE, t.IS_PRE_SACALE, t.LC_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.BOUND_LIST_URL, 
+    t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO,
+    t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME,
+    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME,
+    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.LOAD_POINT_NO, t.LOAD_POINT_NAME,
+    t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.METER_TYPE_NO, t.METER_TYPE_NAME,
+    t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, t.ACTUAL_FIRST1_NO, t.GROSS_WEIGHT,
+    t.GROSS_MAN_NO, t.GROSS_MAN_NAME, t.GROSS_TIME, t.BASE_SPOT1_NO, t.BASE_SPOT1_NAME,
+    t.GROSS_CLASS, t.GROSS_GROUP, t.GROSS_MODE, t.ACTUAL_FIRST2_NO, t.TARE_WEIGHT, t.TARE_MAN_NO,
+    t.TARE_MAN_NAME, t.TARE_TIME, t.BASE_SPOT2_NO, t.BASE_SPOT2_NAME, t.TARE_CLASS, t.TARE_GROUP,
+    t.TARE_MODE, t.NET_WEIGHT, t.NET_MAN_NO, t.NET_MAN_NAME, t.NET_TIME, t.NET_SPOT3_NO,
+    t.NET_SPOT3_NAME, t.NET_CLASS, t.NET_GROUP, t.NET_MODE, t.VALUE_FLAG, t.UPLOAD_FLAG,
+    t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.UPLOAD_MAN_NO, t.UPLOAD_MAN_NAME,
+    t.UPLOAD_TIME, t.SAMPLE_NO, t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, t.MEMO, t.WATER_NUM,
+    t.ARRIVAL, t.STATION, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.SOURCE_AREA,
+    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.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE,
+    t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DATA_SOURCE,
+    t.NOTE, t.IS_PRE_SACALE, t.LC_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.BOUND_LIST_URL,
     t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID
   </sql>
   <sql id="select">
@@ -164,7 +164,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_RAILWAY_ACTUAL_BAK t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO = #{actualNo}
       </if>
@@ -498,7 +498,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO LIKE '%${actualNo}%'
       </if>
@@ -837,7 +837,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_RAILWAY_ACTUAL_BAK
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -1168,80 +1168,80 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactualbak.model.MeterWorkRailwayActualBak">
     insert into METER_WORK_RAILWAY_ACTUAL_BAK (ACTUAL_NO, PREDICTION_NO, NOTICE_NO,
-      RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
-      MATTER_NAME, CONTRACT_NO, BATCH_NO, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-      SPEC_NO, SPEC_NAME, LOAD_POINT_NO, 
-      LOAD_POINT_NAME, SAMPLE_VOUCHER, CARRIER_UNIT_NO, 
-      CARRIER_UNIT_NAME, METER_TYPE_NO, METER_TYPE_NAME, 
-      METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-      ACTUAL_FIRST1_NO, GROSS_WEIGHT, GROSS_MAN_NO, 
-      GROSS_MAN_NAME, GROSS_TIME, BASE_SPOT1_NO, 
-      BASE_SPOT1_NAME, GROSS_CLASS, GROSS_GROUP, 
-      GROSS_MODE, ACTUAL_FIRST2_NO, TARE_WEIGHT, 
-      TARE_MAN_NO, TARE_MAN_NAME, TARE_TIME, 
-      BASE_SPOT2_NO, BASE_SPOT2_NAME, TARE_CLASS, 
-      TARE_GROUP, TARE_MODE, NET_WEIGHT, 
-      NET_MAN_NO, NET_MAN_NAME, NET_TIME, 
-      NET_SPOT3_NO, NET_SPOT3_NAME, NET_CLASS, 
-      NET_GROUP, NET_MODE, VALUE_FLAG, 
-      UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-      CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, 
-      UPLOAD_TIME, SAMPLE_NO, RAILWAY_TYPE_NO, 
-      RAILWAY_TYPE_NAME, MEMO, WATER_NUM, 
-      ARRIVAL, STATION, UPDATE_MAN_NO, 
-      UPDATE_MAN_NAME, UPDATE_TIME, SOURCE_AREA, 
-      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, AMOUNT_UNIT, 
-      MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, 
-      CREATE_MAN_NAME, CREATE_TIME, DATA_SOURCE, 
-      NOTE, IS_PRE_SACALE, LC_NO, 
-      PREDICTION_TYPE, PREDICTION_COMBINATION, 
-      BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
+      RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO,
+      MATTER_NAME, CONTRACT_NO, BATCH_NO,
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME,
+      SPEC_NO, SPEC_NAME, LOAD_POINT_NO,
+      LOAD_POINT_NAME, SAMPLE_VOUCHER, CARRIER_UNIT_NO,
+      CARRIER_UNIT_NAME, METER_TYPE_NO, METER_TYPE_NAME,
+      METER_PROCESS_NO, METER_PROCESS_EDITION_NO,
+      ACTUAL_FIRST1_NO, GROSS_WEIGHT, GROSS_MAN_NO,
+      GROSS_MAN_NAME, GROSS_TIME, BASE_SPOT1_NO,
+      BASE_SPOT1_NAME, GROSS_CLASS, GROSS_GROUP,
+      GROSS_MODE, ACTUAL_FIRST2_NO, TARE_WEIGHT,
+      TARE_MAN_NO, TARE_MAN_NAME, TARE_TIME,
+      BASE_SPOT2_NO, BASE_SPOT2_NAME, TARE_CLASS,
+      TARE_GROUP, TARE_MODE, NET_WEIGHT,
+      NET_MAN_NO, NET_MAN_NAME, NET_TIME,
+      NET_SPOT3_NO, NET_SPOT3_NAME, NET_CLASS,
+      NET_GROUP, NET_MODE, VALUE_FLAG,
+      UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+      CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME,
+      UPLOAD_TIME, SAMPLE_NO, RAILWAY_TYPE_NO,
+      RAILWAY_TYPE_NAME, MEMO, WATER_NUM,
+      ARRIVAL, STATION, UPDATE_MAN_NO,
+      UPDATE_MAN_NAME, UPDATE_TIME, SOURCE_AREA,
+      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, AMOUNT_UNIT,
+      MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE,
+      CREATE_MAN_NAME, CREATE_TIME, DATA_SOURCE,
+      NOTE, IS_PRE_SACALE, LC_NO,
+      PREDICTION_TYPE, PREDICTION_COMBINATION,
+      BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID,
       IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID)
-    values (#{actualNo,jdbcType=VARCHAR}, #{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}, #{customerSupplierName,jdbcType=VARCHAR}, 
-      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, 
-      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, 
-      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{loadPointNo,jdbcType=VARCHAR}, 
-      #{loadPointName,jdbcType=VARCHAR}, #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR}, 
-      #{carrierUnitName,jdbcType=VARCHAR}, #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, 
-      #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR}, 
-      #{actualFirst1No,jdbcType=VARCHAR}, #{grossWeight,jdbcType=DECIMAL}, #{grossManNo,jdbcType=VARCHAR}, 
-      #{grossManName,jdbcType=VARCHAR}, #{grossTime,jdbcType=TIMESTAMP}, #{baseSpot1No,jdbcType=VARCHAR}, 
-      #{baseSpot1Name,jdbcType=VARCHAR}, #{grossClass,jdbcType=VARCHAR}, #{grossGroup,jdbcType=VARCHAR}, 
-      #{grossMode,jdbcType=VARCHAR}, #{actualFirst2No,jdbcType=VARCHAR}, #{tareWeight,jdbcType=DECIMAL}, 
-      #{tareManNo,jdbcType=VARCHAR}, #{tareManName,jdbcType=VARCHAR}, #{tareTime,jdbcType=TIMESTAMP}, 
-      #{baseSpot2No,jdbcType=VARCHAR}, #{baseSpot2Name,jdbcType=VARCHAR}, #{tareClass,jdbcType=VARCHAR}, 
-      #{tareGroup,jdbcType=VARCHAR}, #{tareMode,jdbcType=VARCHAR}, #{netWeight,jdbcType=DECIMAL}, 
-      #{netManNo,jdbcType=VARCHAR}, #{netManName,jdbcType=VARCHAR}, #{netTime,jdbcType=TIMESTAMP}, 
-      #{netSpot3No,jdbcType=VARCHAR}, #{netSpot3Name,jdbcType=VARCHAR}, #{netClass,jdbcType=VARCHAR}, 
-      #{netGroup,jdbcType=VARCHAR}, #{netMode,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
-      #{uploadFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR}, #{checkManName,jdbcType=VARCHAR}, 
-      #{checkTime,jdbcType=TIMESTAMP}, #{uploadManNo,jdbcType=VARCHAR}, #{uploadManName,jdbcType=VARCHAR}, 
-      #{uploadTime,jdbcType=TIMESTAMP}, #{sampleNo,jdbcType=VARCHAR}, #{railwayTypeNo,jdbcType=VARCHAR}, 
-      #{railwayTypeName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{waterNum,jdbcType=DECIMAL}, 
-      #{arrival,jdbcType=VARCHAR}, #{station,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, 
-      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{sourceArea,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}, #{amountUnit,jdbcType=VARCHAR}, 
-      #{measureObjectType,jdbcType=VARCHAR}, #{measureTaskNum,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, 
-      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{dataSource,jdbcType=VARCHAR}, 
-      #{note,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{lcNo,jdbcType=VARCHAR}, 
-      #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR}, 
-      #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
+    values (#{actualNo,jdbcType=VARCHAR}, #{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}, #{customerSupplierName,jdbcType=VARCHAR},
+      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR},
+      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR},
+      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{loadPointNo,jdbcType=VARCHAR},
+      #{loadPointName,jdbcType=VARCHAR}, #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR},
+      #{carrierUnitName,jdbcType=VARCHAR}, #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR},
+      #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR},
+      #{actualFirst1No,jdbcType=VARCHAR}, #{grossWeight,jdbcType=DECIMAL}, #{grossManNo,jdbcType=VARCHAR},
+      #{grossManName,jdbcType=VARCHAR}, #{grossTime,jdbcType=TIMESTAMP}, #{baseSpot1No,jdbcType=VARCHAR},
+      #{baseSpot1Name,jdbcType=VARCHAR}, #{grossClass,jdbcType=VARCHAR}, #{grossGroup,jdbcType=VARCHAR},
+      #{grossMode,jdbcType=VARCHAR}, #{actualFirst2No,jdbcType=VARCHAR}, #{tareWeight,jdbcType=DECIMAL},
+      #{tareManNo,jdbcType=VARCHAR}, #{tareManName,jdbcType=VARCHAR}, #{tareTime,jdbcType=TIMESTAMP},
+      #{baseSpot2No,jdbcType=VARCHAR}, #{baseSpot2Name,jdbcType=VARCHAR}, #{tareClass,jdbcType=VARCHAR},
+      #{tareGroup,jdbcType=VARCHAR}, #{tareMode,jdbcType=VARCHAR}, #{netWeight,jdbcType=DECIMAL},
+      #{netManNo,jdbcType=VARCHAR}, #{netManName,jdbcType=VARCHAR}, #{netTime,jdbcType=TIMESTAMP},
+      #{netSpot3No,jdbcType=VARCHAR}, #{netSpot3Name,jdbcType=VARCHAR}, #{netClass,jdbcType=VARCHAR},
+      #{netGroup,jdbcType=VARCHAR}, #{netMode,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR},
+      #{uploadFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR}, #{checkManName,jdbcType=VARCHAR},
+      #{checkTime,jdbcType=TIMESTAMP}, #{uploadManNo,jdbcType=VARCHAR}, #{uploadManName,jdbcType=VARCHAR},
+      #{uploadTime,jdbcType=TIMESTAMP}, #{sampleNo,jdbcType=VARCHAR}, #{railwayTypeNo,jdbcType=VARCHAR},
+      #{railwayTypeName,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{waterNum,jdbcType=DECIMAL},
+      #{arrival,jdbcType=VARCHAR}, #{station,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR},
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{sourceArea,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}, #{amountUnit,jdbcType=VARCHAR},
+      #{measureObjectType,jdbcType=VARCHAR}, #{measureTaskNum,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR},
+      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{dataSource,jdbcType=VARCHAR},
+      #{note,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{lcNo,jdbcType=VARCHAR},
+      #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR},
+      #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR},
       #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactualbak.model.MeterWorkRailwayActualBak">
@@ -2371,92 +2371,92 @@
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_WORK_RAILWAY_ACTUAL_BAK
-      (ACTUAL_NO, 
-      PREDICTION_NO, NOTICE_NO, RAILWAY_NO, 
-      RAILWAY_CARRIAGE_NO, MATTER_NO, 
-      MATTER_NAME, CONTRACT_NO, BATCH_NO, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
-      RECEIVING_UINT_NO, RECEIVING_UINT_NAME, 
-      MATERIAL_NO, MATERIAL_NAME, SPEC_NO, 
-      SPEC_NAME, LOAD_POINT_NO, LOAD_POINT_NAME, 
-      SAMPLE_VOUCHER, CARRIER_UNIT_NO, 
-      CARRIER_UNIT_NAME, METER_TYPE_NO, 
-      METER_TYPE_NAME, METER_PROCESS_NO, 
-      METER_PROCESS_EDITION_NO, ACTUAL_FIRST1_NO, 
-      GROSS_WEIGHT, GROSS_MAN_NO, GROSS_MAN_NAME, 
-      GROSS_TIME, BASE_SPOT1_NO, BASE_SPOT1_NAME, 
-      GROSS_CLASS, GROSS_GROUP, GROSS_MODE, 
-      ACTUAL_FIRST2_NO, TARE_WEIGHT, TARE_MAN_NO, 
-      TARE_MAN_NAME, TARE_TIME, BASE_SPOT2_NO, 
-      BASE_SPOT2_NAME, TARE_CLASS, TARE_GROUP, 
-      TARE_MODE, NET_WEIGHT, NET_MAN_NO, 
-      NET_MAN_NAME, NET_TIME, NET_SPOT3_NO, 
-      NET_SPOT3_NAME, NET_CLASS, NET_GROUP, 
-      NET_MODE, VALUE_FLAG, UPLOAD_FLAG, 
-      CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, 
-      UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, 
-      SAMPLE_NO, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, 
-      MEMO, WATER_NUM, ARRIVAL, 
-      STATION, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
-      MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
-      CREATE_TIME, DATA_SOURCE, NOTE, 
-      IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, 
-      PREDICTION_COMBINATION, BOUND_LIST_URL, 
-      IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, 
+      (ACTUAL_NO,
+      PREDICTION_NO, NOTICE_NO, RAILWAY_NO,
+      RAILWAY_CARRIAGE_NO, MATTER_NO,
+      MATTER_NAME, CONTRACT_NO, BATCH_NO,
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME,
+      RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
+      MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
+      SPEC_NAME, LOAD_POINT_NO, LOAD_POINT_NAME,
+      SAMPLE_VOUCHER, CARRIER_UNIT_NO,
+      CARRIER_UNIT_NAME, METER_TYPE_NO,
+      METER_TYPE_NAME, METER_PROCESS_NO,
+      METER_PROCESS_EDITION_NO, ACTUAL_FIRST1_NO,
+      GROSS_WEIGHT, GROSS_MAN_NO, GROSS_MAN_NAME,
+      GROSS_TIME, BASE_SPOT1_NO, BASE_SPOT1_NAME,
+      GROSS_CLASS, GROSS_GROUP, GROSS_MODE,
+      ACTUAL_FIRST2_NO, TARE_WEIGHT, TARE_MAN_NO,
+      TARE_MAN_NAME, TARE_TIME, BASE_SPOT2_NO,
+      BASE_SPOT2_NAME, TARE_CLASS, TARE_GROUP,
+      TARE_MODE, NET_WEIGHT, NET_MAN_NO,
+      NET_MAN_NAME, NET_TIME, NET_SPOT3_NO,
+      NET_SPOT3_NAME, NET_CLASS, NET_GROUP,
+      NET_MODE, VALUE_FLAG, UPLOAD_FLAG,
+      CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME,
+      UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME,
+      SAMPLE_NO, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,
+      MEMO, WATER_NUM, ARRIVAL,
+      STATION, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+      UPDATE_TIME, SOURCE_AREA, 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, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
+      MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME,
+      CREATE_TIME, DATA_SOURCE, NOTE,
+      IS_PRE_SACALE, LC_NO, PREDICTION_TYPE,
+      PREDICTION_COMBINATION, BOUND_LIST_URL,
+      IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED,
       DOCUMENT_ID)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualNo,jdbcType=VARCHAR}, 
-      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR}, 
-      #{item.railwayCarriageNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, 
-      #{item.matterName,jdbcType=VARCHAR}, #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR}, 
-      #{item.customerSupplierNo,jdbcType=VARCHAR}, #{item.customerSupplierName,jdbcType=VARCHAR}, 
-      #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR}, 
-      #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR}, 
-      #{item.materialNo,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, 
-      #{item.specName,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR}, #{item.loadPointName,jdbcType=VARCHAR}, 
-      #{item.sampleVoucher,jdbcType=VARCHAR}, #{item.carrierUnitNo,jdbcType=VARCHAR}, 
-      #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR}, 
-      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR}, 
-      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.actualFirst1No,jdbcType=VARCHAR}, 
-      #{item.grossWeight,jdbcType=DECIMAL}, #{item.grossManNo,jdbcType=VARCHAR}, #{item.grossManName,jdbcType=VARCHAR}, 
-      #{item.grossTime,jdbcType=TIMESTAMP}, #{item.baseSpot1No,jdbcType=VARCHAR}, #{item.baseSpot1Name,jdbcType=VARCHAR}, 
-      #{item.grossClass,jdbcType=VARCHAR}, #{item.grossGroup,jdbcType=VARCHAR}, #{item.grossMode,jdbcType=VARCHAR}, 
-      #{item.actualFirst2No,jdbcType=VARCHAR}, #{item.tareWeight,jdbcType=DECIMAL}, #{item.tareManNo,jdbcType=VARCHAR}, 
-      #{item.tareManName,jdbcType=VARCHAR}, #{item.tareTime,jdbcType=TIMESTAMP}, #{item.baseSpot2No,jdbcType=VARCHAR}, 
-      #{item.baseSpot2Name,jdbcType=VARCHAR}, #{item.tareClass,jdbcType=VARCHAR}, #{item.tareGroup,jdbcType=VARCHAR}, 
-      #{item.tareMode,jdbcType=VARCHAR}, #{item.netWeight,jdbcType=DECIMAL}, #{item.netManNo,jdbcType=VARCHAR}, 
-      #{item.netManName,jdbcType=VARCHAR}, #{item.netTime,jdbcType=TIMESTAMP}, #{item.netSpot3No,jdbcType=VARCHAR}, 
-      #{item.netSpot3Name,jdbcType=VARCHAR}, #{item.netClass,jdbcType=VARCHAR}, #{item.netGroup,jdbcType=VARCHAR}, 
-      #{item.netMode,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.uploadFlag,jdbcType=VARCHAR}, 
-      #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR}, #{item.checkTime,jdbcType=TIMESTAMP}, 
-      #{item.uploadManNo,jdbcType=VARCHAR}, #{item.uploadManName,jdbcType=VARCHAR}, #{item.uploadTime,jdbcType=TIMESTAMP}, 
-      #{item.sampleNo,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR}, #{item.railwayTypeName,jdbcType=VARCHAR}, 
-      #{item.memo,jdbcType=VARCHAR}, #{item.waterNum,jdbcType=DECIMAL}, #{item.arrival,jdbcType=VARCHAR}, 
-      #{item.station,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.sourceArea,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.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR}, 
-      #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.billType,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
-      #{item.createTime,jdbcType=TIMESTAMP}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, 
-      #{item.isPreSacale,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, 
-      #{item.predictionCombination,jdbcType=VARCHAR}, #{item.boundListUrl,jdbcType=VARCHAR}, 
-      #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, #{item.isBoundListDownloaded,jdbcType=VARCHAR}, 
-      #{item.documentId,jdbcType=VARCHAR} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.actualNo,jdbcType=VARCHAR},
+      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR},
+      #{item.railwayCarriageNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR},
+      #{item.matterName,jdbcType=VARCHAR}, #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR},
+      #{item.customerSupplierNo,jdbcType=VARCHAR}, #{item.customerSupplierName,jdbcType=VARCHAR},
+      #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR},
+      #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR},
+      #{item.materialNo,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR},
+      #{item.specName,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR}, #{item.loadPointName,jdbcType=VARCHAR},
+      #{item.sampleVoucher,jdbcType=VARCHAR}, #{item.carrierUnitNo,jdbcType=VARCHAR},
+      #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR},
+      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR},
+      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.actualFirst1No,jdbcType=VARCHAR},
+      #{item.grossWeight,jdbcType=DECIMAL}, #{item.grossManNo,jdbcType=VARCHAR}, #{item.grossManName,jdbcType=VARCHAR},
+      #{item.grossTime,jdbcType=TIMESTAMP}, #{item.baseSpot1No,jdbcType=VARCHAR}, #{item.baseSpot1Name,jdbcType=VARCHAR},
+      #{item.grossClass,jdbcType=VARCHAR}, #{item.grossGroup,jdbcType=VARCHAR}, #{item.grossMode,jdbcType=VARCHAR},
+      #{item.actualFirst2No,jdbcType=VARCHAR}, #{item.tareWeight,jdbcType=DECIMAL}, #{item.tareManNo,jdbcType=VARCHAR},
+      #{item.tareManName,jdbcType=VARCHAR}, #{item.tareTime,jdbcType=TIMESTAMP}, #{item.baseSpot2No,jdbcType=VARCHAR},
+      #{item.baseSpot2Name,jdbcType=VARCHAR}, #{item.tareClass,jdbcType=VARCHAR}, #{item.tareGroup,jdbcType=VARCHAR},
+      #{item.tareMode,jdbcType=VARCHAR}, #{item.netWeight,jdbcType=DECIMAL}, #{item.netManNo,jdbcType=VARCHAR},
+      #{item.netManName,jdbcType=VARCHAR}, #{item.netTime,jdbcType=TIMESTAMP}, #{item.netSpot3No,jdbcType=VARCHAR},
+      #{item.netSpot3Name,jdbcType=VARCHAR}, #{item.netClass,jdbcType=VARCHAR}, #{item.netGroup,jdbcType=VARCHAR},
+      #{item.netMode,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.uploadFlag,jdbcType=VARCHAR},
+      #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR}, #{item.checkTime,jdbcType=TIMESTAMP},
+      #{item.uploadManNo,jdbcType=VARCHAR}, #{item.uploadManName,jdbcType=VARCHAR}, #{item.uploadTime,jdbcType=TIMESTAMP},
+      #{item.sampleNo,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR}, #{item.railwayTypeName,jdbcType=VARCHAR},
+      #{item.memo,jdbcType=VARCHAR}, #{item.waterNum,jdbcType=DECIMAL}, #{item.arrival,jdbcType=VARCHAR},
+      #{item.station,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR},
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.sourceArea,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.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR},
+      #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.billType,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR},
+      #{item.isPreSacale,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR},
+      #{item.predictionCombination,jdbcType=VARCHAR}, #{item.boundListUrl,jdbcType=VARCHAR},
+      #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, #{item.isBoundListDownloaded,jdbcType=VARCHAR},
+      #{item.documentId,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2902,14 +2902,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.documentId,jdbcType=VARCHAR}
        </foreach>
-     where ACTUAL_NO in 
+     where ACTUAL_NO in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_RAILWAY_ACTUAL
-    where ACTUAL_NO in 
+    where ACTUAL_NO in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -3759,6 +3759,12 @@
     SELECT distinct RAILWAY_NO, net_time
     from METER_WORK_RAILWAY_ACTUAL_BAK
     where 1=1
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and NET_SPOT3_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <if test="valueFlag != null and valueFlag != ''">
       and  VALUE_FLAG = #{valueFlag}
     </if>
@@ -3888,6 +3894,12 @@
     SELECT distinct LC_NO, railway_no, net_time
     from METER_WORK_RAILWAY_ACTUAL_BAK
     where 1=1
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and NET_SPOT3_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
@@ -3946,6 +3958,12 @@
     <include refid="select" />
     <where>
       1 = 1
+      <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+        and NET_SPOT3_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
       <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>
@@ -4345,4 +4363,4 @@
         and value_flag != '0'
     order by net_time desc
   </select>
-</mapper>
+</mapper>