修改

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/impl/MeterWorkMeasuringInstrumentServiceImpl.java

@@ -84,6 +84,12 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
         String userName = payload.getUserName();
 //            String userId = "admin";
 //            String userName = "admins";
+        model.setGrossWeight(model.getGrossWeight().multiply(new BigDecimal(1000)));
+        model.setTareWeight(model.getTareWeight().multiply(new BigDecimal(1000)));
+        if(model.getGrossWeight().compareTo(model.getTareWeight()) == -1){
+            return "毛重小于皮重";
+        }
+        model.setNetWeight(model.getGrossWeight().subtract(model.getTareWeight()));
         model.setCreateManName(userName);
         model.setCreateTime(new Date());
         model.setActualNo(actualFirstNo);

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/controller/MeterWorkMeasuringInstrumentSecondController.java

@@ -0,0 +1,197 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.batchAddInfoBo;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.service.IMeterWorkMeasuringInstrumentSecondService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkMeasuringInstrumentSecond RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-02-24 09:12
+ * 类描述
+ * 修订历史：
+ * 日期：2023-02-24
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkMeasuringInstrumentSecond RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkmeasuringinstrumentseconds")
+public class MeterWorkMeasuringInstrumentSecondController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkMeasuringInstrumentSecondService meterWorkMeasuringInstrumentSecondService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkMeasuringInstrumentSecond> list = meterWorkMeasuringInstrumentSecondService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkMeasuringInstrumentSecond> list = meterWorkMeasuringInstrumentSecondService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:view")
+    @GetMapping(value = "/likeDesc/")
+    public RESTfulResult likeDesc(@RequestParam HashMap parmas){
+        Integer pageNum = parmas.get("pageNum") == null ? 1 : Integer.parseInt(parmas.get("pageNum").toString());
+        Integer pageSize =parmas.get("pageSize") == null ? 20 : Integer.parseInt(parmas.get("pageSize").toString());
+        PageList<MeterWorkMeasuringInstrumentSecond> list = meterWorkMeasuringInstrumentSecondService.likeDesc(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取录入人列表", notes="不分页查询（createManName）")
+    @GetMapping(value = "/getCreateManNo")
+    public RESTfulResult getCreateManNo(@RequestParam(required = false) HashMap parmas){
+        List<String> list = meterWorkMeasuringInstrumentSecondService.getCreateManNo(parmas);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkMeasuringInstrumentSecond对象创建")
+    @ApiImplicitParam(name = "meterWorkMeasuringInstrumentSecond", value = "详细实体meterWorkMeasuringInstrumentSecond", required = true, dataType = "MeterWorkMeasuringInstrumentSecond")
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody MeterWorkMeasuringInstrumentSecond model){
+        try{
+            String msg = meterWorkMeasuringInstrumentSecondService.checkandadd(model);
+            if (msg != "" && !msg.equals("")) {
+                return  failed(null,msg);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkMeasuringInstrumentSecond meterWorkMeasuringInstrumentSecond = meterWorkMeasuringInstrumentSecondService.getById(id);
+        return success(meterWorkMeasuringInstrumentSecond);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkMeasuringInstrumentSecond信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkMeasuringInstrumentSecond", value = "详细实体meterWorkMeasuringInstrumentSecond", required = true, dataType = "MeterWorkMeasuringInstrumentSecond")
+    })
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkMeasuringInstrumentSecond model){
+        model.setId(id);
+        MeterWorkMeasuringInstrumentSecond meterWorkMeasuringInstrumentSecond = meterWorkMeasuringInstrumentSecondService.modify(model);
+        return success(meterWorkMeasuringInstrumentSecond);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkmeasuringinstrumentsecond:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterWorkMeasuringInstrumentSecondService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "批量导入", notes = "根据MeterWorkMeasuringInstrument对象批量导入")
+    @ApiImplicitParam(paramType = "path",  required = true, dataType = "List<MeterWorkMeasuringInstrument>")
+    @Transactional(rollbackFor = MarkerMetException.class)
+    @PostMapping(value = "/batchAddInfo")//String
+    public RESTfulResult batchAddInfo(@RequestBody batchAddInfoBo map) {
+        try {
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date grossTime = sdf.parse(map.getGrossTime());
+            Date tareTime = sdf.parse(map.getTareTime());
+            List<MeterWorkMeasuringInstrumentSecond> models =  map.getList();
+            models.get(0).setGrossTime(grossTime);
+            models.get(0).setTareTime(tareTime);
+//            for(int i=0; i < mapList.size(); i++) {
+//                MeterWorkMeasuringInstrument model = new MeterWorkMeasuringInstrument();
+//                if(i == 0) {
+//                    model.setGrossTime(grossTime);
+//                    model.setTareTime(tareTime);
+//                }
+//                String railwayNo = mapList.get(i).get("railwayNo").toString();
+//                BigDecimal grossWeight = new BigDecimal(mapList.get(i).get("grossWeight").toString());
+//                BigDecimal tareWeight = new BigDecimal(mapList.get(i).get("tareWeight").toString());
+//                model.setRailwayNo(railwayNo);
+//                model.setGrossWeight(grossWeight);
+//                model.setTareWeight(tareWeight);
+//                model.setNetWeight(new BigDecimal(mapList.get(i).get("netWeight").toString()));
+//                model.setMatterName(mapList.get(i).get("matterName").toString());
+//                model.setForwardingUnitName(mapList.get(i).get("forwardingUnitName").toString());
+//                model.setReceivingUintName(mapList.get(i).get("receivingUintName").toString());
+//                model.setCarrierUnitName(mapList.get(i).get("carrierUnitName").toString());
+//                models.add(model);
+//            }
+            RESTfulResult rm = meterWorkMeasuringInstrumentSecondService.batchAddInfo(models);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "批量作废", notes = "根据MeterWorkMeasuringInstrument对象批量作废")
+    @ApiImplicitParam(paramType = "path",  required = true, dataType = "List<MeterWorkMeasuringInstrument>")
+    @Transactional
+    @PostMapping(value = "/batchDeleteInfo")//String
+    public RESTfulResult batchDeleteInfo(@RequestBody List<MeterWorkMeasuringInstrumentSecond> models) {
+        try {
+            RESTfulResult rm = meterWorkMeasuringInstrumentSecondService.batchDeleteInfo(models);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/mapper/MeterWorkMeasuringInstrumentSecondMapper.java

@@ -0,0 +1,17 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkmeasuringinstrument.model.MeterWorkMeasuringInstrument;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface MeterWorkMeasuringInstrumentSecondMapper extends IBaseMapper<MeterWorkMeasuringInstrumentSecond, String> {
+    String getNewID(@Param(value="afl")String afl);
+    List<MeterWorkMeasuringInstrumentSecond> likeDesc(HashMap params);
+    List<String> getCreateManNo(HashMap params);
+}

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/mapper/MeterWorkMeasuringInstrumentSecondMapper.xml

@@ -0,0 +1,2794 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.mapper.MeterWorkMeasuringInstrumentSecondMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond">
+    <id column="ACTUAL_NO" jdbcType="VARCHAR" property="actualNo" />
+    <result column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
+    <result column="NOTICE_NO" jdbcType="VARCHAR" property="noticeNo" />
+    <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
+    <result column="RAILWAY_CARRIAGE_NO" jdbcType="VARCHAR" property="railwayCarriageNo" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="CONTRACT_NO" jdbcType="VARCHAR" property="contractNo" />
+    <result column="BATCH_NO" jdbcType="VARCHAR" property="batchNo" />
+    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
+    <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
+    <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo" />
+    <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName" />
+    <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo" />
+    <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName" />
+    <result column="MATERIAL_NO" jdbcType="VARCHAR" property="materialNo" />
+    <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
+    <result column="SPEC_NO" jdbcType="VARCHAR" property="specNo" />
+    <result column="SPEC_NAME" jdbcType="VARCHAR" property="specName" />
+    <result column="LOAD_POINT_NO" jdbcType="VARCHAR" property="loadPointNo" />
+    <result column="LOAD_POINT_NAME" jdbcType="VARCHAR" property="loadPointName" />
+    <result column="SAMPLE_VOUCHER" jdbcType="VARCHAR" property="sampleVoucher" />
+    <result column="CARRIER_UNIT_NO" jdbcType="VARCHAR" property="carrierUnitNo" />
+    <result column="CARRIER_UNIT_NAME" jdbcType="VARCHAR" property="carrierUnitName" />
+    <result column="METER_TYPE_NO" jdbcType="VARCHAR" property="meterTypeNo" />
+    <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName" />
+    <result column="METER_PROCESS_NO" jdbcType="VARCHAR" property="meterProcessNo" />
+    <result column="METER_PROCESS_EDITION_NO" jdbcType="VARCHAR" property="meterProcessEditionNo" />
+    <result column="ACTUAL_FIRST1_NO" jdbcType="VARCHAR" property="actualFirst1No" />
+    <result column="GROSS_WEIGHT" jdbcType="DECIMAL" property="grossWeight" />
+    <result column="GROSS_MAN_NO" jdbcType="VARCHAR" property="grossManNo" />
+    <result column="GROSS_MAN_NAME" jdbcType="VARCHAR" property="grossManName" />
+    <result column="GROSS_TIME" jdbcType="TIMESTAMP" property="grossTime" />
+    <result column="BASE_SPOT1_NO" jdbcType="VARCHAR" property="baseSpot1No" />
+    <result column="BASE_SPOT1_NAME" jdbcType="VARCHAR" property="baseSpot1Name" />
+    <result column="GROSS_CLASS" jdbcType="VARCHAR" property="grossClass" />
+    <result column="GROSS_GROUP" jdbcType="VARCHAR" property="grossGroup" />
+    <result column="GROSS_MODE" jdbcType="VARCHAR" property="grossMode" />
+    <result column="ACTUAL_FIRST2_NO" jdbcType="VARCHAR" property="actualFirst2No" />
+    <result column="TARE_WEIGHT" jdbcType="DECIMAL" property="tareWeight" />
+    <result column="TARE_MAN_NO" jdbcType="VARCHAR" property="tareManNo" />
+    <result column="TARE_MAN_NAME" jdbcType="VARCHAR" property="tareManName" />
+    <result column="TARE_TIME" jdbcType="TIMESTAMP" property="tareTime" />
+    <result column="BASE_SPOT2_NO" jdbcType="VARCHAR" property="baseSpot2No" />
+    <result column="BASE_SPOT2_NAME" jdbcType="VARCHAR" property="baseSpot2Name" />
+    <result column="TARE_CLASS" jdbcType="VARCHAR" property="tareClass" />
+    <result column="TARE_GROUP" jdbcType="VARCHAR" property="tareGroup" />
+    <result column="TARE_MODE" jdbcType="VARCHAR" property="tareMode" />
+    <result column="NET_WEIGHT" jdbcType="DECIMAL" property="netWeight" />
+    <result column="NET_MAN_NO" jdbcType="VARCHAR" property="netManNo" />
+    <result column="NET_MAN_NAME" jdbcType="VARCHAR" property="netManName" />
+    <result column="NET_TIME" jdbcType="TIMESTAMP" property="netTime" />
+    <result column="NET_SPOT3_NO" jdbcType="VARCHAR" property="netSpot3No" />
+    <result column="NET_SPOT3_NAME" jdbcType="VARCHAR" property="netSpot3Name" />
+    <result column="NET_CLASS" jdbcType="VARCHAR" property="netClass" />
+    <result column="NET_GROUP" jdbcType="VARCHAR" property="netGroup" />
+    <result column="NET_MODE" jdbcType="VARCHAR" property="netMode" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="UPLOAD_FLAG" jdbcType="VARCHAR" property="uploadFlag" />
+    <result column="CHECK_MAN_NO" jdbcType="VARCHAR" property="checkManNo" />
+    <result column="CHECK_MAN_NAME" jdbcType="VARCHAR" property="checkManName" />
+    <result column="CHECK_TIME" jdbcType="TIMESTAMP" property="checkTime" />
+    <result column="UPLOAD_MAN_NO" jdbcType="VARCHAR" property="uploadManNo" />
+    <result column="UPLOAD_MAN_NAME" jdbcType="VARCHAR" property="uploadManName" />
+    <result column="UPLOAD_TIME" jdbcType="TIMESTAMP" property="uploadTime" />
+    <result column="SAMPLE_NO" jdbcType="VARCHAR" property="sampleNo" />
+    <result column="RAILWAY_TYPE_NO" jdbcType="VARCHAR" property="railwayTypeNo" />
+    <result column="RAILWAY_TYPE_NAME" jdbcType="VARCHAR" property="railwayTypeName" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="WATER_NUM" jdbcType="DECIMAL" property="waterNum" />
+    <result column="ARRIVAL" jdbcType="VARCHAR" property="arrival" />
+    <result column="STATION" jdbcType="VARCHAR" property="station" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="SOURCE_AREA" jdbcType="VARCHAR" property="sourceArea" />
+    <result column="VOUCHER_IDENTITY" jdbcType="VARCHAR" property="voucherIdentity" />
+    <result column="VOUCHER_ITEM" jdbcType="VARCHAR" property="voucherItem" />
+    <result column="BUSINESS_GROUP" jdbcType="VARCHAR" property="businessGroup" />
+    <result column="TEMP_CONVEYANCE" jdbcType="VARCHAR" property="tempConveyance" />
+    <result column="CONVEYANCE_TYPE" jdbcType="VARCHAR" property="conveyanceType" />
+    <result column="RESOURCE_SYSTEM" jdbcType="VARCHAR" property="resourceSystem" />
+    <result column="GROUP_PACKAGE_AMOUNT" jdbcType="DECIMAL" property="groupPackageAmount" />
+    <result column="GROUP_PACKAGE_UNIT" jdbcType="VARCHAR" property="groupPackageUnit" />
+    <result column="PACKAGE_AMOUNT" jdbcType="DECIMAL" property="packageAmount" />
+    <result column="PACKAGE_UNIT" jdbcType="VARCHAR" property="packageUnit" />
+    <result column="THEORY_AMOUNT" jdbcType="DECIMAL" property="theoryAmount" />
+    <result column="MEASURE_BATCH" jdbcType="VARCHAR" property="measureBatch" />
+    <result column="MEASURE_BATCH_COUNT" jdbcType="DECIMAL" property="measureBatchCount" />
+    <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
+    <result column="SENDER_REMARK" jdbcType="VARCHAR" property="senderRemark" />
+    <result column="RECEIVER_TYPE" jdbcType="VARCHAR" property="receiverType" />
+    <result column="RECEIVER_REMARK" jdbcType="VARCHAR" property="receiverRemark" />
+    <result column="AMOUNT_UNIT" jdbcType="VARCHAR" property="amountUnit" />
+    <result column="MEASURE_OBJECT_TYPE" jdbcType="VARCHAR" property="measureObjectType" />
+    <result column="MEASURE_TASK_NUM" jdbcType="VARCHAR" property="measureTaskNum" />
+    <result column="BILL_TYPE" jdbcType="VARCHAR" property="billType" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="DATA_SOURCE" jdbcType="VARCHAR" property="dataSource" />
+    <result column="NOTE" jdbcType="VARCHAR" property="note" />
+    <result column="IS_PRE_SACALE" jdbcType="VARCHAR" property="isPreSacale" />
+  </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
+  </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
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_MEASURING_INSTRUMENT_SECOND
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_MEASURING_INSTRUMENT_SECOND t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="actualNo != null and actualNo != ''">
+        and ACTUAL_NO = #{actualNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        and NOTICE_NO = #{noticeNo}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+        and RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="contractNo != null and contractNo != ''">
+        and CONTRACT_NO = #{contractNo}
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        and BATCH_NO = #{batchNo}
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME = #{receivingUintName}
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO = #{materialNo}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="specNo != null and specNo != ''">
+        and SPEC_NO = #{specNo}
+      </if>
+      <if test="specName != null and specName != ''">
+        and SPEC_NAME = #{specName}
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        and LOAD_POINT_NO = #{loadPointNo}
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME = #{loadPointName}
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        and SAMPLE_VOUCHER = #{sampleVoucher}
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO = #{carrierUnitNo}
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME = #{carrierUnitName}
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO = #{meterTypeNo}
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME = #{meterTypeName}
+      </if>
+      <if test="meterProcessNo != null and meterProcessNo != ''">
+        and METER_PROCESS_NO = #{meterProcessNo}
+      </if>
+      <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+        and METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
+      </if>
+      <if test="actualFirst1No != null and actualFirst1No != ''">
+        and ACTUAL_FIRST1_NO = #{actualFirst1No}
+      </if>
+      <if test="grossWeight != null">
+        and GROSS_WEIGHT = #{grossWeight}
+      </if>
+      <if test="grossManNo != null and grossManNo != ''">
+        and GROSS_MAN_NO = #{grossManNo}
+      </if>
+      <if test="grossManName != null and grossManName != ''">
+        and GROSS_MAN_NAME = #{grossManName}
+      </if>
+      <if test="grossTime != null">
+        and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
+      </if>
+      <if test="baseSpot1No != null and baseSpot1No != ''">
+        and BASE_SPOT1_NO = #{baseSpot1No}
+      </if>
+      <if test="baseSpot1Name != null and baseSpot1Name != ''">
+        and BASE_SPOT1_NAME = #{baseSpot1Name}
+      </if>
+      <if test="grossClass != null and grossClass != ''">
+        and GROSS_CLASS = #{grossClass}
+      </if>
+      <if test="grossGroup != null and grossGroup != ''">
+        and GROSS_GROUP = #{grossGroup}
+      </if>
+      <if test="grossMode != null and grossMode != ''">
+        and GROSS_MODE = #{grossMode}
+      </if>
+      <if test="actualFirst2No != null and actualFirst2No != ''">
+        and ACTUAL_FIRST2_NO = #{actualFirst2No}
+      </if>
+      <if test="tareWeight != null">
+        and TARE_WEIGHT = #{tareWeight}
+      </if>
+      <if test="tareManNo != null and tareManNo != ''">
+        and TARE_MAN_NO = #{tareManNo}
+      </if>
+      <if test="tareManName != null and tareManName != ''">
+        and TARE_MAN_NAME = #{tareManName}
+      </if>
+      <if test="tareTime != null">
+        and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
+      </if>
+      <if test="baseSpot2No != null and baseSpot2No != ''">
+        and BASE_SPOT2_NO = #{baseSpot2No}
+      </if>
+      <if test="baseSpot2Name != null and baseSpot2Name != ''">
+        and BASE_SPOT2_NAME = #{baseSpot2Name}
+      </if>
+      <if test="tareClass != null and tareClass != ''">
+        and TARE_CLASS = #{tareClass}
+      </if>
+      <if test="tareGroup != null and tareGroup != ''">
+        and TARE_GROUP = #{tareGroup}
+      </if>
+      <if test="tareMode != null and tareMode != ''">
+        and TARE_MODE = #{tareMode}
+      </if>
+      <if test="netWeight != null">
+        and NET_WEIGHT = #{netWeight}
+      </if>
+      <if test="netManNo != null and netManNo != ''">
+        and NET_MAN_NO = #{netManNo}
+      </if>
+      <if test="netManName != null and netManName != ''">
+        and NET_MAN_NAME = #{netManName}
+      </if>
+      <if test="netTime != null">
+        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and NET_SPOT3_NO = #{netSpot3No}
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and NET_SPOT3_NAME = #{netSpot3Name}
+      </if>
+      <if test="netClass != null and netClass != ''">
+        and NET_CLASS = #{netClass}
+      </if>
+      <if test="netGroup != null and netGroup != ''">
+        and NET_GROUP = #{netGroup}
+      </if>
+      <if test="netMode != null and netMode != ''">
+        and NET_MODE = #{netMode}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG = #{uploadFlag}
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        and CHECK_MAN_NO = #{checkManNo}
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        and CHECK_MAN_NAME = #{checkManName}
+      </if>
+      <if test="checkTime != null">
+        and TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = #{checkTime}
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        and UPLOAD_MAN_NO = #{uploadManNo}
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        and UPLOAD_MAN_NAME = #{uploadManName}
+      </if>
+      <if test="uploadTime != null">
+        and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        and SAMPLE_NO = #{sampleNo}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME = #{railwayTypeName}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="waterNum != null">
+        and WATER_NUM = #{waterNum}
+      </if>
+      <if test="arrival != null and arrival != ''">
+        and ARRIVAL = #{arrival}
+      </if>
+      <if test="station != null and station != ''">
+        and STATION = #{station}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="sourceArea != null and sourceArea != ''">
+        and SOURCE_AREA = #{sourceArea}
+      </if>
+      <if test="voucherIdentity != null and voucherIdentity != ''">
+        and VOUCHER_IDENTITY = #{voucherIdentity}
+      </if>
+      <if test="voucherItem != null and voucherItem != ''">
+        and VOUCHER_ITEM = #{voucherItem}
+      </if>
+      <if test="businessGroup != null and businessGroup != ''">
+        and BUSINESS_GROUP = #{businessGroup}
+      </if>
+      <if test="tempConveyance != null and tempConveyance != ''">
+        and TEMP_CONVEYANCE = #{tempConveyance}
+      </if>
+      <if test="conveyanceType != null and conveyanceType != ''">
+        and CONVEYANCE_TYPE = #{conveyanceType}
+      </if>
+      <if test="resourceSystem != null and resourceSystem != ''">
+        and RESOURCE_SYSTEM = #{resourceSystem}
+      </if>
+      <if test="groupPackageAmount != null">
+        and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+      </if>
+      <if test="groupPackageUnit != null and groupPackageUnit != ''">
+        and GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+      </if>
+      <if test="packageAmount != null">
+        and PACKAGE_AMOUNT = #{packageAmount}
+      </if>
+      <if test="packageUnit != null and packageUnit != ''">
+        and PACKAGE_UNIT = #{packageUnit}
+      </if>
+      <if test="theoryAmount != null">
+        and THEORY_AMOUNT = #{theoryAmount}
+      </if>
+      <if test="measureBatch != null and measureBatch != ''">
+        and MEASURE_BATCH = #{measureBatch}
+      </if>
+      <if test="measureBatchCount != null">
+        and MEASURE_BATCH_COUNT = #{measureBatchCount}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE = #{senderType}
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK = #{senderRemark}
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE = #{receiverType}
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        and RECEIVER_REMARK = #{receiverRemark}
+      </if>
+      <if test="amountUnit != null and amountUnit != ''">
+        and AMOUNT_UNIT = #{amountUnit}
+      </if>
+      <if test="measureObjectType != null and measureObjectType != ''">
+        and MEASURE_OBJECT_TYPE = #{measureObjectType}
+      </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM = #{measureTaskNum}
+      </if>
+      <if test="billType != null and billType != ''">
+        and BILL_TYPE = #{billType}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        and DATA_SOURCE = #{dataSource}
+      </if>
+      <if test="note != null and note != ''">
+        and NOTE = #{note}
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE = #{isPreSacale}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="actualNo != null and actualNo != ''">
+        and ACTUAL_NO LIKE '%${actualNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        and NOTICE_NO LIKE '%${noticeNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+        and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
+      </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="contractNo != null and contractNo != ''">
+        and CONTRACT_NO LIKE '%${contractNo}%'
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        and BATCH_NO LIKE '%${batchNo}%'
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </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="materialNo != null and materialNo != ''">
+        and MATERIAL_NO LIKE '%${materialNo}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="specNo != null and specNo != ''">
+        and SPEC_NO LIKE '%${specNo}%'
+      </if>
+      <if test="specName != null and specName != ''">
+        and SPEC_NAME LIKE '%${specName}%'
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        and LOAD_POINT_NO LIKE '%${loadPointNo}%'
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="meterProcessNo != null and meterProcessNo != ''">
+        and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
+      </if>
+      <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+        and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
+      </if>
+      <if test="actualFirst1No != null and actualFirst1No != ''">
+        and ACTUAL_FIRST1_NO LIKE '%${actualFirst1No}%'
+      </if>
+      <if test="grossWeight != null">
+        and GROSS_WEIGHT = #{grossWeight}
+      </if>
+      <if test="grossManNo != null and grossManNo != ''">
+        and GROSS_MAN_NO LIKE '%${grossManNo}%'
+      </if>
+      <if test="grossManName != null and grossManName != ''">
+        and GROSS_MAN_NAME LIKE '%${grossManName}%'
+      </if>
+      <if test="grossTime != null">
+        and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
+      </if>
+      <if test="baseSpot1No != null and baseSpot1No != ''">
+        and BASE_SPOT1_NO LIKE '%${baseSpot1No}%'
+      </if>
+      <if test="baseSpot1Name != null and baseSpot1Name != ''">
+        and BASE_SPOT1_NAME LIKE '%${baseSpot1Name}%'
+      </if>
+      <if test="grossClass != null and grossClass != ''">
+        and GROSS_CLASS LIKE '%${grossClass}%'
+      </if>
+      <if test="grossGroup != null and grossGroup != ''">
+        and GROSS_GROUP LIKE '%${grossGroup}%'
+      </if>
+      <if test="grossMode != null and grossMode != ''">
+        and GROSS_MODE LIKE '%${grossMode}%'
+      </if>
+      <if test="actualFirst2No != null and actualFirst2No != ''">
+        and ACTUAL_FIRST2_NO LIKE '%${actualFirst2No}%'
+      </if>
+      <if test="tareWeight != null">
+        and TARE_WEIGHT = #{tareWeight}
+      </if>
+      <if test="tareManNo != null and tareManNo != ''">
+        and TARE_MAN_NO LIKE '%${tareManNo}%'
+      </if>
+      <if test="tareManName != null and tareManName != ''">
+        and TARE_MAN_NAME LIKE '%${tareManName}%'
+      </if>
+      <if test="tareTime != null">
+        and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
+      </if>
+      <if test="baseSpot2No != null and baseSpot2No != ''">
+        and BASE_SPOT2_NO LIKE '%${baseSpot2No}%'
+      </if>
+      <if test="baseSpot2Name != null and baseSpot2Name != ''">
+        and BASE_SPOT2_NAME LIKE '%${baseSpot2Name}%'
+      </if>
+      <if test="tareClass != null and tareClass != ''">
+        and TARE_CLASS LIKE '%${tareClass}%'
+      </if>
+      <if test="tareGroup != null and tareGroup != ''">
+        and TARE_GROUP LIKE '%${tareGroup}%'
+      </if>
+      <if test="tareMode != null and tareMode != ''">
+        and TARE_MODE LIKE '%${tareMode}%'
+      </if>
+      <if test="netWeight != null">
+        and NET_WEIGHT = #{netWeight}
+      </if>
+      <if test="netManNo != null and netManNo != ''">
+        and NET_MAN_NO LIKE '%${netManNo}%'
+      </if>
+      <if test="netManName != null and netManName != ''">
+        and NET_MAN_NAME LIKE '%${netManName}%'
+      </if>
+      <if test="netTime != null">
+        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
+      </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="netClass != null and netClass != ''">
+        and NET_CLASS LIKE '%${netClass}%'
+      </if>
+      <if test="netGroup != null and netGroup != ''">
+        and NET_GROUP LIKE '%${netGroup}%'
+      </if>
+      <if test="netMode != null and netMode != ''">
+        and NET_MODE LIKE '%${netMode}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG LIKE '%${uploadFlag}%'
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        and CHECK_MAN_NO LIKE '%${checkManNo}%'
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        and CHECK_MAN_NAME LIKE '%${checkManName}%'
+      </if>
+      <if test="checkTime != null">
+        and TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = #{checkTime}
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        and UPLOAD_MAN_NO LIKE '%${uploadManNo}%'
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        and UPLOAD_MAN_NAME LIKE '%${uploadManName}%'
+      </if>
+      <if test="uploadTime != null">
+        and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        and SAMPLE_NO LIKE '%${sampleNo}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="waterNum != null">
+        and WATER_NUM = #{waterNum}
+      </if>
+      <if test="arrival != null and arrival != ''">
+        and ARRIVAL LIKE '%${arrival}%'
+      </if>
+      <if test="station != null and station != ''">
+        and STATION LIKE '%${station}%'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="sourceArea != null and sourceArea != ''">
+        and SOURCE_AREA LIKE '%${sourceArea}%'
+      </if>
+      <if test="voucherIdentity != null and voucherIdentity != ''">
+        and VOUCHER_IDENTITY LIKE '%${voucherIdentity}%'
+      </if>
+      <if test="voucherItem != null and voucherItem != ''">
+        and VOUCHER_ITEM LIKE '%${voucherItem}%'
+      </if>
+      <if test="businessGroup != null and businessGroup != ''">
+        and BUSINESS_GROUP LIKE '%${businessGroup}%'
+      </if>
+      <if test="tempConveyance != null and tempConveyance != ''">
+        and TEMP_CONVEYANCE LIKE '%${tempConveyance}%'
+      </if>
+      <if test="conveyanceType != null and conveyanceType != ''">
+        and CONVEYANCE_TYPE LIKE '%${conveyanceType}%'
+      </if>
+      <if test="resourceSystem != null and resourceSystem != ''">
+        and RESOURCE_SYSTEM LIKE '%${resourceSystem}%'
+      </if>
+      <if test="groupPackageAmount != null">
+        and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+      </if>
+      <if test="groupPackageUnit != null and groupPackageUnit != ''">
+        and GROUP_PACKAGE_UNIT LIKE '%${groupPackageUnit}%'
+      </if>
+      <if test="packageAmount != null">
+        and PACKAGE_AMOUNT = #{packageAmount}
+      </if>
+      <if test="packageUnit != null and packageUnit != ''">
+        and PACKAGE_UNIT LIKE '%${packageUnit}%'
+      </if>
+      <if test="theoryAmount != null">
+        and THEORY_AMOUNT = #{theoryAmount}
+      </if>
+      <if test="measureBatch != null and measureBatch != ''">
+        and MEASURE_BATCH LIKE '%${measureBatch}%'
+      </if>
+      <if test="measureBatchCount != null">
+        and MEASURE_BATCH_COUNT = #{measureBatchCount}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK LIKE '%${senderRemark}%'
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE LIKE '%${receiverType}%'
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+      </if>
+      <if test="amountUnit != null and amountUnit != ''">
+        and AMOUNT_UNIT LIKE '%${amountUnit}%'
+      </if>
+      <if test="measureObjectType != null and measureObjectType != ''">
+        and MEASURE_OBJECT_TYPE LIKE '%${measureObjectType}%'
+      </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM LIKE '%${measureTaskNum}%'
+      </if>
+      <if test="billType != null and billType != ''">
+        and BILL_TYPE LIKE '%${billType}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        and DATA_SOURCE LIKE '%${dataSource}%'
+      </if>
+      <if test="note != null and note != ''">
+        and NOTE LIKE '%${note}%'
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE LIKE '%${isPreSacale}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_MEASURING_INSTRUMENT_SECOND
+    where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_MEASURING_INSTRUMENT_SECOND
+    where 1!=1 
+      <if test="predictionNo != null and predictionNo != ''">
+        or PREDICTION_NO = #{predictionNo}
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        or NOTICE_NO = #{noticeNo}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        or RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+        or RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="contractNo != null and contractNo != ''">
+        or CONTRACT_NO = #{contractNo}
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        or BATCH_NO = #{batchNo}
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        or FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        or FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        or RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        or RECEIVING_UINT_NAME = #{receivingUintName}
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        or MATERIAL_NO = #{materialNo}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        or MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="specNo != null and specNo != ''">
+        or SPEC_NO = #{specNo}
+      </if>
+      <if test="specName != null and specName != ''">
+        or SPEC_NAME = #{specName}
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        or LOAD_POINT_NO = #{loadPointNo}
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        or LOAD_POINT_NAME = #{loadPointName}
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        or SAMPLE_VOUCHER = #{sampleVoucher}
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        or CARRIER_UNIT_NO = #{carrierUnitNo}
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        or CARRIER_UNIT_NAME = #{carrierUnitName}
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        or METER_TYPE_NO = #{meterTypeNo}
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        or METER_TYPE_NAME = #{meterTypeName}
+      </if>
+      <if test="meterProcessNo != null and meterProcessNo != ''">
+        or METER_PROCESS_NO = #{meterProcessNo}
+      </if>
+      <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+        or METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
+      </if>
+      <if test="actualFirst1No != null and actualFirst1No != ''">
+        or ACTUAL_FIRST1_NO = #{actualFirst1No}
+      </if>
+      <if test="grossWeight != null">
+        or GROSS_WEIGHT = #{grossWeight}
+      </if>
+      <if test="grossManNo != null and grossManNo != ''">
+        or GROSS_MAN_NO = #{grossManNo}
+      </if>
+      <if test="grossManName != null and grossManName != ''">
+        or GROSS_MAN_NAME = #{grossManName}
+      </if>
+      <if test="grossTime != null">
+        or TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = '#{grossTime}'
+      </if>
+      <if test="baseSpot1No != null and baseSpot1No != ''">
+        or BASE_SPOT1_NO = #{baseSpot1No}
+      </if>
+      <if test="baseSpot1Name != null and baseSpot1Name != ''">
+        or BASE_SPOT1_NAME = #{baseSpot1Name}
+      </if>
+      <if test="grossClass != null and grossClass != ''">
+        or GROSS_CLASS = #{grossClass}
+      </if>
+      <if test="grossGroup != null and grossGroup != ''">
+        or GROSS_GROUP = #{grossGroup}
+      </if>
+      <if test="grossMode != null and grossMode != ''">
+        or GROSS_MODE = #{grossMode}
+      </if>
+      <if test="actualFirst2No != null and actualFirst2No != ''">
+        or ACTUAL_FIRST2_NO = #{actualFirst2No}
+      </if>
+      <if test="tareWeight != null">
+        or TARE_WEIGHT = #{tareWeight}
+      </if>
+      <if test="tareManNo != null and tareManNo != ''">
+        or TARE_MAN_NO = #{tareManNo}
+      </if>
+      <if test="tareManName != null and tareManName != ''">
+        or TARE_MAN_NAME = #{tareManName}
+      </if>
+      <if test="tareTime != null">
+        or TO_CHAR(TARE_TIME,'yyyy-MM-dd') = '#{tareTime}'
+      </if>
+      <if test="baseSpot2No != null and baseSpot2No != ''">
+        or BASE_SPOT2_NO = #{baseSpot2No}
+      </if>
+      <if test="baseSpot2Name != null and baseSpot2Name != ''">
+        or BASE_SPOT2_NAME = #{baseSpot2Name}
+      </if>
+      <if test="tareClass != null and tareClass != ''">
+        or TARE_CLASS = #{tareClass}
+      </if>
+      <if test="tareGroup != null and tareGroup != ''">
+        or TARE_GROUP = #{tareGroup}
+      </if>
+      <if test="tareMode != null and tareMode != ''">
+        or TARE_MODE = #{tareMode}
+      </if>
+      <if test="netWeight != null">
+        or NET_WEIGHT = #{netWeight}
+      </if>
+      <if test="netManNo != null and netManNo != ''">
+        or NET_MAN_NO = #{netManNo}
+      </if>
+      <if test="netManName != null and netManName != ''">
+        or NET_MAN_NAME = #{netManName}
+      </if>
+      <if test="netTime != null">
+        or TO_CHAR(NET_TIME,'yyyy-MM-dd') = '#{netTime}'
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        or NET_SPOT3_NO = #{netSpot3No}
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        or NET_SPOT3_NAME = #{netSpot3Name}
+      </if>
+      <if test="netClass != null and netClass != ''">
+        or NET_CLASS = #{netClass}
+      </if>
+      <if test="netGroup != null and netGroup != ''">
+        or NET_GROUP = #{netGroup}
+      </if>
+      <if test="netMode != null and netMode != ''">
+        or NET_MODE = #{netMode}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        or UPLOAD_FLAG = #{uploadFlag}
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        or CHECK_MAN_NO = #{checkManNo}
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        or CHECK_MAN_NAME = #{checkManName}
+      </if>
+      <if test="checkTime != null">
+        or TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = '#{checkTime}'
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        or UPLOAD_MAN_NO = #{uploadManNo}
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        or UPLOAD_MAN_NAME = #{uploadManName}
+      </if>
+      <if test="uploadTime != null">
+        or TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = '#{uploadTime}'
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        or SAMPLE_NO = #{sampleNo}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        or RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        or RAILWAY_TYPE_NAME = #{railwayTypeName}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="waterNum != null">
+        or WATER_NUM = #{waterNum}
+      </if>
+      <if test="arrival != null and arrival != ''">
+        or ARRIVAL = #{arrival}
+      </if>
+      <if test="station != null and station != ''">
+        or STATION = #{station}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="sourceArea != null and sourceArea != ''">
+        or SOURCE_AREA = #{sourceArea}
+      </if>
+      <if test="voucherIdentity != null and voucherIdentity != ''">
+        or VOUCHER_IDENTITY = #{voucherIdentity}
+      </if>
+      <if test="voucherItem != null and voucherItem != ''">
+        or VOUCHER_ITEM = #{voucherItem}
+      </if>
+      <if test="businessGroup != null and businessGroup != ''">
+        or BUSINESS_GROUP = #{businessGroup}
+      </if>
+      <if test="tempConveyance != null and tempConveyance != ''">
+        or TEMP_CONVEYANCE = #{tempConveyance}
+      </if>
+      <if test="conveyanceType != null and conveyanceType != ''">
+        or CONVEYANCE_TYPE = #{conveyanceType}
+      </if>
+      <if test="resourceSystem != null and resourceSystem != ''">
+        or RESOURCE_SYSTEM = #{resourceSystem}
+      </if>
+      <if test="groupPackageAmount != null">
+        or GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+      </if>
+      <if test="groupPackageUnit != null and groupPackageUnit != ''">
+        or GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+      </if>
+      <if test="packageAmount != null">
+        or PACKAGE_AMOUNT = #{packageAmount}
+      </if>
+      <if test="packageUnit != null and packageUnit != ''">
+        or PACKAGE_UNIT = #{packageUnit}
+      </if>
+      <if test="theoryAmount != null">
+        or THEORY_AMOUNT = #{theoryAmount}
+      </if>
+      <if test="measureBatch != null and measureBatch != ''">
+        or MEASURE_BATCH = #{measureBatch}
+      </if>
+      <if test="measureBatchCount != null">
+        or MEASURE_BATCH_COUNT = #{measureBatchCount}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        or SENDER_TYPE = #{senderType}
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        or SENDER_REMARK = #{senderRemark}
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        or RECEIVER_TYPE = #{receiverType}
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        or RECEIVER_REMARK = #{receiverRemark}
+      </if>
+      <if test="amountUnit != null and amountUnit != ''">
+        or AMOUNT_UNIT = #{amountUnit}
+      </if>
+      <if test="measureObjectType != null and measureObjectType != ''">
+        or MEASURE_OBJECT_TYPE = #{measureObjectType}
+      </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        or MEASURE_TASK_NUM = #{measureTaskNum}
+      </if>
+      <if test="billType != null and billType != ''">
+        or BILL_TYPE = #{billType}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        or DATA_SOURCE = #{dataSource}
+      </if>
+      <if test="note != null and note != ''">
+        or NOTE = #{note}
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        or IS_PRE_SACALE = #{isPreSacale}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond">
+    insert into METER_WORK_MEASURING_INSTRUMENT_SECOND (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)
+    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})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond">
+    insert into METER_WORK_MEASURING_INSTRUMENT_SECOND
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="actualNo != null">
+        ACTUAL_NO,
+      </if>
+      <if test="predictionNo != null">
+        PREDICTION_NO,
+      </if>
+      <if test="noticeNo != null">
+        NOTICE_NO,
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO,
+      </if>
+      <if test="railwayCarriageNo != null">
+        RAILWAY_CARRIAGE_NO,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="contractNo != null">
+        CONTRACT_NO,
+      </if>
+      <if test="batchNo != null">
+        BATCH_NO,
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO,
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME,
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO,
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME,
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO,
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME,
+      </if>
+      <if test="materialNo != null">
+        MATERIAL_NO,
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME,
+      </if>
+      <if test="specNo != null">
+        SPEC_NO,
+      </if>
+      <if test="specName != null">
+        SPEC_NAME,
+      </if>
+      <if test="loadPointNo != null">
+        LOAD_POINT_NO,
+      </if>
+      <if test="loadPointName != null">
+        LOAD_POINT_NAME,
+      </if>
+      <if test="sampleVoucher != null">
+        SAMPLE_VOUCHER,
+      </if>
+      <if test="carrierUnitNo != null">
+        CARRIER_UNIT_NO,
+      </if>
+      <if test="carrierUnitName != null">
+        CARRIER_UNIT_NAME,
+      </if>
+      <if test="meterTypeNo != null">
+        METER_TYPE_NO,
+      </if>
+      <if test="meterTypeName != null">
+        METER_TYPE_NAME,
+      </if>
+      <if test="meterProcessNo != null">
+        METER_PROCESS_NO,
+      </if>
+      <if test="meterProcessEditionNo != null">
+        METER_PROCESS_EDITION_NO,
+      </if>
+      <if test="actualFirst1No != null">
+        ACTUAL_FIRST1_NO,
+      </if>
+      <if test="grossWeight != null">
+        GROSS_WEIGHT,
+      </if>
+      <if test="grossManNo != null">
+        GROSS_MAN_NO,
+      </if>
+      <if test="grossManName != null">
+        GROSS_MAN_NAME,
+      </if>
+      <if test="grossTime != null">
+        GROSS_TIME,
+      </if>
+      <if test="baseSpot1No != null">
+        BASE_SPOT1_NO,
+      </if>
+      <if test="baseSpot1Name != null">
+        BASE_SPOT1_NAME,
+      </if>
+      <if test="grossClass != null">
+        GROSS_CLASS,
+      </if>
+      <if test="grossGroup != null">
+        GROSS_GROUP,
+      </if>
+      <if test="grossMode != null">
+        GROSS_MODE,
+      </if>
+      <if test="actualFirst2No != null">
+        ACTUAL_FIRST2_NO,
+      </if>
+      <if test="tareWeight != null">
+        TARE_WEIGHT,
+      </if>
+      <if test="tareManNo != null">
+        TARE_MAN_NO,
+      </if>
+      <if test="tareManName != null">
+        TARE_MAN_NAME,
+      </if>
+      <if test="tareTime != null">
+        TARE_TIME,
+      </if>
+      <if test="baseSpot2No != null">
+        BASE_SPOT2_NO,
+      </if>
+      <if test="baseSpot2Name != null">
+        BASE_SPOT2_NAME,
+      </if>
+      <if test="tareClass != null">
+        TARE_CLASS,
+      </if>
+      <if test="tareGroup != null">
+        TARE_GROUP,
+      </if>
+      <if test="tareMode != null">
+        TARE_MODE,
+      </if>
+      <if test="netWeight != null">
+        NET_WEIGHT,
+      </if>
+      <if test="netManNo != null">
+        NET_MAN_NO,
+      </if>
+      <if test="netManName != null">
+        NET_MAN_NAME,
+      </if>
+      <if test="netTime != null">
+        NET_TIME,
+      </if>
+      <if test="netSpot3No != null">
+        NET_SPOT3_NO,
+      </if>
+      <if test="netSpot3Name != null">
+        NET_SPOT3_NAME,
+      </if>
+      <if test="netClass != null">
+        NET_CLASS,
+      </if>
+      <if test="netGroup != null">
+        NET_GROUP,
+      </if>
+      <if test="netMode != null">
+        NET_MODE,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="uploadFlag != null">
+        UPLOAD_FLAG,
+      </if>
+      <if test="checkManNo != null">
+        CHECK_MAN_NO,
+      </if>
+      <if test="checkManName != null">
+        CHECK_MAN_NAME,
+      </if>
+      <if test="checkTime != null">
+        CHECK_TIME,
+      </if>
+      <if test="uploadManNo != null">
+        UPLOAD_MAN_NO,
+      </if>
+      <if test="uploadManName != null">
+        UPLOAD_MAN_NAME,
+      </if>
+      <if test="uploadTime != null">
+        UPLOAD_TIME,
+      </if>
+      <if test="sampleNo != null">
+        SAMPLE_NO,
+      </if>
+      <if test="railwayTypeNo != null">
+        RAILWAY_TYPE_NO,
+      </if>
+      <if test="railwayTypeName != null">
+        RAILWAY_TYPE_NAME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="waterNum != null">
+        WATER_NUM,
+      </if>
+      <if test="arrival != null">
+        ARRIVAL,
+      </if>
+      <if test="station != null">
+        STATION,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="sourceArea != null">
+        SOURCE_AREA,
+      </if>
+      <if test="voucherIdentity != null">
+        VOUCHER_IDENTITY,
+      </if>
+      <if test="voucherItem != null">
+        VOUCHER_ITEM,
+      </if>
+      <if test="businessGroup != null">
+        BUSINESS_GROUP,
+      </if>
+      <if test="tempConveyance != null">
+        TEMP_CONVEYANCE,
+      </if>
+      <if test="conveyanceType != null">
+        CONVEYANCE_TYPE,
+      </if>
+      <if test="resourceSystem != null">
+        RESOURCE_SYSTEM,
+      </if>
+      <if test="groupPackageAmount != null">
+        GROUP_PACKAGE_AMOUNT,
+      </if>
+      <if test="groupPackageUnit != null">
+        GROUP_PACKAGE_UNIT,
+      </if>
+      <if test="packageAmount != null">
+        PACKAGE_AMOUNT,
+      </if>
+      <if test="packageUnit != null">
+        PACKAGE_UNIT,
+      </if>
+      <if test="theoryAmount != null">
+        THEORY_AMOUNT,
+      </if>
+      <if test="measureBatch != null">
+        MEASURE_BATCH,
+      </if>
+      <if test="measureBatchCount != null">
+        MEASURE_BATCH_COUNT,
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE,
+      </if>
+      <if test="senderRemark != null">
+        SENDER_REMARK,
+      </if>
+      <if test="receiverType != null">
+        RECEIVER_TYPE,
+      </if>
+      <if test="receiverRemark != null">
+        RECEIVER_REMARK,
+      </if>
+      <if test="amountUnit != null">
+        AMOUNT_UNIT,
+      </if>
+      <if test="measureObjectType != null">
+        MEASURE_OBJECT_TYPE,
+      </if>
+      <if test="measureTaskNum != null">
+        MEASURE_TASK_NUM,
+      </if>
+      <if test="billType != null">
+        BILL_TYPE,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="dataSource != null">
+        DATA_SOURCE,
+      </if>
+      <if test="note != null">
+        NOTE,
+      </if>
+      <if test="isPreSacale != null">
+        IS_PRE_SACALE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="actualNo != null">
+        #{actualNo,jdbcType=VARCHAR},
+      </if>
+      <if test="predictionNo != null">
+        #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeNo != null">
+        #{noticeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayCarriageNo != null">
+        #{railwayCarriageNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="contractNo != null">
+        #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="batchNo != null">
+        #{batchNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        #{receivingUintName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialNo != null">
+        #{materialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="specNo != null">
+        #{specNo,jdbcType=VARCHAR},
+      </if>
+      <if test="specName != null">
+        #{specName,jdbcType=VARCHAR},
+      </if>
+      <if test="loadPointNo != null">
+        #{loadPointNo,jdbcType=VARCHAR},
+      </if>
+      <if test="loadPointName != null">
+        #{loadPointName,jdbcType=VARCHAR},
+      </if>
+      <if test="sampleVoucher != null">
+        #{sampleVoucher,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierUnitNo != null">
+        #{carrierUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierUnitName != null">
+        #{carrierUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeNo != null">
+        #{meterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeName != null">
+        #{meterTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterProcessNo != null">
+        #{meterProcessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterProcessEditionNo != null">
+        #{meterProcessEditionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirst1No != null">
+        #{actualFirst1No,jdbcType=VARCHAR},
+      </if>
+      <if test="grossWeight != null">
+        #{grossWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="grossManNo != null">
+        #{grossManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="grossManName != null">
+        #{grossManName,jdbcType=VARCHAR},
+      </if>
+      <if test="grossTime != null">
+        #{grossTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="baseSpot1No != null">
+        #{baseSpot1No,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpot1Name != null">
+        #{baseSpot1Name,jdbcType=VARCHAR},
+      </if>
+      <if test="grossClass != null">
+        #{grossClass,jdbcType=VARCHAR},
+      </if>
+      <if test="grossGroup != null">
+        #{grossGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="grossMode != null">
+        #{grossMode,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirst2No != null">
+        #{actualFirst2No,jdbcType=VARCHAR},
+      </if>
+      <if test="tareWeight != null">
+        #{tareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="tareManNo != null">
+        #{tareManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="tareManName != null">
+        #{tareManName,jdbcType=VARCHAR},
+      </if>
+      <if test="tareTime != null">
+        #{tareTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="baseSpot2No != null">
+        #{baseSpot2No,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpot2Name != null">
+        #{baseSpot2Name,jdbcType=VARCHAR},
+      </if>
+      <if test="tareClass != null">
+        #{tareClass,jdbcType=VARCHAR},
+      </if>
+      <if test="tareGroup != null">
+        #{tareGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="tareMode != null">
+        #{tareMode,jdbcType=VARCHAR},
+      </if>
+      <if test="netWeight != null">
+        #{netWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="netManNo != null">
+        #{netManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="netManName != null">
+        #{netManName,jdbcType=VARCHAR},
+      </if>
+      <if test="netTime != null">
+        #{netTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="netSpot3No != null">
+        #{netSpot3No,jdbcType=VARCHAR},
+      </if>
+      <if test="netSpot3Name != null">
+        #{netSpot3Name,jdbcType=VARCHAR},
+      </if>
+      <if test="netClass != null">
+        #{netClass,jdbcType=VARCHAR},
+      </if>
+      <if test="netGroup != null">
+        #{netGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="netMode != null">
+        #{netMode,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadFlag != null">
+        #{uploadFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="checkManNo != null">
+        #{checkManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="checkManName != null">
+        #{checkManName,jdbcType=VARCHAR},
+      </if>
+      <if test="checkTime != null">
+        #{checkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadManNo != null">
+        #{uploadManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadManName != null">
+        #{uploadManName,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadTime != null">
+        #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sampleNo != null">
+        #{sampleNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayTypeNo != null">
+        #{railwayTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayTypeName != null">
+        #{railwayTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="waterNum != null">
+        #{waterNum,jdbcType=DECIMAL},
+      </if>
+      <if test="arrival != null">
+        #{arrival,jdbcType=VARCHAR},
+      </if>
+      <if test="station != null">
+        #{station,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceArea != null">
+        #{sourceArea,jdbcType=VARCHAR},
+      </if>
+      <if test="voucherIdentity != null">
+        #{voucherIdentity,jdbcType=VARCHAR},
+      </if>
+      <if test="voucherItem != null">
+        #{voucherItem,jdbcType=VARCHAR},
+      </if>
+      <if test="businessGroup != null">
+        #{businessGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="tempConveyance != null">
+        #{tempConveyance,jdbcType=VARCHAR},
+      </if>
+      <if test="conveyanceType != null">
+        #{conveyanceType,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceSystem != null">
+        #{resourceSystem,jdbcType=VARCHAR},
+      </if>
+      <if test="groupPackageAmount != null">
+        #{groupPackageAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="groupPackageUnit != null">
+        #{groupPackageUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="packageAmount != null">
+        #{packageAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="packageUnit != null">
+        #{packageUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="theoryAmount != null">
+        #{theoryAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="measureBatch != null">
+        #{measureBatch,jdbcType=VARCHAR},
+      </if>
+      <if test="measureBatchCount != null">
+        #{measureBatchCount,jdbcType=DECIMAL},
+      </if>
+      <if test="senderType != null">
+        #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="senderRemark != null">
+        #{senderRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverType != null">
+        #{receiverType,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverRemark != null">
+        #{receiverRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="amountUnit != null">
+        #{amountUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="measureObjectType != null">
+        #{measureObjectType,jdbcType=VARCHAR},
+      </if>
+      <if test="measureTaskNum != null">
+        #{measureTaskNum,jdbcType=VARCHAR},
+      </if>
+      <if test="billType != null">
+        #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dataSource != null">
+        #{dataSource,jdbcType=VARCHAR},
+      </if>
+      <if test="note != null">
+        #{note,jdbcType=VARCHAR},
+      </if>
+      <if test="isPreSacale != null">
+        #{isPreSacale,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond">
+    update METER_WORK_MEASURING_INSTRUMENT_SECOND
+    set PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
+      RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      RAILWAY_CARRIAGE_NO = #{railwayCarriageNo,jdbcType=VARCHAR},
+      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
+      BATCH_NO = #{batchNo,jdbcType=VARCHAR},
+      CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
+      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      SPEC_NO = #{specNo,jdbcType=VARCHAR},
+      SPEC_NAME = #{specName,jdbcType=VARCHAR},
+      LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
+      LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
+      SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
+      CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
+      CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
+      METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
+      METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
+      METER_PROCESS_NO = #{meterProcessNo,jdbcType=VARCHAR},
+      METER_PROCESS_EDITION_NO = #{meterProcessEditionNo,jdbcType=VARCHAR},
+      ACTUAL_FIRST1_NO = #{actualFirst1No,jdbcType=VARCHAR},
+      GROSS_WEIGHT = #{grossWeight,jdbcType=DECIMAL},
+      GROSS_MAN_NO = #{grossManNo,jdbcType=VARCHAR},
+      GROSS_MAN_NAME = #{grossManName,jdbcType=VARCHAR},
+      GROSS_TIME = #{grossTime,jdbcType=TIMESTAMP},
+      BASE_SPOT1_NO = #{baseSpot1No,jdbcType=VARCHAR},
+      BASE_SPOT1_NAME = #{baseSpot1Name,jdbcType=VARCHAR},
+      GROSS_CLASS = #{grossClass,jdbcType=VARCHAR},
+      GROSS_GROUP = #{grossGroup,jdbcType=VARCHAR},
+      GROSS_MODE = #{grossMode,jdbcType=VARCHAR},
+      ACTUAL_FIRST2_NO = #{actualFirst2No,jdbcType=VARCHAR},
+      TARE_WEIGHT = #{tareWeight,jdbcType=DECIMAL},
+      TARE_MAN_NO = #{tareManNo,jdbcType=VARCHAR},
+      TARE_MAN_NAME = #{tareManName,jdbcType=VARCHAR},
+      TARE_TIME = #{tareTime,jdbcType=TIMESTAMP},
+      BASE_SPOT2_NO = #{baseSpot2No,jdbcType=VARCHAR},
+      BASE_SPOT2_NAME = #{baseSpot2Name,jdbcType=VARCHAR},
+      TARE_CLASS = #{tareClass,jdbcType=VARCHAR},
+      TARE_GROUP = #{tareGroup,jdbcType=VARCHAR},
+      TARE_MODE = #{tareMode,jdbcType=VARCHAR},
+      NET_WEIGHT = #{netWeight,jdbcType=DECIMAL},
+      NET_MAN_NO = #{netManNo,jdbcType=VARCHAR},
+      NET_MAN_NAME = #{netManName,jdbcType=VARCHAR},
+      NET_TIME = #{netTime,jdbcType=TIMESTAMP},
+      NET_SPOT3_NO = #{netSpot3No,jdbcType=VARCHAR},
+      NET_SPOT3_NAME = #{netSpot3Name,jdbcType=VARCHAR},
+      NET_CLASS = #{netClass,jdbcType=VARCHAR},
+      NET_GROUP = #{netGroup,jdbcType=VARCHAR},
+      NET_MODE = #{netMode,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      UPLOAD_FLAG = #{uploadFlag,jdbcType=VARCHAR},
+      CHECK_MAN_NO = #{checkManNo,jdbcType=VARCHAR},
+      CHECK_MAN_NAME = #{checkManName,jdbcType=VARCHAR},
+      CHECK_TIME = #{checkTime,jdbcType=TIMESTAMP},
+      UPLOAD_MAN_NO = #{uploadManNo,jdbcType=VARCHAR},
+      UPLOAD_MAN_NAME = #{uploadManName,jdbcType=VARCHAR},
+      UPLOAD_TIME = #{uploadTime,jdbcType=TIMESTAMP},
+      SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
+      RAILWAY_TYPE_NO = #{railwayTypeNo,jdbcType=VARCHAR},
+      RAILWAY_TYPE_NAME = #{railwayTypeName,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      WATER_NUM = #{waterNum,jdbcType=DECIMAL},
+      ARRIVAL = #{arrival,jdbcType=VARCHAR},
+      STATION = #{station,jdbcType=VARCHAR},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      SOURCE_AREA = #{sourceArea,jdbcType=VARCHAR},
+      VOUCHER_IDENTITY = #{voucherIdentity,jdbcType=VARCHAR},
+      VOUCHER_ITEM = #{voucherItem,jdbcType=VARCHAR},
+      BUSINESS_GROUP = #{businessGroup,jdbcType=VARCHAR},
+      TEMP_CONVEYANCE = #{tempConveyance,jdbcType=VARCHAR},
+      CONVEYANCE_TYPE = #{conveyanceType,jdbcType=VARCHAR},
+      RESOURCE_SYSTEM = #{resourceSystem,jdbcType=VARCHAR},
+      GROUP_PACKAGE_AMOUNT = #{groupPackageAmount,jdbcType=DECIMAL},
+      GROUP_PACKAGE_UNIT = #{groupPackageUnit,jdbcType=VARCHAR},
+      PACKAGE_AMOUNT = #{packageAmount,jdbcType=DECIMAL},
+      PACKAGE_UNIT = #{packageUnit,jdbcType=VARCHAR},
+      THEORY_AMOUNT = #{theoryAmount,jdbcType=DECIMAL},
+      MEASURE_BATCH = #{measureBatch,jdbcType=VARCHAR},
+      MEASURE_BATCH_COUNT = #{measureBatchCount,jdbcType=DECIMAL},
+      SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      SENDER_REMARK = #{senderRemark,jdbcType=VARCHAR},
+      RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+      RECEIVER_REMARK = #{receiverRemark,jdbcType=VARCHAR},
+      AMOUNT_UNIT = #{amountUnit,jdbcType=VARCHAR},
+      MEASURE_OBJECT_TYPE = #{measureObjectType,jdbcType=VARCHAR},
+      MEASURE_TASK_NUM = #{measureTaskNum,jdbcType=VARCHAR},
+      BILL_TYPE = #{billType,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      DATA_SOURCE = #{dataSource,jdbcType=VARCHAR},
+      NOTE = #{note,jdbcType=VARCHAR},
+      IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR}
+    where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond">
+    update METER_WORK_MEASURING_INSTRUMENT_SECOND
+    <set>
+      <if test="predictionNo != null">
+        PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeNo != null">
+        NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayCarriageNo != null">
+        RAILWAY_CARRIAGE_NO = #{railwayCarriageNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="contractNo != null">
+        CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="batchNo != null">
+        BATCH_NO = #{batchNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialNo != null">
+        MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="specNo != null">
+        SPEC_NO = #{specNo,jdbcType=VARCHAR},
+      </if>
+      <if test="specName != null">
+        SPEC_NAME = #{specName,jdbcType=VARCHAR},
+      </if>
+      <if test="loadPointNo != null">
+        LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
+      </if>
+      <if test="loadPointName != null">
+        LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
+      </if>
+      <if test="sampleVoucher != null">
+        SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierUnitNo != null">
+        CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carrierUnitName != null">
+        CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeNo != null">
+        METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeName != null">
+        METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterProcessNo != null">
+        METER_PROCESS_NO = #{meterProcessNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterProcessEditionNo != null">
+        METER_PROCESS_EDITION_NO = #{meterProcessEditionNo,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirst1No != null">
+        ACTUAL_FIRST1_NO = #{actualFirst1No,jdbcType=VARCHAR},
+      </if>
+      <if test="grossWeight != null">
+        GROSS_WEIGHT = #{grossWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="grossManNo != null">
+        GROSS_MAN_NO = #{grossManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="grossManName != null">
+        GROSS_MAN_NAME = #{grossManName,jdbcType=VARCHAR},
+      </if>
+      <if test="grossTime != null">
+        GROSS_TIME = #{grossTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="baseSpot1No != null">
+        BASE_SPOT1_NO = #{baseSpot1No,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpot1Name != null">
+        BASE_SPOT1_NAME = #{baseSpot1Name,jdbcType=VARCHAR},
+      </if>
+      <if test="grossClass != null">
+        GROSS_CLASS = #{grossClass,jdbcType=VARCHAR},
+      </if>
+      <if test="grossGroup != null">
+        GROSS_GROUP = #{grossGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="grossMode != null">
+        GROSS_MODE = #{grossMode,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirst2No != null">
+        ACTUAL_FIRST2_NO = #{actualFirst2No,jdbcType=VARCHAR},
+      </if>
+      <if test="tareWeight != null">
+        TARE_WEIGHT = #{tareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="tareManNo != null">
+        TARE_MAN_NO = #{tareManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="tareManName != null">
+        TARE_MAN_NAME = #{tareManName,jdbcType=VARCHAR},
+      </if>
+      <if test="tareTime != null">
+        TARE_TIME = #{tareTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="baseSpot2No != null">
+        BASE_SPOT2_NO = #{baseSpot2No,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpot2Name != null">
+        BASE_SPOT2_NAME = #{baseSpot2Name,jdbcType=VARCHAR},
+      </if>
+      <if test="tareClass != null">
+        TARE_CLASS = #{tareClass,jdbcType=VARCHAR},
+      </if>
+      <if test="tareGroup != null">
+        TARE_GROUP = #{tareGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="tareMode != null">
+        TARE_MODE = #{tareMode,jdbcType=VARCHAR},
+      </if>
+      <if test="netWeight != null">
+        NET_WEIGHT = #{netWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="netManNo != null">
+        NET_MAN_NO = #{netManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="netManName != null">
+        NET_MAN_NAME = #{netManName,jdbcType=VARCHAR},
+      </if>
+      <if test="netTime != null">
+        NET_TIME = #{netTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="netSpot3No != null">
+        NET_SPOT3_NO = #{netSpot3No,jdbcType=VARCHAR},
+      </if>
+      <if test="netSpot3Name != null">
+        NET_SPOT3_NAME = #{netSpot3Name,jdbcType=VARCHAR},
+      </if>
+      <if test="netClass != null">
+        NET_CLASS = #{netClass,jdbcType=VARCHAR},
+      </if>
+      <if test="netGroup != null">
+        NET_GROUP = #{netGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="netMode != null">
+        NET_MODE = #{netMode,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadFlag != null">
+        UPLOAD_FLAG = #{uploadFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="checkManNo != null">
+        CHECK_MAN_NO = #{checkManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="checkManName != null">
+        CHECK_MAN_NAME = #{checkManName,jdbcType=VARCHAR},
+      </if>
+      <if test="checkTime != null">
+        CHECK_TIME = #{checkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadManNo != null">
+        UPLOAD_MAN_NO = #{uploadManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadManName != null">
+        UPLOAD_MAN_NAME = #{uploadManName,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadTime != null">
+        UPLOAD_TIME = #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sampleNo != null">
+        SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayTypeNo != null">
+        RAILWAY_TYPE_NO = #{railwayTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayTypeName != null">
+        RAILWAY_TYPE_NAME = #{railwayTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="waterNum != null">
+        WATER_NUM = #{waterNum,jdbcType=DECIMAL},
+      </if>
+      <if test="arrival != null">
+        ARRIVAL = #{arrival,jdbcType=VARCHAR},
+      </if>
+      <if test="station != null">
+        STATION = #{station,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceArea != null">
+        SOURCE_AREA = #{sourceArea,jdbcType=VARCHAR},
+      </if>
+      <if test="voucherIdentity != null">
+        VOUCHER_IDENTITY = #{voucherIdentity,jdbcType=VARCHAR},
+      </if>
+      <if test="voucherItem != null">
+        VOUCHER_ITEM = #{voucherItem,jdbcType=VARCHAR},
+      </if>
+      <if test="businessGroup != null">
+        BUSINESS_GROUP = #{businessGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="tempConveyance != null">
+        TEMP_CONVEYANCE = #{tempConveyance,jdbcType=VARCHAR},
+      </if>
+      <if test="conveyanceType != null">
+        CONVEYANCE_TYPE = #{conveyanceType,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceSystem != null">
+        RESOURCE_SYSTEM = #{resourceSystem,jdbcType=VARCHAR},
+      </if>
+      <if test="groupPackageAmount != null">
+        GROUP_PACKAGE_AMOUNT = #{groupPackageAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="groupPackageUnit != null">
+        GROUP_PACKAGE_UNIT = #{groupPackageUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="packageAmount != null">
+        PACKAGE_AMOUNT = #{packageAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="packageUnit != null">
+        PACKAGE_UNIT = #{packageUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="theoryAmount != null">
+        THEORY_AMOUNT = #{theoryAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="measureBatch != null">
+        MEASURE_BATCH = #{measureBatch,jdbcType=VARCHAR},
+      </if>
+      <if test="measureBatchCount != null">
+        MEASURE_BATCH_COUNT = #{measureBatchCount,jdbcType=DECIMAL},
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="senderRemark != null">
+        SENDER_REMARK = #{senderRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverType != null">
+        RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverRemark != null">
+        RECEIVER_REMARK = #{receiverRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="amountUnit != null">
+        AMOUNT_UNIT = #{amountUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="measureObjectType != null">
+        MEASURE_OBJECT_TYPE = #{measureObjectType,jdbcType=VARCHAR},
+      </if>
+      <if test="measureTaskNum != null">
+        MEASURE_TASK_NUM = #{measureTaskNum,jdbcType=VARCHAR},
+      </if>
+      <if test="billType != null">
+        BILL_TYPE = #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dataSource != null">
+        DATA_SOURCE = #{dataSource,jdbcType=VARCHAR},
+      </if>
+      <if test="note != null">
+        NOTE = #{note,jdbcType=VARCHAR},
+      </if>
+      <if test="isPreSacale != null">
+        IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_MEASURING_INSTRUMENT_SECOND 
+      (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)
+    ( <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} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_MEASURING_INSTRUMENT_SECOND
+     set
+       ACTUAL_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualNo,jdbcType=VARCHAR}
+       </foreach>
+       ,PREDICTION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTICE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.noticeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_CARRIAGE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayCarriageNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,CONTRACT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.contractNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BATCH_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.batchNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CUSTOMER_SUPPLIER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CUSTOMER_SUPPLIER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.materialNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
+       </foreach>
+       ,SPEC_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.specNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SPEC_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.specName,jdbcType=VARCHAR}
+       </foreach>
+       ,LOAD_POINT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.loadPointNo,jdbcType=VARCHAR}
+       </foreach>
+       ,LOAD_POINT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.loadPointName,jdbcType=VARCHAR}
+       </foreach>
+       ,SAMPLE_VOUCHER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.sampleVoucher,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.carrierUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.carrierUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_PROCESS_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterProcessNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_PROCESS_EDITION_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterProcessEditionNo,jdbcType=VARCHAR}
+       </foreach>
+       ,ACTUAL_FIRST1_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualFirst1No,jdbcType=VARCHAR}
+       </foreach>
+       ,GROSS_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,GROSS_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,GROSS_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossManName,jdbcType=VARCHAR}
+       </foreach>
+       ,GROSS_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,BASE_SPOT1_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot1No,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT1_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot1Name,jdbcType=VARCHAR}
+       </foreach>
+       ,GROSS_CLASS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossClass,jdbcType=VARCHAR}
+       </foreach>
+       ,GROSS_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,GROSS_MODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossMode,jdbcType=VARCHAR}
+       </foreach>
+       ,ACTUAL_FIRST2_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualFirst2No,jdbcType=VARCHAR}
+       </foreach>
+       ,TARE_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,TARE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,TARE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareManName,jdbcType=VARCHAR}
+       </foreach>
+       ,TARE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,BASE_SPOT2_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot2No,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT2_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot2Name,jdbcType=VARCHAR}
+       </foreach>
+       ,TARE_CLASS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareClass,jdbcType=VARCHAR}
+       </foreach>
+       ,TARE_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,TARE_MODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareMode,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,NET_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netManName,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,NET_SPOT3_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netSpot3No,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_SPOT3_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netSpot3Name,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_CLASS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netClass,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,NET_MODE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.netMode,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,UPLOAD_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPLOAD_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPLOAD_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPLOAD_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,SAMPLE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.sampleNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,WATER_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.waterNum,jdbcType=DECIMAL}
+       </foreach>
+       ,ARRIVAL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.arrival,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.station,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,SOURCE_AREA=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.sourceArea,jdbcType=VARCHAR}
+       </foreach>
+       ,VOUCHER_IDENTITY=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.voucherIdentity,jdbcType=VARCHAR}
+       </foreach>
+       ,VOUCHER_ITEM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.voucherItem,jdbcType=VARCHAR}
+       </foreach>
+       ,BUSINESS_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.businessGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,TEMP_CONVEYANCE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.tempConveyance,jdbcType=VARCHAR}
+       </foreach>
+       ,CONVEYANCE_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.conveyanceType,jdbcType=VARCHAR}
+       </foreach>
+       ,RESOURCE_SYSTEM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.resourceSystem,jdbcType=VARCHAR}
+       </foreach>
+       ,GROUP_PACKAGE_AMOUNT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.groupPackageAmount,jdbcType=DECIMAL}
+       </foreach>
+       ,GROUP_PACKAGE_UNIT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.groupPackageUnit,jdbcType=VARCHAR}
+       </foreach>
+       ,PACKAGE_AMOUNT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.packageAmount,jdbcType=DECIMAL}
+       </foreach>
+       ,PACKAGE_UNIT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.packageUnit,jdbcType=VARCHAR}
+       </foreach>
+       ,THEORY_AMOUNT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.theoryAmount,jdbcType=DECIMAL}
+       </foreach>
+       ,MEASURE_BATCH=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.measureBatch,jdbcType=VARCHAR}
+       </foreach>
+       ,MEASURE_BATCH_COUNT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.measureBatchCount,jdbcType=DECIMAL}
+       </foreach>
+       ,SENDER_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.senderRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.receiverType,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.receiverRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,AMOUNT_UNIT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.amountUnit,jdbcType=VARCHAR}
+       </foreach>
+       ,MEASURE_OBJECT_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.measureObjectType,jdbcType=VARCHAR}
+       </foreach>
+       ,MEASURE_TASK_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.measureTaskNum,jdbcType=VARCHAR}
+       </foreach>
+       ,BILL_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.billType,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DATA_SOURCE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.dataSource,jdbcType=VARCHAR}
+       </foreach>
+       ,NOTE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.note,jdbcType=VARCHAR}
+       </foreach>
+       ,IS_PRE_SACALE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.isPreSacale,jdbcType=VARCHAR}
+       </foreach>
+     where ACTUAL_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.actualNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_MEASURING_INSTRUMENT_SECOND
+    where ACTUAL_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_NO, LENGTH(ACTUAL_NO) - 3))),0) + 1,4,'0') ACTUAL_NO
+    FROM METER_WORK_MEASURING_INSTRUMENT_SECOND where instr(ACTUAL_NO,#{afl,jdbcType=VARCHAR})>0
+  </select>
+  <select id="likeDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1= 1
+    <if test="actualNo != null and actualNo != ''">
+      and ACTUAL_NO like '%${actualNo}%'
+    </if>
+    <if test="actualNo != null and actualNo != ''">
+      and ACTUAL_NO LIKE '%${actualNo}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and PREDICTION_NO LIKE '%${predictionNo}%'
+    </if>
+    <if test="noticeNo != null and noticeNo != ''">
+      and NOTICE_NO LIKE '%${noticeNo}%'
+    </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and RAILWAY_NO LIKE '%${railwayNo}%'
+    </if>
+    <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+      and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
+    </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="contractNo != null and contractNo != ''">
+      and CONTRACT_NO LIKE '%${contractNo}%'
+    </if>
+    <if test="batchNo != null and batchNo != ''">
+      and BATCH_NO LIKE '%${batchNo}%'
+    </if>
+    <if test="customerSupplierNo != null and customerSupplierNo != ''">
+      and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+    </if>
+    <if test="customerSupplierName != null and customerSupplierName != ''">
+      and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+    </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="materialNo != null and materialNo != ''">
+      and MATERIAL_NO LIKE '%${materialNo}%'
+    </if>
+    <if test="materialName != null and materialName != ''">
+      and MATERIAL_NAME LIKE '%${materialName}%'
+    </if>
+    <if test="updateManNo != null and updateManNo != ''">
+      and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+    </if>
+    <if test="updateManName != null and updateManName != ''">
+      and UPDATE_MAN_NAME LIKE '%${updateManName}'
+    </if>
+    <if test="createManName != null and createManName != ''">
+      and CREATE_MAN_NAME LIKE '%${createManName}%'
+    </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>
+    order by net_time desc
+  </select>
+
+  <select id="getCreateManNo" parameterType="java.util.HashMap" resultType="String">
+    select distinct create_man_name
+        from METER_WORK_MEASURING_INSTRUMENT_SECOND
+    group by create_man_name
+  </select>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/model/MeterWorkMeasuringInstrumentSecond.java

@@ -0,0 +1,1564 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterWorkMeasuringInstrumentSecond implements IBasePO<String> {
+    /**
+     * 结净编号（YYYYMMDD+4位流水）(ACTUAL_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="结净编号（YYYYMMDD+4位流水）",required=true)
+    private String actualNo;
+
+    /**
+     * 预报编号(PREDICTION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="预报编号",required=false)
+    private String predictionNo;
+
+    /**
+     * 通知单号(NOTICE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="通知单号",required=false)
+    private String noticeNo;
+
+    /**
+     * 火车车号(RAILWAY_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="火车车号",required=false)
+    private String railwayNo;
+
+    /**
+     * 车厢序号(RAILWAY_CARRIAGE_NO,VARCHAR,2)
+     */
+    @ApiModelProperty(value="车厢序号",required=false)
+    private String railwayCarriageNo;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String matterName;
+
+    /**
+     * 合同号(CONTRACT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="合同号",required=false)
+    private String contractNo;
+
+    /**
+     * 批次号(BATCH_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="批次号",required=false)
+    private String batchNo;
+
+    /**
+     * 供应商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="供应商编号",required=false)
+    private String customerSupplierNo;
+
+    /**
+     * 供应商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="供应商名称",required=false)
+    private String customerSupplierName;
+
+    /**
+     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货单位编号",required=false)
+    private String forwardingUnitNo;
+
+    /**
+     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货单位名称",required=false)
+    private String forwardingUnitName;
+
+    /**
+     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货单位编号",required=false)
+    private String receivingUintNo;
+
+    /**
+     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货单位名称",required=false)
+    private String receivingUintName;
+
+    /**
+     * 材质编号(MATERIAL_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="材质编号",required=false)
+    private String materialNo;
+
+    /**
+     * 材质名称(MATERIAL_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="材质名称",required=false)
+    private String materialName;
+
+    /**
+     * 规格编号(SPEC_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="规格编号",required=false)
+    private String specNo;
+
+    /**
+     * 规格名称(SPEC_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="规格名称",required=false)
+    private String specName;
+
+    /**
+     * 卸货地点编号(LOAD_POINT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="卸货地点编号",required=false)
+    private String loadPointNo;
+
+    /**
+     * 卸货地点名称(LOAD_POINT_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="卸货地点名称",required=false)
+    private String loadPointName;
+
+    /**
+     * 取样凭证(SAMPLE_VOUCHER,VARCHAR,40)
+     */
+    @ApiModelProperty(value="取样凭证",required=false)
+    private String sampleVoucher;
+
+    /**
+     * 承运单位编号(CARRIER_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="承运单位编号",required=false)
+    private String carrierUnitNo;
+
+    /**
+     * 承运单位名称(CARRIER_UNIT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="承运单位名称",required=false)
+    private String carrierUnitName;
+
+    /**
+     * 计量类型编号（业务类型）(METER_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量类型编号（业务类型）",required=false)
+    private String meterTypeNo;
+
+    /**
+     * 计量类型名称（业务类型）(METER_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量类型名称（业务类型）",required=false)
+    private String meterTypeName;
+
+    /**
+     * 计量流程编号(METER_PROCESS_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量流程编号",required=false)
+    private String meterProcessNo;
+
+    /**
+     * 计量流程版本号(METER_PROCESS_EDITION_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量流程版本号",required=false)
+    private String meterProcessEditionNo;
+
+    /**
+     * 毛重计量作业编号(ACTUAL_FIRST1_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="毛重计量作业编号",required=false)
+    private String actualFirst1No;
+
+    /**
+     * 毛重(GROSS_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="毛重",required=false)
+    private BigDecimal grossWeight;
+
+    /**
+     * 毛重计量员编号(GROSS_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="毛重计量员编号",required=false)
+    private String grossManNo;
+
+    /**
+     * 毛重计量员姓名(GROSS_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="毛重计量员姓名",required=false)
+    private String grossManName;
+
+    /**
+     * 毛重计量时间（YYYY-MM-DD HH:mm:SS）(GROSS_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="毛重计量时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date grossTime;
+
+    /**
+     * 毛重计量点编号(BASE_SPOT1_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="毛重计量点编号",required=false)
+    private String baseSpot1No;
+
+    /**
+     * 毛重计量点名称(BASE_SPOT1_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="毛重计量点名称",required=false)
+    private String baseSpot1Name;
+
+    /**
+     * 毛重班次(GROSS_CLASS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="毛重班次",required=false)
+    private String grossClass;
+
+    /**
+     * 毛重班组(GROSS_GROUP,VARCHAR,20)
+     */
+    @ApiModelProperty(value="毛重班组",required=false)
+    private String grossGroup;
+
+    /**
+     * 毛重计量方式（1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配）(GROSS_MODE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="毛重计量方式（1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配）",required=false)
+    private String grossMode;
+
+    /**
+     * 皮重计量作业编号(ACTUAL_FIRST2_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重计量作业编号",required=false)
+    private String actualFirst2No;
+
+    /**
+     * 皮重(TARE_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="皮重",required=false)
+    private BigDecimal tareWeight;
+
+    /**
+     * 皮重计量员编号(TARE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重计量员编号",required=false)
+    private String tareManNo;
+
+    /**
+     * 皮重计量员姓名(TARE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="皮重计量员姓名",required=false)
+    private String tareManName;
+
+    /**
+     * 皮重计量时间（YYYY-MM-DD HH:mm:SS）(TARE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="皮重计量时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date tareTime;
+
+    /**
+     * 皮重计量点编号(BASE_SPOT2_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重计量点编号",required=false)
+    private String baseSpot2No;
+
+    /**
+     * 皮重计量点名称(BASE_SPOT2_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="皮重计量点名称",required=false)
+    private String baseSpot2Name;
+
+    /**
+     * 皮重班次(TARE_CLASS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重班次",required=false)
+    private String tareClass;
+
+    /**
+     * 皮重班组(TARE_GROUP,VARCHAR,20)
+     */
+    @ApiModelProperty(value="皮重班组",required=false)
+    private String tareGroup;
+
+    /**
+     * 皮重计量方式（1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配）(TARE_MODE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="皮重计量方式（1：远程计量；2：智能计量；3：手工录入；4：放行智能计量；5：滞后匹配）",required=false)
+    private String tareMode;
+
+    /**
+     * 净重(NET_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="净重",required=false)
+    private BigDecimal netWeight;
+
+    /**
+     * 净重计量员编号(NET_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="净重计量员编号",required=false)
+    private String netManNo;
+
+    /**
+     * 净重计量员姓名(NET_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="净重计量员姓名",required=false)
+    private String netManName;
+
+    /**
+     * 净重计量时间（YYYY-MM-DD HH:mm:SS）(NET_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="净重计量时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date netTime;
+
+    /**
+     * 净重计量点编号(NET_SPOT3_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="净重计量点编号",required=false)
+    private String netSpot3No;
+
+    /**
+     * 净重计量点名称(NET_SPOT3_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="净重计量点名称",required=false)
+    private String netSpot3Name;
+
+    /**
+     * 净重班次(NET_CLASS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="净重班次",required=false)
+    private String netClass;
+
+    /**
+     * 净重班组(NET_GROUP,VARCHAR,20)
+     */
+    @ApiModelProperty(value="净重班组",required=false)
+    private String netGroup;
+
+    /**
+     * 结净方式（1：正常结净；2：匹配结净）(NET_MODE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净）",required=false)
+    private String netMode;
+
+    /**
+     * 状态（0=作废，1=有效-未发布，2=有效-已发布，3=未匹配委托 ）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0=作废，1=有效-未发布，2=有效-已发布，3=未匹配委托 ）",required=false)
+    private String valueFlag;
+
+    /**
+     * 上传状态（0=待审核；1：待上传；2=已上传 ）(UPLOAD_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="上传状态（0=待审核；1：待上传；2=已上传 ）",required=false)
+    private String uploadFlag;
+
+    /**
+     * 审核人编号(CHECK_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="审核人编号",required=false)
+    private String checkManNo;
+
+    /**
+     * 审核人姓名(CHECK_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="审核人姓名",required=false)
+    private String checkManName;
+
+    /**
+     * 审核时间（YYYY-MM-DD HH:mm:SS）(CHECK_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="审核时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date checkTime;
+
+    /**
+     * 上传人编号(UPLOAD_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="上传人编号",required=false)
+    private String uploadManNo;
+
+    /**
+     * 上传人姓名(UPLOAD_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="上传人姓名",required=false)
+    private String uploadManName;
+
+    /**
+     * 上传时间（YYYY-MM-DD HH:mm:SS）(UPLOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="上传时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date uploadTime;
+
+    /**
+     * 取样编号(SAMPLE_NO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="取样编号",required=false)
+    private String sampleNo;
+
+    /**
+     * 轨道衡类型编号(RAILWAY_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="轨道衡类型编号",required=false)
+    private String railwayTypeNo;
+
+    /**
+     * 轨道衡类型名称(RAILWAY_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="轨道衡类型名称",required=false)
+    private String railwayTypeName;
+
+    /**
+     * 备注(MEMO,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 水分百分比(WATER_NUM,DECIMAL,10)
+     */
+    @ApiModelProperty(value="水分百分比",required=false)
+    private BigDecimal waterNum;
+
+    /**
+     * 到站(ARRIVAL,VARCHAR,40)
+     */
+    @ApiModelProperty(value="到站",required=false)
+    private String arrival;
+
+    /**
+     * 发站(STATION,VARCHAR,40)
+     */
+    @ApiModelProperty(value="发站",required=false)
+    private String station;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 原产地(SOURCE_AREA,VARCHAR,50)
+     */
+    @ApiModelProperty(value="原产地",required=false)
+    private String sourceArea;
+
+    /**
+     * 主凭据号(VOUCHER_IDENTITY,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据号",required=false)
+    private String voucherIdentity;
+
+    /**
+     * 主凭据行(VOUCHER_ITEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主凭据行",required=false)
+    private String voucherItem;
+
+    /**
+     * 主业务类型组(BUSINESS_GROUP,VARCHAR,30)
+     */
+    @ApiModelProperty(value="主业务类型组",required=false)
+    private String businessGroup;
+
+    /**
+     * 临时牌号(TEMP_CONVEYANCE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="临时牌号",required=false)
+    private String tempConveyance;
+
+    /**
+     * 车型(CONVEYANCE_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String conveyanceType;
+
+    /**
+     * 委托源系统(RESOURCE_SYSTEM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="委托源系统",required=false)
+    private String resourceSystem;
+
+    /**
+     * 分组计件件量(GROUP_PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="分组计件件量",required=false)
+    private Long groupPackageAmount;
+
+    /**
+     * 分组计量单位(GROUP_PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="分组计量单位",required=false)
+    private String groupPackageUnit;
+
+    /**
+     * 标准件数(PACKAGE_AMOUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="标准件数",required=false)
+    private Long packageAmount;
+
+    /**
+     * 计件单位(PACKAGE_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计件单位",required=false)
+    private String packageUnit;
+
+    /**
+     * 理论量(THEORY_AMOUNT,DECIMAL,16)
+     */
+    @ApiModelProperty(value="理论量",required=false)
+    private BigDecimal theoryAmount;
+
+    /**
+     * 计量组批号(MEASURE_BATCH,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量组批号",required=false)
+    private String measureBatch;
+
+    /**
+     * 计量组批车数(MEASURE_BATCH_COUNT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="计量组批车数",required=false)
+    private Long measureBatchCount;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="发货点类型",required=false)
+    private String senderType;
+
+    /**
+     * 发货点备注(SENDER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货点备注",required=false)
+    private String senderRemark;
+
+    /**
+     * 收货点类型(RECEIVER_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String receiverType;
+
+    /**
+     * 收货点备注(RECEIVER_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货点备注",required=false)
+    private String receiverRemark;
+
+    /**
+     * 计量单位(AMOUNT_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量单位",required=false)
+    private String amountUnit;
+
+    /**
+     * 计量对象类型(MEASURE_OBJECT_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量对象类型",required=false)
+    private String measureObjectType;
+
+    /**
+     * 计量任务号(MEASURE_TASK_NUM,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量任务号",required=false)
+    private String measureTaskNum;
+
+    /**
+     * 票据类型(BILL_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="票据类型",required=false)
+    private String billType;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
+     */
+    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
+    private String dataSource;
+
+    /**
+     * 操作原因(NOTE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="操作原因",required=false)
+    private String note;
+
+    /**
+     * 是否匹配委托(0：未匹配,1：已匹配)(IS_PRE_SACALE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否匹配委托(0：未匹配,1：已匹配)",required=false)
+    private String isPreSacale;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.actualNo;
+    }
+
+    @Override
+    public void setId(String actualNo) {
+        this.actualNo = actualNo == null ? null : actualNo.trim();
+    }
+
+    public String getActualNo() {
+        return actualNo;
+    }
+
+    public void setActualNo(String actualNo) {
+        this.actualNo = actualNo == null ? null : actualNo.trim();
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
+    }
+
+    public String getNoticeNo() {
+        return noticeNo;
+    }
+
+    public void setNoticeNo(String noticeNo) {
+        this.noticeNo = noticeNo == null ? null : noticeNo.trim();
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
+    }
+
+    public String getRailwayCarriageNo() {
+        return railwayCarriageNo;
+    }
+
+    public void setRailwayCarriageNo(String railwayCarriageNo) {
+        this.railwayCarriageNo = railwayCarriageNo == null ? null : railwayCarriageNo.trim();
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo == null ? null : matterNo.trim();
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName == null ? null : matterName.trim();
+    }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo == null ? null : contractNo.trim();
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo == null ? null : batchNo.trim();
+    }
+
+    public String getCustomerSupplierNo() {
+        return customerSupplierNo;
+    }
+
+    public void setCustomerSupplierNo(String customerSupplierNo) {
+        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
+    }
+
+    public String getCustomerSupplierName() {
+        return customerSupplierName;
+    }
+
+    public void setCustomerSupplierName(String customerSupplierName) {
+        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
+    }
+
+    public String getForwardingUnitNo() {
+        return forwardingUnitNo;
+    }
+
+    public void setForwardingUnitNo(String forwardingUnitNo) {
+        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
+    }
+
+    public String getReceivingUintNo() {
+        return receivingUintNo;
+    }
+
+    public void setReceivingUintNo(String receivingUintNo) {
+        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName == null ? null : receivingUintName.trim();
+    }
+
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo == null ? null : materialNo.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getSpecNo() {
+        return specNo;
+    }
+
+    public void setSpecNo(String specNo) {
+        this.specNo = specNo == null ? null : specNo.trim();
+    }
+
+    public String getSpecName() {
+        return specName;
+    }
+
+    public void setSpecName(String specName) {
+        this.specName = specName == null ? null : specName.trim();
+    }
+
+    public String getLoadPointNo() {
+        return loadPointNo;
+    }
+
+    public void setLoadPointNo(String loadPointNo) {
+        this.loadPointNo = loadPointNo == null ? null : loadPointNo.trim();
+    }
+
+    public String getLoadPointName() {
+        return loadPointName;
+    }
+
+    public void setLoadPointName(String loadPointName) {
+        this.loadPointName = loadPointName == null ? null : loadPointName.trim();
+    }
+
+    public String getSampleVoucher() {
+        return sampleVoucher;
+    }
+
+    public void setSampleVoucher(String sampleVoucher) {
+        this.sampleVoucher = sampleVoucher == null ? null : sampleVoucher.trim();
+    }
+
+    public String getCarrierUnitNo() {
+        return carrierUnitNo;
+    }
+
+    public void setCarrierUnitNo(String carrierUnitNo) {
+        this.carrierUnitNo = carrierUnitNo == null ? null : carrierUnitNo.trim();
+    }
+
+    public String getCarrierUnitName() {
+        return carrierUnitName;
+    }
+
+    public void setCarrierUnitName(String carrierUnitName) {
+        this.carrierUnitName = carrierUnitName == null ? null : carrierUnitName.trim();
+    }
+
+    public String getMeterTypeNo() {
+        return meterTypeNo;
+    }
+
+    public void setMeterTypeNo(String meterTypeNo) {
+        this.meterTypeNo = meterTypeNo == null ? null : meterTypeNo.trim();
+    }
+
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName == null ? null : meterTypeName.trim();
+    }
+
+    public String getMeterProcessNo() {
+        return meterProcessNo;
+    }
+
+    public void setMeterProcessNo(String meterProcessNo) {
+        this.meterProcessNo = meterProcessNo == null ? null : meterProcessNo.trim();
+    }
+
+    public String getMeterProcessEditionNo() {
+        return meterProcessEditionNo;
+    }
+
+    public void setMeterProcessEditionNo(String meterProcessEditionNo) {
+        this.meterProcessEditionNo = meterProcessEditionNo == null ? null : meterProcessEditionNo.trim();
+    }
+
+    public String getActualFirst1No() {
+        return actualFirst1No;
+    }
+
+    public void setActualFirst1No(String actualFirst1No) {
+        this.actualFirst1No = actualFirst1No == null ? null : actualFirst1No.trim();
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public String getGrossManNo() {
+        return grossManNo;
+    }
+
+    public void setGrossManNo(String grossManNo) {
+        this.grossManNo = grossManNo == null ? null : grossManNo.trim();
+    }
+
+    public String getGrossManName() {
+        return grossManName;
+    }
+
+    public void setGrossManName(String grossManName) {
+        this.grossManName = grossManName == null ? null : grossManName.trim();
+    }
+
+    public Date getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(Date grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getBaseSpot1No() {
+        return baseSpot1No;
+    }
+
+    public void setBaseSpot1No(String baseSpot1No) {
+        this.baseSpot1No = baseSpot1No == null ? null : baseSpot1No.trim();
+    }
+
+    public String getBaseSpot1Name() {
+        return baseSpot1Name;
+    }
+
+    public void setBaseSpot1Name(String baseSpot1Name) {
+        this.baseSpot1Name = baseSpot1Name == null ? null : baseSpot1Name.trim();
+    }
+
+    public String getGrossClass() {
+        return grossClass;
+    }
+
+    public void setGrossClass(String grossClass) {
+        this.grossClass = grossClass == null ? null : grossClass.trim();
+    }
+
+    public String getGrossGroup() {
+        return grossGroup;
+    }
+
+    public void setGrossGroup(String grossGroup) {
+        this.grossGroup = grossGroup == null ? null : grossGroup.trim();
+    }
+
+    public String getGrossMode() {
+        return grossMode;
+    }
+
+    public void setGrossMode(String grossMode) {
+        this.grossMode = grossMode == null ? null : grossMode.trim();
+    }
+
+    public String getActualFirst2No() {
+        return actualFirst2No;
+    }
+
+    public void setActualFirst2No(String actualFirst2No) {
+        this.actualFirst2No = actualFirst2No == null ? null : actualFirst2No.trim();
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public String getTareManNo() {
+        return tareManNo;
+    }
+
+    public void setTareManNo(String tareManNo) {
+        this.tareManNo = tareManNo == null ? null : tareManNo.trim();
+    }
+
+    public String getTareManName() {
+        return tareManName;
+    }
+
+    public void setTareManName(String tareManName) {
+        this.tareManName = tareManName == null ? null : tareManName.trim();
+    }
+
+    public Date getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(Date tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public String getBaseSpot2No() {
+        return baseSpot2No;
+    }
+
+    public void setBaseSpot2No(String baseSpot2No) {
+        this.baseSpot2No = baseSpot2No == null ? null : baseSpot2No.trim();
+    }
+
+    public String getBaseSpot2Name() {
+        return baseSpot2Name;
+    }
+
+    public void setBaseSpot2Name(String baseSpot2Name) {
+        this.baseSpot2Name = baseSpot2Name == null ? null : baseSpot2Name.trim();
+    }
+
+    public String getTareClass() {
+        return tareClass;
+    }
+
+    public void setTareClass(String tareClass) {
+        this.tareClass = tareClass == null ? null : tareClass.trim();
+    }
+
+    public String getTareGroup() {
+        return tareGroup;
+    }
+
+    public void setTareGroup(String tareGroup) {
+        this.tareGroup = tareGroup == null ? null : tareGroup.trim();
+    }
+
+    public String getTareMode() {
+        return tareMode;
+    }
+
+    public void setTareMode(String tareMode) {
+        this.tareMode = tareMode == null ? null : tareMode.trim();
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public String getNetManNo() {
+        return netManNo;
+    }
+
+    public void setNetManNo(String netManNo) {
+        this.netManNo = netManNo == null ? null : netManNo.trim();
+    }
+
+    public String getNetManName() {
+        return netManName;
+    }
+
+    public void setNetManName(String netManName) {
+        this.netManName = netManName == null ? null : netManName.trim();
+    }
+
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public String getNetSpot3No() {
+        return netSpot3No;
+    }
+
+    public void setNetSpot3No(String netSpot3No) {
+        this.netSpot3No = netSpot3No == null ? null : netSpot3No.trim();
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name == null ? null : netSpot3Name.trim();
+    }
+
+    public String getNetClass() {
+        return netClass;
+    }
+
+    public void setNetClass(String netClass) {
+        this.netClass = netClass == null ? null : netClass.trim();
+    }
+
+    public String getNetGroup() {
+        return netGroup;
+    }
+
+    public void setNetGroup(String netGroup) {
+        this.netGroup = netGroup == null ? null : netGroup.trim();
+    }
+
+    public String getNetMode() {
+        return netMode;
+    }
+
+    public void setNetMode(String netMode) {
+        this.netMode = netMode == null ? null : netMode.trim();
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag == null ? null : uploadFlag.trim();
+    }
+
+    public String getCheckManNo() {
+        return checkManNo;
+    }
+
+    public void setCheckManNo(String checkManNo) {
+        this.checkManNo = checkManNo == null ? null : checkManNo.trim();
+    }
+
+    public String getCheckManName() {
+        return checkManName;
+    }
+
+    public void setCheckManName(String checkManName) {
+        this.checkManName = checkManName == null ? null : checkManName.trim();
+    }
+
+    public Date getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(Date checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public String getUploadManNo() {
+        return uploadManNo;
+    }
+
+    public void setUploadManNo(String uploadManNo) {
+        this.uploadManNo = uploadManNo == null ? null : uploadManNo.trim();
+    }
+
+    public String getUploadManName() {
+        return uploadManName;
+    }
+
+    public void setUploadManName(String uploadManName) {
+        this.uploadManName = uploadManName == null ? null : uploadManName.trim();
+    }
+
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public String getSampleNo() {
+        return sampleNo;
+    }
+
+    public void setSampleNo(String sampleNo) {
+        this.sampleNo = sampleNo == null ? null : sampleNo.trim();
+    }
+
+    public String getRailwayTypeNo() {
+        return railwayTypeNo;
+    }
+
+    public void setRailwayTypeNo(String railwayTypeNo) {
+        this.railwayTypeNo = railwayTypeNo == null ? null : railwayTypeNo.trim();
+    }
+
+    public String getRailwayTypeName() {
+        return railwayTypeName;
+    }
+
+    public void setRailwayTypeName(String railwayTypeName) {
+        this.railwayTypeName = railwayTypeName == null ? null : railwayTypeName.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public BigDecimal getWaterNum() {
+        return waterNum;
+    }
+
+    public void setWaterNum(BigDecimal waterNum) {
+        this.waterNum = waterNum;
+    }
+
+    public String getArrival() {
+        return arrival;
+    }
+
+    public void setArrival(String arrival) {
+        this.arrival = arrival == null ? null : arrival.trim();
+    }
+
+    public String getStation() {
+        return station;
+    }
+
+    public void setStation(String station) {
+        this.station = station == null ? null : station.trim();
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getSourceArea() {
+        return sourceArea;
+    }
+
+    public void setSourceArea(String sourceArea) {
+        this.sourceArea = sourceArea == null ? null : sourceArea.trim();
+    }
+
+    public String getVoucherIdentity() {
+        return voucherIdentity;
+    }
+
+    public void setVoucherIdentity(String voucherIdentity) {
+        this.voucherIdentity = voucherIdentity == null ? null : voucherIdentity.trim();
+    }
+
+    public String getVoucherItem() {
+        return voucherItem;
+    }
+
+    public void setVoucherItem(String voucherItem) {
+        this.voucherItem = voucherItem == null ? null : voucherItem.trim();
+    }
+
+    public String getBusinessGroup() {
+        return businessGroup;
+    }
+
+    public void setBusinessGroup(String businessGroup) {
+        this.businessGroup = businessGroup == null ? null : businessGroup.trim();
+    }
+
+    public String getTempConveyance() {
+        return tempConveyance;
+    }
+
+    public void setTempConveyance(String tempConveyance) {
+        this.tempConveyance = tempConveyance == null ? null : tempConveyance.trim();
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType == null ? null : conveyanceType.trim();
+    }
+
+    public String getResourceSystem() {
+        return resourceSystem;
+    }
+
+    public void setResourceSystem(String resourceSystem) {
+        this.resourceSystem = resourceSystem == null ? null : resourceSystem.trim();
+    }
+
+    public Long getGroupPackageAmount() {
+        return groupPackageAmount;
+    }
+
+    public void setGroupPackageAmount(Long groupPackageAmount) {
+        this.groupPackageAmount = groupPackageAmount;
+    }
+
+    public String getGroupPackageUnit() {
+        return groupPackageUnit;
+    }
+
+    public void setGroupPackageUnit(String groupPackageUnit) {
+        this.groupPackageUnit = groupPackageUnit == null ? null : groupPackageUnit.trim();
+    }
+
+    public Long getPackageAmount() {
+        return packageAmount;
+    }
+
+    public void setPackageAmount(Long packageAmount) {
+        this.packageAmount = packageAmount;
+    }
+
+    public String getPackageUnit() {
+        return packageUnit;
+    }
+
+    public void setPackageUnit(String packageUnit) {
+        this.packageUnit = packageUnit == null ? null : packageUnit.trim();
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public String getMeasureBatch() {
+        return measureBatch;
+    }
+
+    public void setMeasureBatch(String measureBatch) {
+        this.measureBatch = measureBatch == null ? null : measureBatch.trim();
+    }
+
+    public Long getMeasureBatchCount() {
+        return measureBatchCount;
+    }
+
+    public void setMeasureBatchCount(Long measureBatchCount) {
+        this.measureBatchCount = measureBatchCount;
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark == null ? null : senderRemark.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getReceiverRemark() {
+        return receiverRemark;
+    }
+
+    public void setReceiverRemark(String receiverRemark) {
+        this.receiverRemark = receiverRemark == null ? null : receiverRemark.trim();
+    }
+
+    public String getAmountUnit() {
+        return amountUnit;
+    }
+
+    public void setAmountUnit(String amountUnit) {
+        this.amountUnit = amountUnit == null ? null : amountUnit.trim();
+    }
+
+    public String getMeasureObjectType() {
+        return measureObjectType;
+    }
+
+    public void setMeasureObjectType(String measureObjectType) {
+        this.measureObjectType = measureObjectType == null ? null : measureObjectType.trim();
+    }
+
+    public String getMeasureTaskNum() {
+        return measureTaskNum;
+    }
+
+    public void setMeasureTaskNum(String measureTaskNum) {
+        this.measureTaskNum = measureTaskNum == null ? null : measureTaskNum.trim();
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType == null ? null : billType.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(String dataSource) {
+        this.dataSource = dataSource == null ? null : dataSource.trim();
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note == null ? null : note.trim();
+    }
+
+    public String getIsPreSacale() {
+        return isPreSacale;
+    }
+
+    public void setIsPreSacale(String isPreSacale) {
+        this.isPreSacale = isPreSacale == null ? null : isPreSacale.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", actualNo=").append(actualNo);
+        sb.append(", predictionNo=").append(predictionNo);
+        sb.append(", noticeNo=").append(noticeNo);
+        sb.append(", railwayNo=").append(railwayNo);
+        sb.append(", railwayCarriageNo=").append(railwayCarriageNo);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", contractNo=").append(contractNo);
+        sb.append(", batchNo=").append(batchNo);
+        sb.append(", customerSupplierNo=").append(customerSupplierNo);
+        sb.append(", customerSupplierName=").append(customerSupplierName);
+        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
+        sb.append(", forwardingUnitName=").append(forwardingUnitName);
+        sb.append(", receivingUintNo=").append(receivingUintNo);
+        sb.append(", receivingUintName=").append(receivingUintName);
+        sb.append(", materialNo=").append(materialNo);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", specNo=").append(specNo);
+        sb.append(", specName=").append(specName);
+        sb.append(", loadPointNo=").append(loadPointNo);
+        sb.append(", loadPointName=").append(loadPointName);
+        sb.append(", sampleVoucher=").append(sampleVoucher);
+        sb.append(", carrierUnitNo=").append(carrierUnitNo);
+        sb.append(", carrierUnitName=").append(carrierUnitName);
+        sb.append(", meterTypeNo=").append(meterTypeNo);
+        sb.append(", meterTypeName=").append(meterTypeName);
+        sb.append(", meterProcessNo=").append(meterProcessNo);
+        sb.append(", meterProcessEditionNo=").append(meterProcessEditionNo);
+        sb.append(", actualFirst1No=").append(actualFirst1No);
+        sb.append(", grossWeight=").append(grossWeight);
+        sb.append(", grossManNo=").append(grossManNo);
+        sb.append(", grossManName=").append(grossManName);
+        sb.append(", grossTime=").append(grossTime);
+        sb.append(", baseSpot1No=").append(baseSpot1No);
+        sb.append(", baseSpot1Name=").append(baseSpot1Name);
+        sb.append(", grossClass=").append(grossClass);
+        sb.append(", grossGroup=").append(grossGroup);
+        sb.append(", grossMode=").append(grossMode);
+        sb.append(", actualFirst2No=").append(actualFirst2No);
+        sb.append(", tareWeight=").append(tareWeight);
+        sb.append(", tareManNo=").append(tareManNo);
+        sb.append(", tareManName=").append(tareManName);
+        sb.append(", tareTime=").append(tareTime);
+        sb.append(", baseSpot2No=").append(baseSpot2No);
+        sb.append(", baseSpot2Name=").append(baseSpot2Name);
+        sb.append(", tareClass=").append(tareClass);
+        sb.append(", tareGroup=").append(tareGroup);
+        sb.append(", tareMode=").append(tareMode);
+        sb.append(", netWeight=").append(netWeight);
+        sb.append(", netManNo=").append(netManNo);
+        sb.append(", netManName=").append(netManName);
+        sb.append(", netTime=").append(netTime);
+        sb.append(", netSpot3No=").append(netSpot3No);
+        sb.append(", netSpot3Name=").append(netSpot3Name);
+        sb.append(", netClass=").append(netClass);
+        sb.append(", netGroup=").append(netGroup);
+        sb.append(", netMode=").append(netMode);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", uploadFlag=").append(uploadFlag);
+        sb.append(", checkManNo=").append(checkManNo);
+        sb.append(", checkManName=").append(checkManName);
+        sb.append(", checkTime=").append(checkTime);
+        sb.append(", uploadManNo=").append(uploadManNo);
+        sb.append(", uploadManName=").append(uploadManName);
+        sb.append(", uploadTime=").append(uploadTime);
+        sb.append(", sampleNo=").append(sampleNo);
+        sb.append(", railwayTypeNo=").append(railwayTypeNo);
+        sb.append(", railwayTypeName=").append(railwayTypeName);
+        sb.append(", memo=").append(memo);
+        sb.append(", waterNum=").append(waterNum);
+        sb.append(", arrival=").append(arrival);
+        sb.append(", station=").append(station);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", sourceArea=").append(sourceArea);
+        sb.append(", voucherIdentity=").append(voucherIdentity);
+        sb.append(", voucherItem=").append(voucherItem);
+        sb.append(", businessGroup=").append(businessGroup);
+        sb.append(", tempConveyance=").append(tempConveyance);
+        sb.append(", conveyanceType=").append(conveyanceType);
+        sb.append(", resourceSystem=").append(resourceSystem);
+        sb.append(", groupPackageAmount=").append(groupPackageAmount);
+        sb.append(", groupPackageUnit=").append(groupPackageUnit);
+        sb.append(", packageAmount=").append(packageAmount);
+        sb.append(", packageUnit=").append(packageUnit);
+        sb.append(", theoryAmount=").append(theoryAmount);
+        sb.append(", measureBatch=").append(measureBatch);
+        sb.append(", measureBatchCount=").append(measureBatchCount);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", senderRemark=").append(senderRemark);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", receiverRemark=").append(receiverRemark);
+        sb.append(", amountUnit=").append(amountUnit);
+        sb.append(", measureObjectType=").append(measureObjectType);
+        sb.append(", measureTaskNum=").append(measureTaskNum);
+        sb.append(", billType=").append(billType);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", dataSource=").append(dataSource);
+        sb.append(", note=").append(note);
+        sb.append(", isPreSacale=").append(isPreSacale);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/model/batchAddInfoBo.java

@@ -0,0 +1,33 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model;
+
+import java.util.List;
+
+public class batchAddInfoBo {
+    private String grossTime;
+    private String tareTime;
+    List<MeterWorkMeasuringInstrumentSecond> list;
+
+    public String getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(String grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(String tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public List<MeterWorkMeasuringInstrumentSecond> getList() {
+        return list;
+    }
+
+    public void setList(List<MeterWorkMeasuringInstrumentSecond> list) {
+        this.list = list;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/service/IMeterWorkMeasuringInstrumentSecondService.java

@@ -0,0 +1,32 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.service;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkmeasuringinstrument.model.MeterWorkMeasuringInstrument;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkMeasuringInstrumentSecond服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-02-24 09:12
+ * 类描述
+ * 修订历史：
+ * 日期：2023-02-24
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkMeasuringInstrumentSecond服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkMeasuringInstrumentSecondService extends IBaseService<MeterWorkMeasuringInstrumentSecond, String>{
+    PageList<MeterWorkMeasuringInstrumentSecond> likeDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    List<String> getCreateManNo(HashMap<String, Object> params);
+    String checkandadd(MeterWorkMeasuringInstrumentSecond model);
+    RESTfulResult batchAddInfo(List<MeterWorkMeasuringInstrumentSecond> models);
+    RESTfulResult batchDeleteInfo(List<MeterWorkMeasuringInstrumentSecond> models);
+
+}

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/service/impl/MeterWorkMeasuringInstrumentSecondServiceImpl.java

@@ -0,0 +1,240 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.service.impl;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.meterwork.meterworkmeasuringinstrument.model.MeterWorkMeasuringInstrument;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.mapper.MeterWorkMeasuringInstrumentSecondMapper;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.model.MeterWorkMeasuringInstrumentSecond;
+import com.steerinfo.meterwork.meterworkmeasuringinstrumentsecond.service.IMeterWorkMeasuringInstrumentSecondService;
+import com.steerinfo.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * MeterWorkMeasuringInstrumentSecond服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-02-24 09:12
+ * 类描述
+ * 修订历史：
+ * 日期：2023-02-24
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkMeasuringInstrumentSecond服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkMeasuringInstrumentSecondService")
+public class MeterWorkMeasuringInstrumentSecondServiceImpl extends BaseServiceImpl<MeterWorkMeasuringInstrumentSecond, String> implements IMeterWorkMeasuringInstrumentSecondService {
+
+    @Resource
+    private MeterWorkMeasuringInstrumentSecondMapper meterWorkMeasuringInstrumentSecondMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkMeasuringInstrumentSecond, String> getMapper() {
+        return meterWorkMeasuringInstrumentSecondMapper;
+    }
+
+    @Override
+    public PageList<MeterWorkMeasuringInstrumentSecond> likeDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkMeasuringInstrumentSecond> rows = meterWorkMeasuringInstrumentSecondMapper.likeDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public List<String> getCreateManNo(HashMap<String, Object> params) {
+        List<String> rows = meterWorkMeasuringInstrumentSecondMapper.getCreateManNo(params);
+        return rows;
+    }
+
+    @Override
+    public String checkandadd(MeterWorkMeasuringInstrumentSecond model) {
+        if (StringUtils.isEmpty(model.getRailwayNo())) {
+            return "车号不能为空";
+        }
+        if (StringUtils.isEmpty(model.getMatterName())){
+            return "物资名称不能为空";
+        }
+        if(model.getNetWeight() == null){
+            return "净重不能为空";
+        }
+        if(model.getGrossWeight() == null){
+            return "毛重不能为空";
+        }
+        if(model.getTareWeight() == null){
+            return "皮重不能为空";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String afl = sdf.format(new Date());
+        String actualFirstNo = sdf.format(new Date()) + meterWorkMeasuringInstrumentSecondMapper.getNewID(afl);
+        UserPayload payload = UserPayload.getCurrUser();
+        String userName = payload.getUserName();
+//            String userId = "admin";
+//            String userName = "admins";
+        model.setGrossWeight(model.getGrossWeight().multiply(new BigDecimal(1000)));
+        model.setTareWeight(model.getTareWeight().multiply(new BigDecimal(1000)));
+        if(model.getGrossWeight().compareTo(model.getTareWeight()) == -1){
+            return "毛重小于皮重";
+        }
+        model.setNetWeight(model.getGrossWeight().subtract(model.getTareWeight()));
+        model.setCreateManName(userName);
+        model.setCreateTime(new Date());
+        model.setActualNo(actualFirstNo);
+        meterWorkMeasuringInstrumentSecondMapper.insertSelective(model);
+        return "";
+    }
+
+    @Override
+    public RESTfulResult batchAddInfo(List<MeterWorkMeasuringInstrumentSecond> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getUserCode();
+        String userName = payload.getUserName();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        int count = 0;
+
+        for(MeterWorkMeasuringInstrumentSecond model : models) {
+            if (StringUtils.isEmpty(model.getRailwayNo())) {
+                rm.setMessage("车号不能为空");
+                return rm;
+            }else {
+                Pattern pattern2 = Pattern.compile("[0-9]*");
+                Matcher matcher2 = pattern2.matcher(model.getRailwayNo());
+                if (!matcher2.matches()) {
+                    rm.setMessage("火车号包含字母或者其他特殊字符");
+                    return rm;
+                }
+            }
+            if (StringUtils.isEmpty(model.getMatterName())){
+                rm.setMessage("物资名称不能为空");
+                return rm;
+            }
+            if(model.getForwardingUnitName() == null){
+                rm.setMessage("发货单位名称不能为空");
+                return rm;
+            }
+            if(model.getReceivingUintName() == null){
+                rm.setMessage("收货单位名称不能为空");
+                return rm;
+            }
+            if(model.getCarrierUnitName() == null){
+                rm.setMessage("录入单位名称不能为空");
+                return rm;
+            }
+            if(model.getNetWeight() == null){
+                rm.setMessage("净重不能为空");
+                return rm;
+            }
+            if(model.getGrossWeight() == null){
+                rm.setMessage("毛重不能为空");
+                return rm;
+            }
+            if(model.getTareWeight() == null){
+                rm.setMessage("皮重不能为空");
+                return rm;
+            }
+        }
+        Random random = new Random();
+        for(int i = 0; i <= models.size()-1; i++) {
+            String afl = sdf.format(new Date());
+            String no = meterWorkMeasuringInstrumentSecondMapper.getNewID(afl);
+            models.get(i).setActualNo(afl+ no);
+            models.get(i).setGrossWeight(models.get(i).getGrossWeight().multiply(new BigDecimal(1000)));
+            models.get(i).setTareWeight(models.get(i).getTareWeight().multiply(new BigDecimal(1000)));
+            models.get(i).setNetWeight(models.get(i).getNetWeight().multiply(new BigDecimal(1000)));
+            models.get(i).setCarrierUnitName(models.get(0).getCarrierUnitName());
+            if(i == 0) {
+                if(models.get(i).getGrossTime() == null){
+                    rm.setMessage("毛重时间不能为空");
+                    return rm;
+                }
+                if(models.get(i).getTareTime() == null){
+                    rm.setMessage("皮重时间不能为空");
+                    return rm;
+                }
+                if(models.get(i).getGrossTime().compareTo(models.get(i).getTareTime()) > 0) {
+                    models.get(i).setNetTime(models.get(i).getGrossTime());
+                }else {
+                    models.get(i).setNetTime(models.get(i).getTareTime());
+                }
+                models.get(i).setGrossTime(new Date(sdfDate.format(models.get(i).getGrossTime())));
+                models.get(i).setTareTime(new Date(sdfDate.format(models.get(i).getTareTime())));
+//                models.get(i).setNetTime(new Date(sdfDate.format(models.get(i).getNetTime())));
+            }else {
+                Calendar grossTime = Calendar.getInstance();
+                Calendar tareTime = Calendar.getInstance();
+                Calendar netTime = Calendar.getInstance();
+                grossTime.setTime(models.get(i-1).getGrossTime());
+                grossTime.add(Calendar.MINUTE, 2);
+                grossTime.add(Calendar.SECOND, random.nextInt(60));
+                tareTime.setTime(models.get(i-1).getTareTime());
+                tareTime.add(Calendar.MINUTE, 2);
+                tareTime.add(Calendar.SECOND, random.nextInt(60));
+                netTime.setTime(models.get(i-1).getNetTime());
+                netTime.add(Calendar.MINUTE, 2);
+                netTime.add(Calendar.SECOND, random.nextInt(60));
+                models.get(i).setGrossTime(new Date(sdfDate.format(grossTime.getTime())));
+                models.get(i).setTareTime(new Date(sdfDate.format(tareTime.getTime())));
+                if(models.get(i).getGrossTime().compareTo(models.get(i).getTareTime()) > 0) {
+                    models.get(i).setNetTime(models.get(i).getGrossTime());
+                }else {
+                    models.get(i).setNetTime(models.get(i).getTareTime());
+                }
+            }
+            models.get(i).setUpdateManNo(userId);
+            models.get(i).setUpdateManName(userName);
+            models.get(i).setUpdateTime(new Date());
+            models.get(i).setCreateManName(userName);
+            models.get(i).setCreateTime(new Date());
+            models.get(i).setValueFlag("1");
+            meterWorkMeasuringInstrumentSecondMapper.insertSelective(models.get(i));
+            count ++;
+        }
+        rm.setSucceed(true);
+        rm.setMessage("操作成功，总共" + count + "条数据批量导入成功");
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult batchDeleteInfo(List<MeterWorkMeasuringInstrumentSecond> models) {
+        RESTfulResult rm = new RESTfulResult();
+        try{
+            int count = 0;
+            UserPayload payload = UserPayload.getCurrUser();
+            String userId = payload.getUserCode();
+            String userName = payload.getUserName();
+            for(MeterWorkMeasuringInstrumentSecond model: models) {
+                model.setValueFlag("0");
+                model.setUpdateManNo(userId);
+                model.setUpdateManName(userName);
+                model.setUpdateTime(new Date());
+                model.setNote("数据作废");
+                meterWorkMeasuringInstrumentSecondMapper.updateByPrimaryKeySelective(model);
+                count++;
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功，总共" + count + "条数据批量作废成功");
+        }catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setFailed();
+            rm.setMessage("操作失败：" + e.getMessage());
+        }
+        return rm;
+    }
+}

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

@@ -50,6 +50,8 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
 
     List<MeterWorkRailwayActual> selectByParameter(Map<String, Object> params);
     List<MeterWorkRailwayActual> likeByDesc(Map<String, Object> params);
+    //静态轨道衡打印查询（全连接连接超吨数据补录表）
+    List<MeterWorkRailwayActual> railwayPrintLikeByDesc(Map<String, Object> params);
     List<MeterWorkRailwayActual> carActualDataDetail(Map<String, Object> params);
     List<MeterWorkRailwayActual> likeByDescTemp(Map<String, Object> params);
 

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

@@ -4270,6 +4270,120 @@
     order by net_time desc
   </select>
 
+  <select id="railwayPrintLikeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+  select railway_no,
+         lc_no,
+         prediction_no,
+         matter_no,
+         matter_name,
+         sender_remark,
+         forwarding_unit_name,
+         receiving_uint_name,
+         meter_type_name,
+         gross_weight,
+         tare_weight,
+         net_weight,
+         net_time,
+         net_man_name,
+         net_spot3_no,
+         net_spot3_name,
+         value_Flag,
+         upload_flag,
+         railway_type_no,
+         actual_first1_no,
+         actual_first2_no
+    from ((select A.railway_no,
+                  A.lc_no,
+                  A.prediction_no,
+                  A.matter_no,
+                  A.matter_name,
+                  A.sender_remark,
+                  A.forwarding_unit_name,
+                  A.receiving_uint_name,
+                  A.meter_type_name,
+                  A.gross_weight,
+                  A.tare_weight,
+                  A.net_weight,
+                  A.net_time,
+                  A.net_man_name,
+                  A.net_spot3_no,
+                  A.net_spot3_name,
+                  A.value_Flag,
+                  A.upload_flag,
+                  A.railway_type_no,
+                  A.actual_first1_no,
+                  A.actual_first2_no
+             from meter_work_railway_actual A
+             where 1 = 1
+             and A.value_flag != '0'
+              <if test="railwayTypeNo != null and railwayTypeNo != ''">
+                and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+              </if>
+           )
+          union all
+          (select A.railway_no,
+                  '' as lc_no,
+                  A.prediction_no,
+                  A.matter_no,
+                  A.matter_name,
+                  A.sender_remark,
+                  A.forwarding_unit_name,
+                  A.receiving_uint_name,
+                  A.meter_type_name,
+                  A.gross_weight,
+                  A.tare_weight,
+                  A.net_weight,
+                  A.net_time,
+                  A.net_man_name,
+                  A.net_spot3_no,
+                  A.net_spot3_name,
+                  A.value_Flag,
+                  A.upload_flag,
+                  A.railway_type_no,
+                  A.actual_first1_no,
+                  A.actual_first2_no
+             from meter_work_measuring_instrument_second A
+             where A.value_flag != '0'))
+   where 1 = 1
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and railway_no LIKE '%${railwayNo}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and prediction_no LIKE '%${predictionNo}%'
+    </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="customerSupplierNo != null and customerSupplierNo != ''">
+      and customer_supplier_no LIKE '%${customerSupplierNo}%'
+    </if>
+    <if test="customerSupplierName != null and customerSupplierName != ''">
+      and customer_supplier_name LIKE '%${customerSupplierName}%'
+    </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="senderRemark != null and senderRemark != ''">
+      and sender_remark LIKE '%${senderRemark}%'
+    </if>
+   order by net_time desc
+  </select>
+
   <select id="likeByDescTemp" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     <where>

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

@@ -2890,7 +2890,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
             MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(params.get("actualNo").toString());
             //操作原因
-            String note = params.get("note") != null? "": params.get("note").toString();
+            String note = params.get("note") == null ? "": params.get("note").toString();
             if(actualModel == null){
                 rm.setMessage("未找到结净计量数据，请确认！！！");
                 return rm;
@@ -3129,66 +3129,71 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         map.put("userId", userId);
         map.put("userName", userName);
         List<MeterBaseUserPrintConfig> configs = meterBaseUserPrintConfigMapper.likeByDesc(map);
-        List<MeterWorkRailwayActual> rowsTemp = meterWorkRailwayActualMapper.likeByDesc(parameters);
+        List<MeterWorkRailwayActual> rowsTemp = meterWorkRailwayActualMapper.railwayPrintLikeByDesc(parameters);
         List<MeterWorkRailwayActual> rows = new ArrayList<>();
         if(rowsTemp.size() >= 1) {
             for(MeterWorkRailwayActual model: rowsTemp) {
-                if(configs.size() >= 1) {
-                    for(MeterBaseUserPrintConfig config: configs) {
-                        //物料、发货、收货都不为空，物料、发货、收货都判断
-                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
-                            && StringUtils.isNotEmpty(config.getReceivingUintNo())){
-                            if(model.getMatterNo().equals(config.getMatterNo()) && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
-                                    && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
-                                rows.add(model);
+                //超吨计量数据补录不需要验证用户配置物料收发货单位信息（注：超吨计量数据补录没有轨道衡类型）
+                if(StringUtils.isNotEmpty(model.getRailwayTypeNo())) {
+                    if(configs.size() >= 1) {
+                        for(MeterBaseUserPrintConfig config: configs) {
+                            //物料、发货、收货都不为空，物料、发货、收货都判断
+                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isNotEmpty(config.getReceivingUintNo())){
+                                if(model.getMatterNo().equals(config.getMatterNo()) && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
+                                        && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                    rows.add(model);
+                                }
                             }
-                        }
-                        //物料为空、发货、收货判断
-                        if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
-                                && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
-                            if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
-                                    && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
-                                rows.add(model);
+                            //物料为空、发货、收货判断
+                            if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
+                                if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
+                                        && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                    rows.add(model);
+                                }
                             }
-                        }
-                        //发货为空、物料、收货判断
-                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
-                                && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
-                            if(model.getMatterNo().equals(config.getMatterNo())
-                                    && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
-                                rows.add(model);
+                            //发货为空、物料、收货判断
+                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
+                                if(model.getMatterNo().equals(config.getMatterNo())
+                                        && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                    rows.add(model);
+                                }
                             }
-                        }
-                        //收货为空、物料、发货判断
-                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
-                                && StringUtils.isEmpty(config.getReceivingUintNo())) {
-                            if(model.getMatterNo().equals(config.getMatterNo())
-                                    && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
-                                rows.add(model);
+                            //收货为空、物料、发货判断
+                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isEmpty(config.getReceivingUintNo())) {
+                                if(model.getMatterNo().equals(config.getMatterNo())
+                                        && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
+                                    rows.add(model);
+                                }
                             }
-                        }
-                        //物料、发货都为空， 收货判断
-                        if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
-                                && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
-                            if(model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
-                                rows.add(model);
+                            //物料、发货都为空， 收货判断
+                            if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
+                                if(model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                    rows.add(model);
+                                }
                             }
-                        }
-                        //物料、收货都为空， 发货货判断
-                        if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
-                                && StringUtils.isEmpty(config.getReceivingUintNo())) {
-                            if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
-                                rows.add(model);
+                            //物料、收货都为空， 发货货判断
+                            if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isEmpty(config.getReceivingUintNo())) {
+                                if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
+                                    rows.add(model);
+                                }
                             }
-                        }
-                        //发货、收货都为空， 物料判断
-                        if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
-                                && StringUtils.isEmpty(config.getReceivingUintNo())) {
-                            if(model.getMatterNo().equals(config.getMatterNo())) {
-                                rows.add(model);
+                            //发货、收货都为空， 物料判断
+                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                                    && StringUtils.isEmpty(config.getReceivingUintNo())) {
+                                if(model.getMatterNo().equals(config.getMatterNo())) {
+                                    rows.add(model);
+                                }
                             }
                         }
                     }
+                }else {
+                    rows.add(model);
                 }
             }
         }