'提交'

src/main/java/com/steerinfo/baseinfo/combaseinfo/controller/ComBaseInfoController.java

@@ -243,6 +243,23 @@ public class ComBaseInfoController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "查询所有不分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/noPageNoLike")
+    public RESTfulResult listNoLike(@RequestParam HashMap parmas) {
+        try {
+            List<ComBaseInfo> list = comBaseInfoService.query(parmas);
+            Collections.reverse(list);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "执行Sql获取列表")
     @PostMapping(value = "/executeSqlDataWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult executeSqlDataWf(@RequestBody String sql) {

src/main/java/com/steerinfo/baseinfo/meterbasehistaredata/mapper/MeterBaseHisTareDataMapper.xml

@@ -593,7 +593,7 @@
           </foreach>
         </if>
         <if test="carNo != null and carNo != ''">
-          and CAR_NO = #{carNo}
+          and CAR_NO like '%${carNo}$'
         </if>
         <if test="meterWeight != null">
           and METER_WEIGHT = #{meterWeight}

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

@@ -820,6 +820,25 @@ throw new MarkerMetException(500, "操作异常！！");
         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 = meterWorkCarActualService.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")
     //@RequiresPermissions("meterworkcaractualfirst:create")
@@ -1090,4 +1109,38 @@ throw new MarkerMetException(500, "操作异常！！");
         return meterWorkCarActualService.updateNote(models);
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/getNetFilterCheck")
+    public RESTfulResult getNetFilterCheck(@RequestBody(required = false) HashMap params) {
+        try {
+            PageList<HashMap> list = meterWorkCarActualService.getNetFilterCheck(params);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/getNetFilterCheckWeightReversal")
+    public RESTfulResult getNetFilterCheckWeightReversal(@RequestBody(required = false) HashMap params) {
+        try {
+            PageList<HashMap> list = meterWorkCarActualService.getNetFilterCheckWeightReversal(params);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.meterwork.meterworkcaractual.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -61,7 +62,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     List<HashMap> selectOldAndNew(Map<String, Object> params);
     List<HashMap> doQueryFirstOldAndNew(Map<String, Object> params);
     List<HashMap> countOldAndNew(Map<String, Object> params);
-    
+
     //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传
     List<MeterWorkCarActual> countAllState(Map<String, Object> params);
     List<HashMap> countDayAllState(Map<String, Object> params);
@@ -73,4 +74,8 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
 
     //小洁净和负洁净重量比对核查
     List<MeterWorkCarActual> smallAndNegativeNetWeightRatio(Map<String, Object> params);
-}
+
+    List<HashMap> getNetFilterCheck(HashMap<String, Object> params);
+
+    List<HashMap> getNetFilterCheckWeightReversal(HashMap<String, Object> params);
+}

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

@@ -131,53 +131,53 @@
     <result column="CHECK_FLAG2" jdbcType="VARCHAR" property="checkFlag2" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_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_NO, 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, METER_NUM, NET_MAN_NO, NET_MAN_NAME, NET_TIME, 
-    NET_SPOT3_NO, NET_SPOT3_NAME, NET_GROUP, NET_MODE, VALUE_FLAG, UPLOAD_FLAG, CHECK_MAN_NO, 
-    CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, ADD_WEIGHT, 
-    NET_CLASS, TB_FLAGE, RAILWAY_NO, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, MEMO, 
-    HEAT_NO, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, 
-    PREDICTION_TYPE, PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO, SHIP_NO, 
-    NOTE, 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, IS_PRE_SCALE, BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-    IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, 
-    CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, 
+    ACTUAL_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_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_NO, 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, METER_NUM, NET_MAN_NO, NET_MAN_NAME, NET_TIME,
+    NET_SPOT3_NO, NET_SPOT3_NAME, NET_GROUP, NET_MODE, VALUE_FLAG, UPLOAD_FLAG, CHECK_MAN_NO,
+    CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, ADD_WEIGHT,
+    NET_CLASS, TB_FLAGE, RAILWAY_NO, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, MEMO,
+    HEAT_NO, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO,
+    PREDICTION_TYPE, PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO, SHIP_NO,
+    NOTE, 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, IS_PRE_SCALE, BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID,
+    IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME,
+    CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2,
     CHECK_FLAG1, CHECK_FLAG2
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_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_NO, 
-    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.METER_NUM, t.NET_MAN_NO, t.NET_MAN_NAME, t.NET_TIME, 
-    t.NET_SPOT3_NO, t.NET_SPOT3_NAME, 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.ADD_WEIGHT, t.NET_CLASS, t.TB_FLAGE, t.RAILWAY_NO, t.UPDATE_MAN_NO, 
-    t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MEMO, t.HEAT_NO, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT, 
-    t.SHIPMENT_NUM, t.BIND_CARD_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_PIER_NAME, 
-    t.METER_PIER_NO, t.SHIP_NO, t.NOTE, 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.IS_PRE_SCALE, t.BOUND_LIST_URL, t.IS_BOUND_LIST, 
-    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.CHECK_FLAG, t.CHECK_MEMO, 
-    t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, t.CHECK_MEMO1, t.CHECK_MAN2_NO, 
+    t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_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_NO,
+    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.METER_NUM, t.NET_MAN_NO, t.NET_MAN_NAME, t.NET_TIME,
+    t.NET_SPOT3_NO, t.NET_SPOT3_NAME, 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.ADD_WEIGHT, t.NET_CLASS, t.TB_FLAGE, t.RAILWAY_NO, t.UPDATE_MAN_NO,
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MEMO, t.HEAT_NO, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT,
+    t.SHIPMENT_NUM, t.BIND_CARD_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_PIER_NAME,
+    t.METER_PIER_NO, t.SHIP_NO, t.NOTE, 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.IS_PRE_SCALE, t.BOUND_LIST_URL, t.IS_BOUND_LIST,
+    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.CHECK_FLAG, t.CHECK_MEMO,
+    t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, t.CHECK_MEMO1, t.CHECK_MAN2_NO,
     t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2, t.CHECK_FLAG1, t.CHECK_FLAG2
   </sql>
   <sql id="select">
@@ -187,7 +187,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_CAR_ACTUAL t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO = #{actualNo}
       </if>
@@ -572,7 +572,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO LIKE '%${actualNo}%'
       </if>
@@ -962,7 +962,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_CAR_ACTUAL
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -1343,91 +1343,91 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
-    insert into METER_WORK_CAR_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
-      CAR_NO, TRAILER_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_NO, 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, 
-      METER_NUM, NET_MAN_NO, NET_MAN_NAME, 
-      NET_TIME, NET_SPOT3_NO, NET_SPOT3_NAME, 
-      NET_GROUP, NET_MODE, VALUE_FLAG, 
-      UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-      CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, 
-      UPLOAD_TIME, ADD_WEIGHT, NET_CLASS, 
-      TB_FLAGE, RAILWAY_NO, UPDATE_MAN_NO, 
-      UPDATE_MAN_NAME, UPDATE_TIME, MEMO, 
-      HEAT_NO, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, 
-      SHIPMENT_NUM, BIND_CARD_NO, PREDICTION_TYPE, 
-      PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO, 
-      SHIP_NO, NOTE, 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, IS_PRE_SCALE, 
-      BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG, 
-      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, 
-      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, 
-      CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, 
+    insert into METER_WORK_CAR_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO,
+      CAR_NO, TRAILER_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_NO, 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,
+      METER_NUM, NET_MAN_NO, NET_MAN_NAME,
+      NET_TIME, NET_SPOT3_NO, NET_SPOT3_NAME,
+      NET_GROUP, NET_MODE, VALUE_FLAG,
+      UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+      CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME,
+      UPLOAD_TIME, ADD_WEIGHT, NET_CLASS,
+      TB_FLAGE, RAILWAY_NO, UPDATE_MAN_NO,
+      UPDATE_MAN_NAME, UPDATE_TIME, MEMO,
+      HEAT_NO, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
+      SHIPMENT_NUM, BIND_CARD_NO, PREDICTION_TYPE,
+      PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO,
+      SHIP_NO, NOTE, 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, IS_PRE_SCALE,
+      BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID,
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG,
+      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME,
+      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO,
+      CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2,
       CHECK_FLAG1, CHECK_FLAG2)
-    values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
-      #{carNo,jdbcType=VARCHAR}, #{trailerNo,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}, #{sampleNo,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}, 
-      #{meterNum,jdbcType=DECIMAL}, #{netManNo,jdbcType=VARCHAR}, #{netManName,jdbcType=VARCHAR}, 
-      #{netTime,jdbcType=TIMESTAMP}, #{netSpot3No,jdbcType=VARCHAR}, #{netSpot3Name,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}, #{addWeight,jdbcType=DECIMAL}, #{netClass,jdbcType=VARCHAR}, 
-      #{tbFlage,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, 
-      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR}, 
-      #{heatNo,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL}, 
-      #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR}, 
-      #{predictionCombination,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR}, #{meterPierNo,jdbcType=VARCHAR}, 
-      #{shipNo,jdbcType=VARCHAR}, #{note,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}, #{isPreScale,jdbcType=VARCHAR}, 
-      #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
-      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{checkFlag,jdbcType=VARCHAR}, 
-      #{checkMemo,jdbcType=VARCHAR}, #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR}, 
-      #{checkTime1,jdbcType=TIMESTAMP}, #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR}, 
-      #{checkMan2Name,jdbcType=VARCHAR}, #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR}, 
+    values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR},
+      #{carNo,jdbcType=VARCHAR}, #{trailerNo,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}, #{sampleNo,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},
+      #{meterNum,jdbcType=DECIMAL}, #{netManNo,jdbcType=VARCHAR}, #{netManName,jdbcType=VARCHAR},
+      #{netTime,jdbcType=TIMESTAMP}, #{netSpot3No,jdbcType=VARCHAR}, #{netSpot3Name,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}, #{addWeight,jdbcType=DECIMAL}, #{netClass,jdbcType=VARCHAR},
+      #{tbFlage,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR},
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{memo,jdbcType=VARCHAR},
+      #{heatNo,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL},
+      #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR},
+      #{predictionCombination,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR}, #{meterPierNo,jdbcType=VARCHAR},
+      #{shipNo,jdbcType=VARCHAR}, #{note,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}, #{isPreScale,jdbcType=VARCHAR},
+      #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR},
+      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{checkFlag,jdbcType=VARCHAR},
+      #{checkMemo,jdbcType=VARCHAR}, #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR},
+      #{checkTime1,jdbcType=TIMESTAMP}, #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR},
+      #{checkMan2Name,jdbcType=VARCHAR}, #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR},
       #{checkFlag1,jdbcType=VARCHAR}, #{checkFlag2,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -2726,107 +2726,107 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_CAR_ACTUAL 
-      (ACTUAL_NO, 
-      PREDICTION_NO, NOTICE_NO, CAR_NO, 
-      TRAILER_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_NO, 
-      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, METER_NUM, 
-      NET_MAN_NO, NET_MAN_NAME, NET_TIME, 
-      NET_SPOT3_NO, NET_SPOT3_NAME, NET_GROUP, 
-      NET_MODE, VALUE_FLAG, UPLOAD_FLAG, 
-      CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, 
-      UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, 
-      ADD_WEIGHT, NET_CLASS, TB_FLAGE, 
-      RAILWAY_NO, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, MEMO, HEAT_NO, 
-      SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, 
-      SHIPMENT_NUM, BIND_CARD_NO, PREDICTION_TYPE, 
-      PREDICTION_COMBINATION, METER_PIER_NAME, 
-      METER_PIER_NO, SHIP_NO, NOTE, 
-      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, IS_PRE_SCALE, 
-      BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
-      CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, 
-      CHECK_MAN1_NAME, CHECK_TIME1, 
-      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, 
-      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+    insert into METER_WORK_CAR_ACTUAL
+      (ACTUAL_NO,
+      PREDICTION_NO, NOTICE_NO, CAR_NO,
+      TRAILER_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_NO,
+      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, METER_NUM,
+      NET_MAN_NO, NET_MAN_NAME, NET_TIME,
+      NET_SPOT3_NO, NET_SPOT3_NAME, NET_GROUP,
+      NET_MODE, VALUE_FLAG, UPLOAD_FLAG,
+      CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME,
+      UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME,
+      ADD_WEIGHT, NET_CLASS, TB_FLAGE,
+      RAILWAY_NO, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+      UPDATE_TIME, MEMO, HEAT_NO,
+      SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
+      SHIPMENT_NUM, BIND_CARD_NO, PREDICTION_TYPE,
+      PREDICTION_COMBINATION, METER_PIER_NAME,
+      METER_PIER_NO, SHIP_NO, NOTE,
+      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, IS_PRE_SCALE,
+      BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID,
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID,
+      CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO,
+      CHECK_MAN1_NAME, CHECK_TIME1,
+      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME,
+      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1,
       CHECK_FLAG2)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualNo,jdbcType=VARCHAR}, 
-      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, 
-      #{item.trailerNo,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.sampleNo,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.meterNum,jdbcType=DECIMAL}, 
-      #{item.netManNo,jdbcType=VARCHAR}, #{item.netManName,jdbcType=VARCHAR}, #{item.netTime,jdbcType=TIMESTAMP}, 
-      #{item.netSpot3No,jdbcType=VARCHAR}, #{item.netSpot3Name,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.addWeight,jdbcType=DECIMAL}, #{item.netClass,jdbcType=VARCHAR}, #{item.tbFlage,jdbcType=VARCHAR}, 
-      #{item.railwayNo,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.memo,jdbcType=VARCHAR}, #{item.heatNo,jdbcType=VARCHAR}, 
-      #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL}, 
-      #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, 
-      #{item.predictionCombination,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR}, 
-      #{item.meterPierNo,jdbcType=VARCHAR}, #{item.shipNo,jdbcType=VARCHAR}, #{item.note,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.isPreScale,jdbcType=VARCHAR}, 
-      #{item.boundListUrl,jdbcType=VARCHAR}, #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, 
-      #{item.isBoundListDownloaded,jdbcType=VARCHAR}, #{item.documentId,jdbcType=VARCHAR}, 
-      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, 
-      #{item.checkMan1Name,jdbcType=VARCHAR}, #{item.checkTime1,jdbcType=TIMESTAMP}, 
-      #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, #{item.checkMan2Name,jdbcType=VARCHAR}, 
-      #{item.checkTime2,jdbcType=TIMESTAMP}, #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR}, 
-      #{item.checkFlag2,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.carNo,jdbcType=VARCHAR},
+      #{item.trailerNo,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.sampleNo,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.meterNum,jdbcType=DECIMAL},
+      #{item.netManNo,jdbcType=VARCHAR}, #{item.netManName,jdbcType=VARCHAR}, #{item.netTime,jdbcType=TIMESTAMP},
+      #{item.netSpot3No,jdbcType=VARCHAR}, #{item.netSpot3Name,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.addWeight,jdbcType=DECIMAL}, #{item.netClass,jdbcType=VARCHAR}, #{item.tbFlage,jdbcType=VARCHAR},
+      #{item.railwayNo,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR},
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.memo,jdbcType=VARCHAR}, #{item.heatNo,jdbcType=VARCHAR},
+      #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL},
+      #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR},
+      #{item.predictionCombination,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR},
+      #{item.meterPierNo,jdbcType=VARCHAR}, #{item.shipNo,jdbcType=VARCHAR}, #{item.note,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.isPreScale,jdbcType=VARCHAR},
+      #{item.boundListUrl,jdbcType=VARCHAR}, #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR},
+      #{item.isBoundListDownloaded,jdbcType=VARCHAR}, #{item.documentId,jdbcType=VARCHAR},
+      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR},
+      #{item.checkMan1Name,jdbcType=VARCHAR}, #{item.checkTime1,jdbcType=TIMESTAMP},
+      #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, #{item.checkMan2Name,jdbcType=VARCHAR},
+      #{item.checkTime2,jdbcType=TIMESTAMP}, #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR},
+      #{item.checkFlag2,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -3340,14 +3340,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag2,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_CAR_ACTUAL
-    where ACTUAL_NO in 
+    where ACTUAL_NO in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -3883,6 +3883,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>
@@ -4730,5 +4736,99 @@
       and A.car_no like '%${carNo}%'
     </if>
   </select>
-  
-</mapper>
+    <select id="getNetFilterCheck"
+            resultType="java.util.LinkedHashMap">
+      <include refid="select"></include>
+      <where>
+        <if test="predictionNo != null and predictionNo != ''">
+          and prediction_no LIKE '%${predictionNo}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+          and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' 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="carNo != null and carNo != ''">
+          and car_no like '%${carNo}%'
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+          and net_spot3_no like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+          and net_spot3_name like '%${netSpot3Name}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+          and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+          and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+          and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+          and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+          and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+          and matter_name LIKE '%${matterName}%'
+        </if>
+        <if test="minWgt != null and minWgt != ''">
+          and NET_WEIGHT/1000 >= '${minWgt}'
+        </if>
+        <if test="maxWgt != null and maxWgt != ''">
+          and NET_WEIGHT/1000 &lt;= '${maxWgt}'
+        </if>
+      </where>
+      order by net_time desc
+    </select>
+  <select id="getNetFilterCheckWeightReversal" resultType="java.util.LinkedHashMap">
+    <include refid="select"></include>
+    <where>
+      <if test="predictionNo != null and predictionNo != ''">
+        and prediction_no LIKE '%${predictionNo}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and sender_remark LIKE '%${senderRemark}%'
+      </if>
+      <if test="startTime != null and endTime != null and startTime != '' 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="carNo != null and carNo != ''">
+        and car_no like '%${carNo}%'
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and net_spot3_no like '%${netSpot3No}%'
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and net_spot3_name like '%${netSpot3Name}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and matter_no LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and matter_name LIKE '%${matterName}%'
+      </if>
+      <if test="minWgt != null and minWgt != '' and maxWgt != null and maxWgt != ''">
+        and (NET_WEIGHT/1000 &lt; '${minWgt}' or NET_WEIGHT/1000 > '${maxWgt}')
+      </if>
+    </where>
+    order by net_time desc
+  </select>
+
+</mapper>

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

@@ -115,4 +115,8 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     PageList<MeterWorkCarActual> smallAndNegativeNetWeightRatio(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 
     RESTfulResult updateNote(List<MeterWorkCarActual> models);
+
+    PageList<HashMap> getNetFilterCheck(HashMap params);
+
+    PageList<HashMap> getNetFilterCheckWeightReversal(HashMap params);
 }

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

@@ -2682,6 +2682,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctCarNo(HashMap<String, Object> params) {
+        if(params==null){
+            params = new HashMap<>();
+        }
 //        HashMap<String, Object> obj = new HashMap<>();
 //        obj.put("carNo", carNo);
 //        obj.put("startTime", startTime);
@@ -3569,4 +3572,21 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return rm;
     }
 
+    @Override
+    public PageList<HashMap> getNetFilterCheck(HashMap params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<HashMap> meterWorkCarActualFirsts = meterWorkCarActualMapper.getNetFilterCheck(params);
+        PageList pageInfo = new PageList(meterWorkCarActualFirsts);
+        return pageInfo;
+
+    }
+
+    @Override
+    public PageList<HashMap> getNetFilterCheckWeightReversal(HashMap params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<HashMap> meterWorkCarActualFirsts = meterWorkCarActualMapper.getNetFilterCheckWeightReversal(params);
+        PageList pageInfo = new PageList(meterWorkCarActualFirsts);
+        return pageInfo;
+    }
+
 }

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

@@ -1052,6 +1052,35 @@ public class MeterWorkCarActualFirstController 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 = meterWorkCarActualFirstService.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 = meterWorkCarActualFirstService.distinctCarNo(param);
             return success(rows);

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

@@ -105,45 +105,45 @@
     <result column="CHECK_FLAG2" jdbcType="VARCHAR" property="checkFlag2" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_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, 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, RAILWAY_NO, METER_PROCESS_NO, 
-    METER_PROCESS_EDITION_NO, METER_WEIGHT, ADD_WEIGHT, METER_NUM, WEIGHT_TYPE, 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, METER_REASON_NO, METER_REASON_NAME, LOAD_END_TIME, 
-    ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG, HEAT_NO, METER_PIER_NAME, METER_PIER_NO, 
-    SHIP_NO, NOTE, 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, 
-    IS_PRE_SCALE, METER_TYPE_NAME, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1, 
-    CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_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, 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, RAILWAY_NO, METER_PROCESS_NO,
+    METER_PROCESS_EDITION_NO, METER_WEIGHT, ADD_WEIGHT, METER_NUM, WEIGHT_TYPE, 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, METER_REASON_NO, METER_REASON_NAME, LOAD_END_TIME,
+    ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG, HEAT_NO, METER_PIER_NAME, METER_PIER_NO,
+    SHIP_NO, NOTE, 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,
+    IS_PRE_SCALE, METER_TYPE_NAME, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1,
+    CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1,
     CHECK_FLAG2
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_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.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.RAILWAY_NO, t.METER_PROCESS_NO, t.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, t.METER_REASON_NO, t.METER_REASON_NAME, 
-    t.LOAD_END_TIME, t.ADD_WGT_NO, t.ADD_WGT_PK, t.LIMS_SAMPLING_FLAG, t.HEAT_NO, t.METER_PIER_NAME, 
-    t.METER_PIER_NO, t.SHIP_NO, t.NOTE, 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.IS_PRE_SCALE, 
-    t.METER_TYPE_NAME, t.CHECK_MEMO, t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, 
-    t.CHECK_MEMO1, t.CHECK_MAN2_NO, t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2, 
+    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_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.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.RAILWAY_NO, t.METER_PROCESS_NO, t.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, t.METER_REASON_NO, t.METER_REASON_NAME,
+    t.LOAD_END_TIME, t.ADD_WGT_NO, t.ADD_WGT_PK, t.LIMS_SAMPLING_FLAG, t.HEAT_NO, t.METER_PIER_NAME,
+    t.METER_PIER_NO, t.SHIP_NO, t.NOTE, 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.IS_PRE_SCALE,
+    t.METER_TYPE_NAME, t.CHECK_MEMO, t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1,
+    t.CHECK_MEMO1, t.CHECK_MAN2_NO, t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2,
     t.CHECK_FLAG1, t.CHECK_FLAG2
   </sql>
   <sql id="select">
@@ -153,7 +153,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_CAR_ACTUAL_FIRST t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO = #{actualFirstNo}
       </if>
@@ -463,7 +463,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
       </if>
@@ -778,7 +778,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_CAR_ACTUAL_FIRST
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -1081,75 +1081,75 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst">
-    insert into METER_WORK_CAR_ACTUAL_FIRST (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, 
-      CAR_NO, TRAILER_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, 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, RAILWAY_NO, METER_PROCESS_NO, 
-      METER_PROCESS_EDITION_NO, METER_WEIGHT, ADD_WEIGHT, 
-      METER_NUM, WEIGHT_TYPE, 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, METER_REASON_NO, METER_REASON_NAME, 
-      LOAD_END_TIME, ADD_WGT_NO, ADD_WGT_PK, 
-      LIMS_SAMPLING_FLAG, HEAT_NO, METER_PIER_NAME, 
-      METER_PIER_NO, SHIP_NO, NOTE, 
-      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, 
-      IS_PRE_SCALE, METER_TYPE_NAME, CHECK_MEMO, 
-      CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1, 
-      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, 
-      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+    insert into METER_WORK_CAR_ACTUAL_FIRST (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO,
+      CAR_NO, TRAILER_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, 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, RAILWAY_NO, METER_PROCESS_NO,
+      METER_PROCESS_EDITION_NO, METER_WEIGHT, ADD_WEIGHT,
+      METER_NUM, WEIGHT_TYPE, 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, METER_REASON_NO, METER_REASON_NAME,
+      LOAD_END_TIME, ADD_WGT_NO, ADD_WGT_PK,
+      LIMS_SAMPLING_FLAG, HEAT_NO, METER_PIER_NAME,
+      METER_PIER_NO, SHIP_NO, NOTE,
+      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,
+      IS_PRE_SCALE, METER_TYPE_NAME, CHECK_MEMO,
+      CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1,
+      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME,
+      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1,
       CHECK_FLAG2)
-    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
-      #{carNo,jdbcType=VARCHAR}, #{trailerNo,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}, #{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}, #{railwayNo,jdbcType=VARCHAR}, #{meterProcessNo,jdbcType=VARCHAR}, 
-      #{meterProcessEditionNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, #{addWeight,jdbcType=DECIMAL}, 
-      #{meterNum,jdbcType=DECIMAL}, #{weightType,jdbcType=VARCHAR}, #{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}, #{meterReasonNo,jdbcType=VARCHAR}, #{meterReasonName,jdbcType=VARCHAR}, 
-      #{loadEndTime,jdbcType=TIMESTAMP}, #{addWgtNo,jdbcType=VARCHAR}, #{addWgtPk,jdbcType=VARCHAR}, 
-      #{limsSamplingFlag,jdbcType=VARCHAR}, #{heatNo,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR}, 
-      #{meterPierNo,jdbcType=VARCHAR}, #{shipNo,jdbcType=VARCHAR}, #{note,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}, 
-      #{isPreScale,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{checkMemo,jdbcType=VARCHAR}, 
-      #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR}, #{checkTime1,jdbcType=TIMESTAMP}, 
-      #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR}, #{checkMan2Name,jdbcType=VARCHAR}, 
-      #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR}, #{checkFlag1,jdbcType=VARCHAR}, 
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR},
+      #{carNo,jdbcType=VARCHAR}, #{trailerNo,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}, #{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}, #{railwayNo,jdbcType=VARCHAR}, #{meterProcessNo,jdbcType=VARCHAR},
+      #{meterProcessEditionNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, #{addWeight,jdbcType=DECIMAL},
+      #{meterNum,jdbcType=DECIMAL}, #{weightType,jdbcType=VARCHAR}, #{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}, #{meterReasonNo,jdbcType=VARCHAR}, #{meterReasonName,jdbcType=VARCHAR},
+      #{loadEndTime,jdbcType=TIMESTAMP}, #{addWgtNo,jdbcType=VARCHAR}, #{addWgtPk,jdbcType=VARCHAR},
+      #{limsSamplingFlag,jdbcType=VARCHAR}, #{heatNo,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR},
+      #{meterPierNo,jdbcType=VARCHAR}, #{shipNo,jdbcType=VARCHAR}, #{note,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},
+      #{isPreScale,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{checkMemo,jdbcType=VARCHAR},
+      #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR}, #{checkTime1,jdbcType=TIMESTAMP},
+      #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR}, #{checkMan2Name,jdbcType=VARCHAR},
+      #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR}, #{checkFlag1,jdbcType=VARCHAR},
       #{checkFlag2,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst">
@@ -2188,87 +2188,87 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_CAR_ACTUAL_FIRST 
-      (ACTUAL_FIRST_NO, 
-      PREDICTION_NO, NOTICE_NO, CAR_NO, 
-      TRAILER_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, 
-      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, RAILWAY_NO, METER_PROCESS_NO, 
-      METER_PROCESS_EDITION_NO, METER_WEIGHT, 
-      ADD_WEIGHT, METER_NUM, WEIGHT_TYPE, 
-      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, METER_REASON_NO, 
-      METER_REASON_NAME, LOAD_END_TIME, 
-      ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG, 
-      HEAT_NO, METER_PIER_NAME, METER_PIER_NO, 
-      SHIP_NO, NOTE, 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, IS_PRE_SCALE, 
-      METER_TYPE_NAME, CHECK_MEMO, CHECK_MAN1_NO, 
-      CHECK_MAN1_NAME, CHECK_TIME1, 
-      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, 
-      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+    insert into METER_WORK_CAR_ACTUAL_FIRST
+      (ACTUAL_FIRST_NO,
+      PREDICTION_NO, NOTICE_NO, CAR_NO,
+      TRAILER_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,
+      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, RAILWAY_NO, METER_PROCESS_NO,
+      METER_PROCESS_EDITION_NO, METER_WEIGHT,
+      ADD_WEIGHT, METER_NUM, WEIGHT_TYPE,
+      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, METER_REASON_NO,
+      METER_REASON_NAME, LOAD_END_TIME,
+      ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG,
+      HEAT_NO, METER_PIER_NAME, METER_PIER_NO,
+      SHIP_NO, NOTE, 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, IS_PRE_SCALE,
+      METER_TYPE_NAME, CHECK_MEMO, CHECK_MAN1_NO,
+      CHECK_MAN1_NAME, CHECK_TIME1,
+      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME,
+      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1,
       CHECK_FLAG2)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualFirstNo,jdbcType=VARCHAR}, 
-      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, 
-      #{item.trailerNo,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.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.railwayNo,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR}, 
-      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, 
-      #{item.addWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, #{item.weightType,jdbcType=VARCHAR}, 
-      #{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.meterReasonNo,jdbcType=VARCHAR}, 
-      #{item.meterReasonName,jdbcType=VARCHAR}, #{item.loadEndTime,jdbcType=TIMESTAMP}, 
-      #{item.addWgtNo,jdbcType=VARCHAR}, #{item.addWgtPk,jdbcType=VARCHAR}, #{item.limsSamplingFlag,jdbcType=VARCHAR}, 
-      #{item.heatNo,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR}, #{item.meterPierNo,jdbcType=VARCHAR}, 
-      #{item.shipNo,jdbcType=VARCHAR}, #{item.note,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.isPreScale,jdbcType=VARCHAR}, 
-      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, 
-      #{item.checkMan1Name,jdbcType=VARCHAR}, #{item.checkTime1,jdbcType=TIMESTAMP}, 
-      #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, #{item.checkMan2Name,jdbcType=VARCHAR}, 
-      #{item.checkTime2,jdbcType=TIMESTAMP}, #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR}, 
-      #{item.checkFlag2,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.carNo,jdbcType=VARCHAR},
+      #{item.trailerNo,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.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.railwayNo,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR},
+      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL},
+      #{item.addWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, #{item.weightType,jdbcType=VARCHAR},
+      #{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.meterReasonNo,jdbcType=VARCHAR},
+      #{item.meterReasonName,jdbcType=VARCHAR}, #{item.loadEndTime,jdbcType=TIMESTAMP},
+      #{item.addWgtNo,jdbcType=VARCHAR}, #{item.addWgtPk,jdbcType=VARCHAR}, #{item.limsSamplingFlag,jdbcType=VARCHAR},
+      #{item.heatNo,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR}, #{item.meterPierNo,jdbcType=VARCHAR},
+      #{item.shipNo,jdbcType=VARCHAR}, #{item.note,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.isPreScale,jdbcType=VARCHAR},
+      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR},
+      #{item.checkMan1Name,jdbcType=VARCHAR}, #{item.checkTime1,jdbcType=TIMESTAMP},
+      #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, #{item.checkMan2Name,jdbcType=VARCHAR},
+      #{item.checkTime2,jdbcType=TIMESTAMP}, #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR},
+      #{item.checkFlag2,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2678,14 +2678,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.checkFlag2,jdbcType=VARCHAR}
        </foreach>
-     where ACTUAL_FIRST_NO in 
+     where ACTUAL_FIRST_NO in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualFirstNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_CAR_ACTUAL_FIRST
-    where ACTUAL_FIRST_NO in 
+    where ACTUAL_FIRST_NO in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -3083,6 +3083,12 @@
     SELECT distinct car_No, create_time
     from METER_WORK_CAR_ACTUAL_FIRST
     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>
@@ -3162,6 +3168,12 @@
         #{item}
       </foreach>
     </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>
 
@@ -3301,5 +3313,5 @@
     A.create_man_no,
     A.create_man_name
   </select>
-  
-</mapper>
+
+</mapper>

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

@@ -3326,6 +3326,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctCarNo(HashMap<String, Object> obj) {
+
+        if(obj==null){
+            obj = new HashMap<>();
+        }
 //        HashMap<String, Object> obj = new HashMap<>();
 //        obj.put("carNo", carNo);
 //        obj.put("startTime", startTime);

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

@@ -515,6 +515,19 @@ 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 = meterWorkRailwayActFirstService.distinctRailwayNo(param);
+            return success(rows);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+    }
 
     @ApiOperation(value = "一次数据维护-网页", notes = "根据传入开始时间、结束时间、轨道衡类型、车号、计量点编号、及连点去重列次编号")
     @PostMapping(value = "/distinctLcNo")
@@ -1612,6 +1625,19 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
+    @ApiOperation(value = "铁水吊钩秤web端--一次数据维护", notes = "根据传入时间和火车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctHookRailwayNo")
+    public RESTfulResult distinctHookRailwayNoPost(@RequestBody(required = false) HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkRailwayActFirstService.distinctHookRailwayNo(param);
+            return success(rows);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+    }
 
     @ApiOperation(value = "铁水吊钩秤web端--降序获取列表", notes = "web端不分页模糊查询")
     @PostMapping(value = "/hookFirstByDesc")

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

@@ -3795,6 +3795,12 @@
         and value_flag in ('1','2')
         and (lc_no is null or lc_no = '无列次')
       </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>
     </where>
     order by create_time desc
   </select>
@@ -3865,6 +3871,12 @@
       <if test="endTime != null and endTime != ''">
         and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </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>
       and railway_type_no in ('001019003', '001019005')
     </where>
   </sql>
@@ -3930,6 +3942,12 @@
     <if test="valueFlag != null and valueFlag != ''">
       and  VALUE_FLAG = #{valueFlag}
     </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>
 
@@ -3980,6 +3998,12 @@
     <if test="lcNo != null and lcNo != ''">
       and  lc_No like '%${lcNo}%'
     </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>
 

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

@@ -659,6 +659,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctRailwayNo(HashMap<String, Object> param) {
+        if(param==null){
+            param = new HashMap<>();
+        }
         String[] lcNoTemp = param.get("lcNo") == null ? "".split(","): param.get("lcNo").toString().split(",");
         param.put("lcNoTemp", lcNoTemp);
         for (String str: lcNoTemp) {
@@ -10035,7 +10038,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             logModel2.setOperationId(actualModel.getActualNo());
                             logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
                             logModel2.setOperationCarnNo(actualModel.getRailwayNo());
-                            logModel2.setOperationBeforeFix(model.toString());
+                            logModel2.setOperationBeforeFix("");
                             logModel2.setOperationAfterFix(actualModel.toString());
                             meterBaseOperationLogMapper.insertSelective(logModel2);
                         }
@@ -10118,7 +10121,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                                 logModel2.setOperationId(actualModel.getActualNo());
                                 logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
                                 logModel2.setOperationCarnNo(actualModel.getRailwayNo());
-                                logModel2.setOperationBeforeFix(model.toString());
+                                logModel2.setOperationBeforeFix("");
                                 logModel2.setOperationAfterFix(actualModel.toString());
                                 meterBaseOperationLogMapper.insertSelective(logModel2);
                             }
@@ -10207,7 +10210,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             logModel2.setOperationId(actualModel.getActualNo());
                             logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
                             logModel2.setOperationCarnNo(actualModel.getRailwayNo());
-                            logModel2.setOperationBeforeFix(model.toString());
+                            logModel2.setOperationBeforeFix("");
                             logModel2.setOperationAfterFix(actualModel.toString());
                             meterBaseOperationLogMapper.insertSelective(logModel2);
                         }
@@ -10275,7 +10278,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                                 logModel2.setOperationId(actualModel.getActualNo());
                                 logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
                                 logModel2.setOperationCarnNo(actualModel.getRailwayNo());
-                                logModel2.setOperationBeforeFix(model.toString());
+                                logModel2.setOperationBeforeFix("");
                                 logModel2.setOperationAfterFix(actualModel.toString());
                                 meterBaseOperationLogMapper.insertSelective(logModel2);
                             }
@@ -10341,6 +10344,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     public List<String> distinctHookRailwayNo(HashMap<String, Object> param) {
+        if(param==null){
+            param=new HashMap<>();
+        }
         List<MeterWorkRailwayActFirst> templist = meterWorkRailwayActFirstMapper.distinctHookRailwayNo(param);
         List<String> list = new ArrayList<>();
         if (templist != null && !templist.isEmpty() ) {

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

@@ -298,6 +298,25 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "火车号汇总统计汇总", notes = "根据传入时间和火车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctRailwayNo")
+    public RESTfulResult distinctRailwayNoPost(@RequestBody(required = false) HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkRailwayActualService.distinctRailwayNo(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 = "/distinctLcNo")
     public RESTfulResult distinctLcNo(@RequestBody HashMap param) {
@@ -1204,6 +1223,25 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "铁水吊钩秤web端--一次数据维护", notes = "根据传入时间和火车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctHookRailwayNo")
+    public RESTfulResult distinctHookRailwayNoPost(@RequestBody(required = false) HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkRailwayActualService.distinctHookRailwayNo(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 = "铁水吊钩秤web端--降序获取列表", notes = "web端不分页模糊查询")
     @PostMapping(value = "/hookActualByDesc")
     public RESTfulResult hookActualByDesc(@RequestBody HashMap parmas) {

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

@@ -127,53 +127,53 @@
     <result column="CHECK_FLAG2" jdbcType="VARCHAR" property="checkFlag2" />
   </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, 
-    BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
-    IS_AUTO_PUBLISH, CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1, 
-    CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+    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,
+    IS_AUTO_PUBLISH, CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1,
+    CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1,
     CHECK_FLAG2
   </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.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.IS_AUTO_PUBLISH, 
-    t.CHECK_FLAG, t.CHECK_MEMO, t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, t.CHECK_MEMO1, 
-    t.CHECK_MAN2_NO, t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2, t.CHECK_FLAG1, 
+    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, t.IS_AUTO_PUBLISH,
+    t.CHECK_FLAG, t.CHECK_MEMO, t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, t.CHECK_MEMO1,
+    t.CHECK_MAN2_NO, t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2, t.CHECK_FLAG1,
     t.CHECK_FLAG2
   </sql>
   <sql id="select">
@@ -183,7 +183,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_RAILWAY_ACTUAL t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO = #{actualNo}
       </if>
@@ -556,7 +556,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO LIKE '%${actualNo}%'
       </if>
@@ -934,7 +934,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_RAILWAY_ACTUAL
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -1303,90 +1303,90 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
-    insert into METER_WORK_RAILWAY_ACTUAL (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, IS_AUTO_PUBLISH, 
-      CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, 
-      CHECK_MAN1_NAME, CHECK_TIME1, CHECK_MEMO1, 
-      CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, 
+    insert into METER_WORK_RAILWAY_ACTUAL (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, IS_AUTO_PUBLISH,
+      CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO,
+      CHECK_MAN1_NAME, CHECK_TIME1, CHECK_MEMO1,
+      CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2,
       CHECK_MEMO2, CHECK_FLAG1, CHECK_FLAG2
       )
-    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}, #{isAutoPublish,jdbcType=VARCHAR}, 
-      #{checkFlag,jdbcType=VARCHAR}, #{checkMemo,jdbcType=VARCHAR}, #{checkMan1No,jdbcType=VARCHAR}, 
-      #{checkMan1Name,jdbcType=VARCHAR}, #{checkTime1,jdbcType=TIMESTAMP}, #{checkMemo1,jdbcType=VARCHAR}, 
-      #{checkMan2No,jdbcType=VARCHAR}, #{checkMan2Name,jdbcType=VARCHAR}, #{checkTime2,jdbcType=TIMESTAMP}, 
+    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}, #{isAutoPublish,jdbcType=VARCHAR},
+      #{checkFlag,jdbcType=VARCHAR}, #{checkMemo,jdbcType=VARCHAR}, #{checkMan1No,jdbcType=VARCHAR},
+      #{checkMan1Name,jdbcType=VARCHAR}, #{checkTime1,jdbcType=TIMESTAMP}, #{checkMemo1,jdbcType=VARCHAR},
+      #{checkMan2No,jdbcType=VARCHAR}, #{checkMan2Name,jdbcType=VARCHAR}, #{checkTime2,jdbcType=TIMESTAMP},
       #{checkMemo2,jdbcType=VARCHAR}, #{checkFlag1,jdbcType=VARCHAR}, #{checkFlag2,jdbcType=VARCHAR}
       )
   </insert>
@@ -2646,103 +2646,103 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_RAILWAY_ACTUAL 
-      (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, IS_AUTO_PUBLISH, CHECK_FLAG, 
-      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, 
-      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, 
-      CHECK_MAN2_NAME, CHECK_TIME2, 
+    insert into METER_WORK_RAILWAY_ACTUAL
+      (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, IS_AUTO_PUBLISH, CHECK_FLAG,
+      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME,
+      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO,
+      CHECK_MAN2_NAME, CHECK_TIME2,
       CHECK_MEMO2, CHECK_FLAG1, CHECK_FLAG2
       )
-    ( <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}, #{item.isAutoPublish,jdbcType=VARCHAR}, #{item.checkFlag,jdbcType=VARCHAR}, 
-      #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, #{item.checkMan1Name,jdbcType=VARCHAR}, 
-      #{item.checkTime1,jdbcType=TIMESTAMP}, #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, 
-      #{item.checkMan2Name,jdbcType=VARCHAR}, #{item.checkTime2,jdbcType=TIMESTAMP}, 
+    ( <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}, #{item.isAutoPublish,jdbcType=VARCHAR}, #{item.checkFlag,jdbcType=VARCHAR},
+      #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, #{item.checkMan1Name,jdbcType=VARCHAR},
+      #{item.checkTime1,jdbcType=TIMESTAMP}, #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR},
+      #{item.checkMan2Name,jdbcType=VARCHAR}, #{item.checkTime2,jdbcType=TIMESTAMP},
       #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR}, #{item.checkFlag2,jdbcType=VARCHAR}
-       from dual  
+       from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -3240,14 +3240,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag2,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>
@@ -4240,6 +4240,12 @@
         and lc_no is not null)
       </if>
     </if>
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and NET_SPOT3_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     and value_flag != '0'
     order by net_time desc
   </select>
@@ -4284,6 +4290,12 @@
     <if test="lcNo != null and lcNo != ''">
       and  lc_No like '%${lcNo}%'
     </if>
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and NET_SPOT3_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     and value_flag != '0'
     order by net_time desc
   </select>
@@ -4824,6 +4836,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+        and NET_SPOT3_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
     </where>
     and value_flag != '0'
     order by net_time desc
@@ -5259,6 +5277,12 @@
       <if test="startTime != null and startTime != null and endTime != '' 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="baseSpotNames != null and baseSpotNames.size() != 0">
+        and NET_SPOT3_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
       and railway_type_no in ('001019003', '001019005')
     </where>
   </sql>
@@ -5394,4 +5418,4 @@
     A.net_man_no,
     A.net_man_name
   </select>
-</mapper>
+</mapper>

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

@@ -1501,6 +1501,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<String> distinctRailwayNo(HashMap<String, Object> param) {
+        if(param==null) {
+            param = new HashMap<>();
+        }
 //        String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
 //        String lcNo = param.get("lcNo") == null ? "" : param.get("lcNo").toString();
 //        String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
@@ -4586,6 +4589,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
     @Override
     public List<String> distinctHookRailwayNo(HashMap<String, Object> param) {
+        if(param==null){
+            param=new HashMap<>();
+        }
+
         List<String> list = new ArrayList<>();
         try{
             list = meterWorkRailwayActualMapper.distinctHookRailwayNo(param)