提交修改

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/controller/MeterBaseMetertypeConfController.java

@@ -3,6 +3,7 @@ package com.steerinfo.baseinfo.meterbasemetertypeconf.controller;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf;
 import com.steerinfo.baseinfo.meterbasemetertypeconf.service.IMeterBaseMetertypeConfService;
@@ -12,12 +13,10 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.*;
 import java.math.BigDecimal;
 
 /**
@@ -73,6 +72,24 @@ public class MeterBaseMetertypeConfController extends BaseRESTfulController {
         return success(meterBaseMetertypeConf);
     }
 
+    @ApiOperation(value="创建", notes="根据MeterBaseMetertypeConf对象创建")
+    @ApiImplicitParam(name = "meterBaseMetertypeConf", value = "详细实体meterBaseMetertypeConf", required = true, dataType = "MeterBaseMetertypeConf")
+    //@RequiresPermissions("meterbasemetertypeconf:create")
+    @PostMapping(value = "/add")
+    public RESTfulResult add1(@ModelAttribute MeterBaseMetertypeConf model){
+        try {
+            String msg = meterBaseMetertypeConfService.checkandadd(model);
+            if (msg != null && !msg.equals("")) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+        return success();
+    }
+
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("meterbasemetertypeconf:view")
@@ -90,6 +107,12 @@ public class MeterBaseMetertypeConfController extends BaseRESTfulController {
     //@RequiresPermissions("meterbasemetertypeconf:update")
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseMetertypeConf model){
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getId();
+        String userName = payload.getUserName();
+        model.setUpdateTime(new Date());
+        model.setUpdateManName(userName);
+        model.setUpdateManNo(userId);
         model.setId(id);
         MeterBaseMetertypeConf meterBaseMetertypeConf = meterBaseMetertypeConfService.modify(model);
         return success(meterBaseMetertypeConf);

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/service/IMeterBaseMetertypeConfService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasemetertypeconf.service;
 
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf;
 import java.util.Date;
@@ -19,5 +20,5 @@ import java.math.BigDecimal;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterBaseMetertypeConfService extends IBaseService<MeterBaseMetertypeConf, String>{
-
+    String checkandadd(MeterBaseMetertypeConf model);
 }

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/service/impl/MeterBaseMetertypeConfServiceImpl.java

@@ -1,10 +1,12 @@
 package com.steerinfo.baseinfo.meterbasemetertypeconf.service.impl;
 
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasemetertypeconf.model.MeterBaseMetertypeConf;
 import com.steerinfo.baseinfo.meterbasemetertypeconf.mapper.MeterBaseMetertypeConfMapper;
 import com.steerinfo.baseinfo.meterbasemetertypeconf.service.IMeterBaseMetertypeConfService;
+import com.steerinfo.framework.user.UserPayload;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
@@ -33,4 +35,33 @@ public class MeterBaseMetertypeConfServiceImpl extends BaseServiceImpl<MeterBase
     protected IBaseMapper<MeterBaseMetertypeConf, String> getMapper() {
         return meterBaseMetertypeConfMapper;
     }
+
+    @Override
+    public String checkandadd(MeterBaseMetertypeConf model) {
+        if (model.getMeterTypeNo() == null || "".equals(model.getMeterTypeNo()) || model.getMeterTypeName() == null || "".equals(model.getMeterTypeName())) {
+            return "业务类型名称及编码不能为空";
+        }
+        if (model.getSpotTypeNo() == null || "".equals(model.getSpotTypeNo()) || model.getSpotTypeName() == null || "".equals(model.getSpotTypeName())) {
+            return "业务类型分类名称及编码不能为空";
+        }
+        if (model.getIsAllowOwnTare() == null || "".equals(model.getIsAllowOwnTare())) {
+            return "是否允许使用自重不能为空";
+        }
+        if (model.getIsAllowTermTare() == null || "".equals(model.getIsAllowTermTare())) {
+            return "是否允许使用期限皮重不能为空";
+        }
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getId();
+        String userName = payload.getUserName();
+        model.setCreateTime(new Date());
+        model.setCreateManName(userName);
+        model.setCreateManName(userId);
+        // 校验当前业务类型是否已经配置
+        MeterBaseMetertypeConf confquery = meterBaseMetertypeConfMapper.selectByPrimaryKey(model.getMeterTypeNo());
+        if (confquery != null) {
+            return "该业务类型已经新增了配置，请在原有配置信息上进行修改";
+        }
+        meterBaseMetertypeConfMapper.insert(model);
+        return "";
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -954,7 +954,7 @@
 
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(BASE_SPOT_NO, LENGTH(BASE_SPOT_NO) - 4))),0) + 1,5,'0') BASE_SPOT_NO
-    FROM METER_BASE_CALIBRA_STANDARD
+    FROM METER_BASE_SPOT_INFO
   </select>
 
   <select id="selectall" parameterType="java.util.HashMap" resultMap="BaseResultMap">

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

@@ -86,6 +86,31 @@
         <result column="METER_PIER_NAME" jdbcType="VARCHAR" property="meterPierName" />
         <result column="METER_PIER_NO" jdbcType="VARCHAR" property="meterPierNo" />
         <result column="SHIP_NO" jdbcType="VARCHAR" property="shipNo" />
+        <result column="NOTE" jdbcType="VARCHAR" property="note" />
+        <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" />
     </resultMap>
     <sql id="columns">
         ACTUAL_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME,
@@ -101,7 +126,12 @@
     CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, ADD_WEIGHT,
     NET_CLASS, TB_FLAGE, RAILWAY_NO, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, MEMO,
     HEAT_NO, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO,
-    PREDICTION_TYPE, PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO, SHIP_NO
+    PREDICTION_TYPE, PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO, SHIP_NO,
+    NOTE, VOUCHER_IDENTITY, VOUCHER_ITEM, BUSINESS_GROUP, TEMP_CONVEYANCE, CONVEYANCE_TYPE,
+    RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT,
+    THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+    RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME,
+    CREATE_TIME, DATA_SOURCE
     </sql>
     <sql id="columns_alias">
         t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME,
@@ -119,7 +149,12 @@
     t.UPLOAD_TIME, t.ADD_WEIGHT, t.NET_CLASS, t.TB_FLAGE, t.RAILWAY_NO, t.UPDATE_MAN_NO,
     t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MEMO, t.HEAT_NO, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT,
     t.SHIPMENT_NUM, t.BIND_CARD_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_PIER_NAME,
-    t.METER_PIER_NO, t.SHIP_NO
+    t.METER_PIER_NO, t.SHIP_NO, t.NOTE, t.VOUCHER_IDENTITY, t.VOUCHER_ITEM, t.BUSINESS_GROUP,
+    t.TEMP_CONVEYANCE, t.CONVEYANCE_TYPE, t.RESOURCE_SYSTEM, t.GROUP_PACKAGE_AMOUNT,
+    t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT, t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH,
+    t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK,
+    t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME,
+    t.CREATE_TIME, t.DATA_SOURCE
     </sql>
     <sql id="select">
         SELECT <include refid="columns"/> FROM METER_WORK_CAR_ACTUAL
@@ -381,6 +416,81 @@
             <if test="shipNo != null and shipNo != ''">
                 and SHIP_NO = #{shipNo}
             </if>
+            <if test="note != null and note != ''">
+                and NOTE = #{note}
+            </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="netTime1 != null and netTime1 != null and netTime2 != '' and netTime2 != ''">
                 and  NET_TIME  >= TO_DATE(#{netTime1}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{netTime2}, 'yyyy-MM-dd HH24:mi:ss')
             </if>
@@ -640,6 +750,84 @@
             <if test="shipNo != null and shipNo != ''">
                 and SHIP_NO LIKE '%${shipNo}%'
             </if>
+            <if test="note != null and note != ''">
+                and NOTE LIKE '%${note}%'
+            </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="netTime1 != null and netTime1 != null and netTime2 != '' and netTime2 != ''">
+                and  NET_TIME  >= TO_DATE(#{netTime1}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{netTime2}, 'yyyy-MM-dd HH24:mi:ss')
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -898,6 +1086,81 @@
         <if test="shipNo != null and shipNo != ''">
             or SHIP_NO = #{shipNo}
         </if>
+        <if test="note != null and note != ''">
+            or NOTE = #{note}
+        </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>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
         insert into METER_WORK_CAR_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO,
@@ -928,7 +1191,15 @@
                                            HEAT_NO, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
                                            SHIPMENT_NUM, BIND_CARD_NO, PREDICTION_TYPE,
                                            PREDICTION_COMBINATION, METER_PIER_NAME, METER_PIER_NO,
-                                           SHIP_NO)
+                                           SHIP_NO, NOTE, VOUCHER_IDENTITY,
+                                           VOUCHER_ITEM, BUSINESS_GROUP, TEMP_CONVEYANCE,
+                                           CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT,
+                                           GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT,
+                                           THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT,
+                                           SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+                                           RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
+                                           MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME,
+                                           CREATE_TIME, DATA_SOURCE)
         values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR},
                 #{carNo,jdbcType=VARCHAR}, #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR},
                 #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR},
@@ -957,7 +1228,15 @@
                 #{heatNo,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL},
                 #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR},
                 #{predictionCombination,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR}, #{meterPierNo,jdbcType=VARCHAR},
-                #{shipNo,jdbcType=VARCHAR})
+                #{shipNo,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{voucherIdentity,jdbcType=VARCHAR},
+                #{voucherItem,jdbcType=VARCHAR}, #{businessGroup,jdbcType=VARCHAR}, #{tempConveyance,jdbcType=VARCHAR},
+                #{conveyanceType,jdbcType=VARCHAR}, #{resourceSystem,jdbcType=VARCHAR}, #{groupPackageAmount,jdbcType=DECIMAL},
+                #{groupPackageUnit,jdbcType=VARCHAR}, #{packageAmount,jdbcType=DECIMAL}, #{packageUnit,jdbcType=VARCHAR},
+                #{theoryAmount,jdbcType=DECIMAL}, #{measureBatch,jdbcType=VARCHAR}, #{measureBatchCount,jdbcType=DECIMAL},
+                #{senderType,jdbcType=VARCHAR}, #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR},
+                #{receiverRemark,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR},
+                #{measureTaskNum,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP}, #{dataSource,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
         insert into METER_WORK_CAR_ACTUAL
@@ -1214,6 +1493,81 @@
             <if test="shipNo != null">
                 SHIP_NO,
             </if>
+            <if test="note != null">
+                NOTE,
+            </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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="actualNo != null">
@@ -1468,6 +1822,81 @@
             <if test="shipNo != null">
                 #{shipNo,jdbcType=VARCHAR},
             </if>
+            <if test="note != null">
+                #{note,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>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -1554,7 +1983,32 @@
             PREDICTION_COMBINATION = #{predictionCombination,jdbcType=VARCHAR},
             METER_PIER_NAME = #{meterPierName,jdbcType=VARCHAR},
             METER_PIER_NO = #{meterPierNo,jdbcType=VARCHAR},
-            SHIP_NO = #{shipNo,jdbcType=VARCHAR}
+            SHIP_NO = #{shipNo,jdbcType=VARCHAR},
+            NOTE = #{note,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}
         where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -1809,6 +2263,81 @@
             <if test="shipNo != null">
                 SHIP_NO = #{shipNo,jdbcType=VARCHAR},
             </if>
+            <if test="note != null">
+                NOTE = #{note,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>
         </set>
         where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
     </update>
@@ -1819,12 +2348,10 @@
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="where"/>
-        order by NET_TIME desc
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="whereLike"/>
-        order by NET_TIME desc
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into METER_WORK_CAR_ACTUAL
@@ -1859,7 +2386,17 @@
         SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
         SHIPMENT_NUM, BIND_CARD_NO, PREDICTION_TYPE,
         PREDICTION_COMBINATION, METER_PIER_NAME,
-        METER_PIER_NO, SHIP_NO)
+        METER_PIER_NO, SHIP_NO, NOTE,
+        VOUCHER_IDENTITY, VOUCHER_ITEM,
+        BUSINESS_GROUP, TEMP_CONVEYANCE,
+        CONVEYANCE_TYPE, RESOURCE_SYSTEM,
+        GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+        PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT,
+        MEASURE_BATCH, MEASURE_BATCH_COUNT,
+        SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+        RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
+        MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME,
+        CREATE_TIME, DATA_SOURCE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.actualNo,jdbcType=VARCHAR},
@@ -1893,7 +2430,17 @@
         #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL},
         #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR},
         #{item.predictionCombination,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR},
-        #{item.meterPierNo,jdbcType=VARCHAR}, #{item.shipNo,jdbcType=VARCHAR} from dual
+        #{item.meterPierNo,jdbcType=VARCHAR}, #{item.shipNo,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR},
+        #{item.voucherIdentity,jdbcType=VARCHAR}, #{item.voucherItem,jdbcType=VARCHAR},
+        #{item.businessGroup,jdbcType=VARCHAR}, #{item.tempConveyance,jdbcType=VARCHAR},
+        #{item.conveyanceType,jdbcType=VARCHAR}, #{item.resourceSystem,jdbcType=VARCHAR},
+        #{item.groupPackageAmount,jdbcType=DECIMAL}, #{item.groupPackageUnit,jdbcType=VARCHAR},
+        #{item.packageAmount,jdbcType=DECIMAL}, #{item.packageUnit,jdbcType=VARCHAR}, #{item.theoryAmount,jdbcType=DECIMAL},
+        #{item.measureBatch,jdbcType=VARCHAR}, #{item.measureBatchCount,jdbcType=DECIMAL},
+        #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR},
+        #{item.receiverRemark,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR},
+        #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.billType,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
+        #{item.createTime,jdbcType=TIMESTAMP}, #{item.dataSource,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -2235,6 +2782,106 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
             when #{item.actualNo,jdbcType=VARCHAR} then #{item.shipNo,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>
+        ,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>
         where ACTUAL_NO in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.actualNo,jdbcType=VARCHAR}
@@ -2254,6 +2901,14 @@
 
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+    <sql id="whereTime">
+        <where>
+            <if test="netTime1 != null and netTime1 != null and netTime2 != '' and netTime2 != ''">
+                and  NET_TIME  >= TO_DATE(#{netTime1}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{netTime2}, 'yyyy-MM-dd HH24:mi:ss')
+            </if>
+        </where>
+    </sql>
     <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         SELECT *
         from meter_work_car_actual_view

src/main/java/com/steerinfo/meterwork/meterworkcaractual/model/MeterWorkCarActual.java

@@ -518,6 +518,150 @@ public class MeterWorkCarActual implements IBasePO<String> {
     @ApiModelProperty(value="停用，启用，修改等原因",required=false)
     private String note;
 
+    /**
+     * 主凭据号(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=应急计量)(DATA_SOURCE,VARCHAR,2)
+     */
+    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量)",required=false)
+    private String dataSource;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1210,6 +1354,198 @@ public class MeterWorkCarActual implements IBasePO<String> {
         this.note = note == null ? this.note : this.note + "；" + note.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();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1301,6 +1637,30 @@ public class MeterWorkCarActual implements IBasePO<String> {
         sb.append(", meterPierNo=").append(meterPierNo);
         sb.append(", shipNo=").append(shipNo);
         sb.append(", note=").append(note);
+        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(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/model/MeterWorkCarActualFirst.java

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

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

@@ -429,6 +429,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     pls.setValueFlag(DbConstants.UP);
                 }
                  */
+                if (pls == null) {
+                    throw new MarkerMetException(500, "数据对应的委托不存在！！");
+                }
                 pls.setUpdateTime(new Date());
                 pls.setUpdateManNo("system");
                 pls.setUpdateManName("一次计量数据解除操作");

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -65,44 +65,77 @@
         <result column="HEAT_NO" jdbcType="VARCHAR" property="heatNo" />
         <result column="ID_NUM" jdbcType="VARCHAR" property="idNum" />
         <result column="PREDICTION_SOURCE" jdbcType="VARCHAR" property="predictionSource" />
-        <result column="METER_PIER_NAME" jdbcType="VARCHAR" property="meterPierName" />
-        <result column="METER_PIER_NO" jdbcType="VARCHAR" property="meterPierNo" />
         <result column="CREATE_DEPNAME" jdbcType="VARCHAR" property="createDepname" />
         <result column="CREATE_DEPID" jdbcType="VARCHAR" property="createDepid" />
         <result column="LINE_DESC" jdbcType="VARCHAR" property="lineDesc" />
-        <result column="LINE_CODE" jdbcType="VARCHAR" property="lineCode" />
-        <result column="SHIP_NO" jdbcType="VARCHAR" property="shipNo" />
+        <result column="VOUCHER_IDENTITY" jdbcType="VARCHAR" property="voucherIdentity" />
+        <result column="VOUCHER_ITEM" jdbcType="VARCHAR" property="voucherItem" />
+        <result column="BUSINESS_GROUP" jdbcType="VARCHAR" property="businessGroup" />
+        <result column="TEMP_CONVEYANCE" jdbcType="VARCHAR" property="tempConveyance" />
+        <result column="CONVEYANCE_TYPE" jdbcType="VARCHAR" property="conveyanceType" />
+        <result column="RESOURCE_SYSTEM" jdbcType="VARCHAR" property="resourceSystem" />
+        <result column="GROUP_PACKAGE_AMOUNT" jdbcType="DECIMAL" property="groupPackageAmount" />
+        <result column="GROUP_PACKAGE_UNIT" jdbcType="VARCHAR" property="groupPackageUnit" />
+        <result column="PACKAGE_AMOUNT" jdbcType="DECIMAL" property="packageAmount" />
+        <result column="PACKAGE_UNIT" jdbcType="VARCHAR" property="packageUnit" />
+        <result column="THEORY_AMOUNT" jdbcType="DECIMAL" property="theoryAmount" />
+        <result column="MEASURE_BATCH" jdbcType="VARCHAR" property="measureBatch" />
+        <result column="MEASURE_BATCH_COUNT" jdbcType="DECIMAL" property="measureBatchCount" />
+        <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
+        <result column="SENDER_REMARK" jdbcType="VARCHAR" property="senderRemark" />
+        <result column="RECEIVER_TYPE" jdbcType="VARCHAR" property="receiverType" />
+        <result column="RECEIVER_REMARK" jdbcType="VARCHAR" property="receiverRemark" />
+        <result column="TRUST_DEPARTMENT_NAME" jdbcType="VARCHAR" property="trustDepartmentName" />
+        <result column="TRUST_DEPARTMENT" jdbcType="VARCHAR" property="trustDepartment" />
+        <result column="TRUSTOR" jdbcType="VARCHAR" property="trustor" />
+        <result column="TRUST_DATE_TIME" jdbcType="TIMESTAMP" property="trustDateTime" />
+        <result column="TRUST_AVAILABILITY_TIME" jdbcType="TIMESTAMP" property="trustAvailabilityTime" />
+        <result column="TRUST_IP" jdbcType="VARCHAR" property="trustIp" />
+        <result column="STATION_TYPE" jdbcType="VARCHAR" property="stationType" />
+        <result column="MEASURE_STATION" jdbcType="VARCHAR" property="measureStation" />
+        <result column="MEASURE_STATION_NAME" jdbcType="VARCHAR" property="measureStationName" />
+        <result column="AMOUNT_UNIT" jdbcType="VARCHAR" property="amountUnit" />
+        <result column="TRUST_DAY" jdbcType="DECIMAL" property="trustDay" />
     </resultMap>
     <sql id="columns">
-        PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME, CONTRACT_NO, 
-    BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, SOURCE_AREA, FORWARDING_UNIT_NO, 
-    FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-    SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, ADD_WEIGHT_SUM, 
-    BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, 
-    CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME, 
-    USED_TYPE, EFFECTIVE_START_TIME, EFFECTIVE_END_TIME, EFFECTIVE_WEIGHT, EFFECTIVE_NUM, 
-    METER_WEIGHT, METER_NUM, RAILWAY_NO, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-    MEMO, VALUE_FLAG, USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, P_VALUE_FLAG, 
-    CAR_ALLOCATION_TIME, IS_COMPLETED, LIMS_SAMPLING_FLAG, HEAT_NO, ID_NUM, PREDICTION_SOURCE, 
-    METER_PIER_NAME, METER_PIER_NO, CREATE_DEPNAME, CREATE_DEPID, LINE_DESC, LINE_CODE, 
-    SHIP_NO
+        PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME, CONTRACT_NO,
+    BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, SOURCE_AREA, FORWARDING_UNIT_NO,
+    FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME,
+    SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, ADD_WEIGHT_SUM,
+    BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO,
+    CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME,
+    USED_TYPE, EFFECTIVE_START_TIME, EFFECTIVE_END_TIME, EFFECTIVE_WEIGHT, EFFECTIVE_NUM,
+    METER_WEIGHT, METER_NUM, RAILWAY_NO, METER_PROCESS_NO, METER_PROCESS_EDITION_NO,
+    MEMO, VALUE_FLAG, USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO,
+    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, P_VALUE_FLAG,
+    CAR_ALLOCATION_TIME, IS_COMPLETED, LIMS_SAMPLING_FLAG, HEAT_NO, ID_NUM, PREDICTION_SOURCE,
+    CREATE_DEPNAME, CREATE_DEPID, LINE_DESC, VOUCHER_IDENTITY, VOUCHER_ITEM, BUSINESS_GROUP,
+    TEMP_CONVEYANCE, CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+    PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT,
+    SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, RECEIVER_REMARK, TRUST_DEPARTMENT_NAME,
+    TRUST_DEPARTMENT, TRUSTOR, TRUST_DATE_TIME, TRUST_AVAILABILITY_TIME, TRUST_IP, STATION_TYPE,
+    MEASURE_STATION, MEASURE_STATION_NAME, AMOUNT_UNIT, TRUST_DAY
     </sql>
     <sql id="columns_alias">
-        t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME, 
-    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.SOURCE_AREA, 
-    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, 
-    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, 
-    t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.ADD_WEIGHT_SUM, t.BIND_CARD_NO, t.LOAD_POINT_NO, 
-    t.LOAD_POINT_NAME, t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, 
-    t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_TYPE_NO, t.METER_TYPE_NAME, 
-    t.USED_TYPE, t.EFFECTIVE_START_TIME, t.EFFECTIVE_END_TIME, t.EFFECTIVE_WEIGHT, t.EFFECTIVE_NUM, 
-    t.METER_WEIGHT, t.METER_NUM, t.RAILWAY_NO, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, 
-    t.MEMO, t.VALUE_FLAG, t.USED_TIME, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, 
-    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, 
-    t.DELETE_TIME, t.P_VALUE_FLAG, t.CAR_ALLOCATION_TIME, t.IS_COMPLETED, t.LIMS_SAMPLING_FLAG, 
-    t.HEAT_NO, t.ID_NUM, t.PREDICTION_SOURCE, t.METER_PIER_NAME, t.METER_PIER_NO, t.CREATE_DEPNAME, 
-    t.CREATE_DEPID, t.LINE_DESC, t.LINE_CODE, t.SHIP_NO
+        t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME,
+    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.SOURCE_AREA,
+    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME,
+    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT,
+    t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.ADD_WEIGHT_SUM, t.BIND_CARD_NO, t.LOAD_POINT_NO,
+    t.LOAD_POINT_NAME, t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME,
+    t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_TYPE_NO, t.METER_TYPE_NAME,
+    t.USED_TYPE, t.EFFECTIVE_START_TIME, t.EFFECTIVE_END_TIME, t.EFFECTIVE_WEIGHT, t.EFFECTIVE_NUM,
+    t.METER_WEIGHT, t.METER_NUM, t.RAILWAY_NO, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO,
+    t.MEMO, t.VALUE_FLAG, t.USED_TIME, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME,
+    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME,
+    t.DELETE_TIME, t.P_VALUE_FLAG, t.CAR_ALLOCATION_TIME, t.IS_COMPLETED, t.LIMS_SAMPLING_FLAG,
+    t.HEAT_NO, t.ID_NUM, t.PREDICTION_SOURCE, t.CREATE_DEPNAME, t.CREATE_DEPID, t.LINE_DESC,
+    t.VOUCHER_IDENTITY, t.VOUCHER_ITEM, t.BUSINESS_GROUP, t.TEMP_CONVEYANCE, t.CONVEYANCE_TYPE,
+    t.RESOURCE_SYSTEM, t.GROUP_PACKAGE_AMOUNT, t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT,
+    t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH, t.MEASURE_BATCH_COUNT, t.SENDER_TYPE,
+    t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.TRUST_DEPARTMENT_NAME, t.TRUST_DEPARTMENT,
+    t.TRUSTOR, t.TRUST_DATE_TIME, t.TRUST_AVAILABILITY_TIME, t.TRUST_IP, t.STATION_TYPE,
+    t.MEASURE_STATION, t.MEASURE_STATION_NAME, t.AMOUNT_UNIT, t.TRUST_DAY
     </sql>
     <sql id="select">
         SELECT <include refid="columns"/> FROM PRE_TRACK_SCALE
@@ -301,12 +334,6 @@
             <if test="predictionSource != null and predictionSource != ''">
                 and PREDICTION_SOURCE = #{predictionSource}
             </if>
-            <if test="meterPierName != null and meterPierName != ''">
-                and METER_PIER_NAME = #{meterPierName}
-            </if>
-            <if test="meterPierNo != null and meterPierNo != ''">
-                and METER_PIER_NO = #{meterPierNo}
-            </if>
             <if test="createDepname != null and createDepname != ''">
                 and CREATE_DEPNAME = #{createDepname}
             </if>
@@ -316,11 +343,89 @@
             <if test="lineDesc != null and lineDesc != ''">
                 and LINE_DESC = #{lineDesc}
             </if>
-            <if test="lineCode != null and lineCode != ''">
-                and LINE_CODE = #{lineCode}
+            <if test="voucherIdentity != null and voucherIdentity != ''">
+                and VOUCHER_IDENTITY = #{voucherIdentity}
+            </if>
+            <if test="voucherItem != null and voucherItem != ''">
+                and VOUCHER_ITEM = #{voucherItem}
+            </if>
+            <if test="businessGroup != null and businessGroup != ''">
+                and BUSINESS_GROUP = #{businessGroup}
+            </if>
+            <if test="tempConveyance != null and tempConveyance != ''">
+                and TEMP_CONVEYANCE = #{tempConveyance}
+            </if>
+            <if test="conveyanceType != null and conveyanceType != ''">
+                and CONVEYANCE_TYPE = #{conveyanceType}
+            </if>
+            <if test="resourceSystem != null and resourceSystem != ''">
+                and RESOURCE_SYSTEM = #{resourceSystem}
+            </if>
+            <if test="groupPackageAmount != null">
+                and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+            </if>
+            <if test="groupPackageUnit != null and groupPackageUnit != ''">
+                and GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+            </if>
+            <if test="packageAmount != null">
+                and PACKAGE_AMOUNT = #{packageAmount}
+            </if>
+            <if test="packageUnit != null and packageUnit != ''">
+                and PACKAGE_UNIT = #{packageUnit}
+            </if>
+            <if test="theoryAmount != null">
+                and THEORY_AMOUNT = #{theoryAmount}
+            </if>
+            <if test="measureBatch != null and measureBatch != ''">
+                and MEASURE_BATCH = #{measureBatch}
+            </if>
+            <if test="measureBatchCount != null">
+                and MEASURE_BATCH_COUNT = #{measureBatchCount}
+            </if>
+            <if test="senderType != null and senderType != ''">
+                and SENDER_TYPE = #{senderType}
+            </if>
+            <if test="senderRemark != null and senderRemark != ''">
+                and SENDER_REMARK = #{senderRemark}
+            </if>
+            <if test="receiverType != null and receiverType != ''">
+                and RECEIVER_TYPE = #{receiverType}
+            </if>
+            <if test="receiverRemark != null and receiverRemark != ''">
+                and RECEIVER_REMARK = #{receiverRemark}
+            </if>
+            <if test="trustDepartmentName != null and trustDepartmentName != ''">
+                and TRUST_DEPARTMENT_NAME = #{trustDepartmentName}
+            </if>
+            <if test="trustDepartment != null and trustDepartment != ''">
+                and TRUST_DEPARTMENT = #{trustDepartment}
+            </if>
+            <if test="trustor != null and trustor != ''">
+                and TRUSTOR = #{trustor}
+            </if>
+            <if test="trustDateTime != null">
+                and TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = #{trustDateTime}
+            </if>
+            <if test="trustAvailabilityTime != null">
+                and TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = #{trustAvailabilityTime}
+            </if>
+            <if test="trustIp != null and trustIp != ''">
+                and TRUST_IP = #{trustIp}
+            </if>
+            <if test="stationType != null and stationType != ''">
+                and STATION_TYPE = #{stationType}
+            </if>
+            <if test="measureStation != null and measureStation != ''">
+                and MEASURE_STATION = #{measureStation}
+            </if>
+            <if test="measureStationName != null and measureStationName != ''">
+                and MEASURE_STATION_NAME = #{measureStationName}
+            </if>
+            <if test="amountUnit != null and amountUnit != ''">
+                and AMOUNT_UNIT = #{amountUnit}
             </if>
-            <if test="shipNo != null and shipNo != ''">
-                and SHIP_NO = #{shipNo}
+            <if test="trustDay != null">
+                and TRUST_DAY = #{trustDay}
             </if>
         </where>
     </sql>
@@ -515,12 +620,6 @@
             <if test="predictionSource != null and predictionSource != ''">
                 and PREDICTION_SOURCE LIKE '%${predictionSource}%'
             </if>
-            <if test="meterPierName != null and meterPierName != ''">
-                and METER_PIER_NAME LIKE '%${meterPierName}%'
-            </if>
-            <if test="meterPierNo != null and meterPierNo != ''">
-                and METER_PIER_NO LIKE '%${meterPierNo}%'
-            </if>
             <if test="createDepname != null and createDepname != ''">
                 and CREATE_DEPNAME LIKE '%${createDepname}%'
             </if>
@@ -530,11 +629,89 @@
             <if test="lineDesc != null and lineDesc != ''">
                 and LINE_DESC LIKE '%${lineDesc}%'
             </if>
-            <if test="lineCode != null and lineCode != ''">
-                and LINE_CODE LIKE '%${lineCode}%'
+            <if test="voucherIdentity != null and voucherIdentity != ''">
+                and VOUCHER_IDENTITY LIKE '%${voucherIdentity}%'
+            </if>
+            <if test="voucherItem != null and voucherItem != ''">
+                and VOUCHER_ITEM LIKE '%${voucherItem}%'
+            </if>
+            <if test="businessGroup != null and businessGroup != ''">
+                and BUSINESS_GROUP LIKE '%${businessGroup}%'
+            </if>
+            <if test="tempConveyance != null and tempConveyance != ''">
+                and TEMP_CONVEYANCE LIKE '%${tempConveyance}%'
+            </if>
+            <if test="conveyanceType != null and conveyanceType != ''">
+                and CONVEYANCE_TYPE LIKE '%${conveyanceType}%'
+            </if>
+            <if test="resourceSystem != null and resourceSystem != ''">
+                and RESOURCE_SYSTEM LIKE '%${resourceSystem}%'
+            </if>
+            <if test="groupPackageAmount != null">
+                and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+            </if>
+            <if test="groupPackageUnit != null and groupPackageUnit != ''">
+                and GROUP_PACKAGE_UNIT LIKE '%${groupPackageUnit}%'
+            </if>
+            <if test="packageAmount != null">
+                and PACKAGE_AMOUNT = #{packageAmount}
+            </if>
+            <if test="packageUnit != null and packageUnit != ''">
+                and PACKAGE_UNIT LIKE '%${packageUnit}%'
+            </if>
+            <if test="theoryAmount != null">
+                and THEORY_AMOUNT = #{theoryAmount}
+            </if>
+            <if test="measureBatch != null and measureBatch != ''">
+                and MEASURE_BATCH LIKE '%${measureBatch}%'
+            </if>
+            <if test="measureBatchCount != null">
+                and MEASURE_BATCH_COUNT = #{measureBatchCount}
+            </if>
+            <if test="senderType != null and senderType != ''">
+                and SENDER_TYPE LIKE '%${senderType}%'
+            </if>
+            <if test="senderRemark != null and senderRemark != ''">
+                and SENDER_REMARK LIKE '%${senderRemark}%'
+            </if>
+            <if test="receiverType != null and receiverType != ''">
+                and RECEIVER_TYPE LIKE '%${receiverType}%'
+            </if>
+            <if test="receiverRemark != null and receiverRemark != ''">
+                and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+            </if>
+            <if test="trustDepartmentName != null and trustDepartmentName != ''">
+                and TRUST_DEPARTMENT_NAME LIKE '%${trustDepartmentName}%'
+            </if>
+            <if test="trustDepartment != null and trustDepartment != ''">
+                and TRUST_DEPARTMENT LIKE '%${trustDepartment}%'
+            </if>
+            <if test="trustor != null and trustor != ''">
+                and TRUSTOR LIKE '%${trustor}%'
+            </if>
+            <if test="trustDateTime != null">
+                and TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = #{trustDateTime}
+            </if>
+            <if test="trustAvailabilityTime != null">
+                and TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = #{trustAvailabilityTime}
+            </if>
+            <if test="trustIp != null and trustIp != ''">
+                and TRUST_IP LIKE '%${trustIp}%'
+            </if>
+            <if test="stationType != null and stationType != ''">
+                and STATION_TYPE LIKE '%${stationType}%'
+            </if>
+            <if test="measureStation != null and measureStation != ''">
+                and MEASURE_STATION LIKE '%${measureStation}%'
+            </if>
+            <if test="measureStationName != null and measureStationName != ''">
+                and MEASURE_STATION_NAME LIKE '%${measureStationName}%'
+            </if>
+            <if test="amountUnit != null and amountUnit != ''">
+                and AMOUNT_UNIT LIKE '%${amountUnit}%'
             </if>
-            <if test="shipNo != null and shipNo != ''">
-                and SHIP_NO LIKE '%${shipNo}%'
+            <if test="trustDay != null">
+                and TRUST_DAY = #{trustDay}
             </if>
         </where>
     </sql>
@@ -731,12 +908,6 @@
         <if test="predictionSource != null and predictionSource != ''">
             or PREDICTION_SOURCE = #{predictionSource}
         </if>
-        <if test="meterPierName != null and meterPierName != ''">
-            or METER_PIER_NAME = #{meterPierName}
-        </if>
-        <if test="meterPierNo != null and meterPierNo != ''">
-            or METER_PIER_NO = #{meterPierNo}
-        </if>
         <if test="createDepname != null and createDepname != ''">
             or CREATE_DEPNAME = #{createDepname}
         </if>
@@ -746,11 +917,89 @@
         <if test="lineDesc != null and lineDesc != ''">
             or LINE_DESC = #{lineDesc}
         </if>
-        <if test="lineCode != null and lineCode != ''">
-            or LINE_CODE = #{lineCode}
+        <if test="voucherIdentity != null and voucherIdentity != ''">
+            or VOUCHER_IDENTITY = #{voucherIdentity}
+        </if>
+        <if test="voucherItem != null and voucherItem != ''">
+            or VOUCHER_ITEM = #{voucherItem}
+        </if>
+        <if test="businessGroup != null and businessGroup != ''">
+            or BUSINESS_GROUP = #{businessGroup}
+        </if>
+        <if test="tempConveyance != null and tempConveyance != ''">
+            or TEMP_CONVEYANCE = #{tempConveyance}
+        </if>
+        <if test="conveyanceType != null and conveyanceType != ''">
+            or CONVEYANCE_TYPE = #{conveyanceType}
+        </if>
+        <if test="resourceSystem != null and resourceSystem != ''">
+            or RESOURCE_SYSTEM = #{resourceSystem}
+        </if>
+        <if test="groupPackageAmount != null">
+            or GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+        </if>
+        <if test="groupPackageUnit != null and groupPackageUnit != ''">
+            or GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+        </if>
+        <if test="packageAmount != null">
+            or PACKAGE_AMOUNT = #{packageAmount}
+        </if>
+        <if test="packageUnit != null and packageUnit != ''">
+            or PACKAGE_UNIT = #{packageUnit}
+        </if>
+        <if test="theoryAmount != null">
+            or THEORY_AMOUNT = #{theoryAmount}
+        </if>
+        <if test="measureBatch != null and measureBatch != ''">
+            or MEASURE_BATCH = #{measureBatch}
+        </if>
+        <if test="measureBatchCount != null">
+            or MEASURE_BATCH_COUNT = #{measureBatchCount}
+        </if>
+        <if test="senderType != null and senderType != ''">
+            or SENDER_TYPE = #{senderType}
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            or SENDER_REMARK = #{senderRemark}
+        </if>
+        <if test="receiverType != null and receiverType != ''">
+            or RECEIVER_TYPE = #{receiverType}
+        </if>
+        <if test="receiverRemark != null and receiverRemark != ''">
+            or RECEIVER_REMARK = #{receiverRemark}
+        </if>
+        <if test="trustDepartmentName != null and trustDepartmentName != ''">
+            or TRUST_DEPARTMENT_NAME = #{trustDepartmentName}
+        </if>
+        <if test="trustDepartment != null and trustDepartment != ''">
+            or TRUST_DEPARTMENT = #{trustDepartment}
+        </if>
+        <if test="trustor != null and trustor != ''">
+            or TRUSTOR = #{trustor}
+        </if>
+        <if test="trustDateTime != null">
+            or TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = '#{trustDateTime}'
+        </if>
+        <if test="trustAvailabilityTime != null">
+            or TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = '#{trustAvailabilityTime}'
+        </if>
+        <if test="trustIp != null and trustIp != ''">
+            or TRUST_IP = #{trustIp}
+        </if>
+        <if test="stationType != null and stationType != ''">
+            or STATION_TYPE = #{stationType}
+        </if>
+        <if test="measureStation != null and measureStation != ''">
+            or MEASURE_STATION = #{measureStation}
+        </if>
+        <if test="measureStationName != null and measureStationName != ''">
+            or MEASURE_STATION_NAME = #{measureStationName}
+        </if>
+        <if test="amountUnit != null and amountUnit != ''">
+            or AMOUNT_UNIT = #{amountUnit}
         </if>
-        <if test="shipNo != null and shipNo != ''">
-            or SHIP_NO = #{shipNo}
+        <if test="trustDay != null">
+            or TRUST_DAY = #{trustDay}
         </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.pretrack.pretrackscale.model.PreTrackScale">
@@ -775,9 +1024,17 @@
                                      UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
                                      DELETE_TIME, P_VALUE_FLAG, CAR_ALLOCATION_TIME,
                                      IS_COMPLETED, LIMS_SAMPLING_FLAG, HEAT_NO,
-                                     ID_NUM, PREDICTION_SOURCE, METER_PIER_NAME,
-                                     METER_PIER_NO, CREATE_DEPNAME, CREATE_DEPID,
-                                     LINE_DESC, LINE_CODE, SHIP_NO
+                                     ID_NUM, PREDICTION_SOURCE, CREATE_DEPNAME,
+                                     CREATE_DEPID, LINE_DESC, VOUCHER_IDENTITY,
+                                     VOUCHER_ITEM, BUSINESS_GROUP, TEMP_CONVEYANCE,
+                                     CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT,
+                                     GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT,
+                                     THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT,
+                                     SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+                                     RECEIVER_REMARK, TRUST_DEPARTMENT_NAME, TRUST_DEPARTMENT,
+                                     TRUSTOR, TRUST_DATE_TIME, TRUST_AVAILABILITY_TIME,
+                                     TRUST_IP, STATION_TYPE, MEASURE_STATION,
+                                     MEASURE_STATION_NAME, AMOUNT_UNIT, TRUST_DAY
         )
         values (#{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR},
                 #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR},
@@ -800,9 +1057,17 @@
                 #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR},
                 #{deleteTime,jdbcType=TIMESTAMP}, #{pValueFlag,jdbcType=VARCHAR}, #{carAllocationTime,jdbcType=TIMESTAMP},
                 #{isCompleted,jdbcType=VARCHAR}, #{limsSamplingFlag,jdbcType=VARCHAR}, #{heatNo,jdbcType=VARCHAR},
-                #{idNum,jdbcType=VARCHAR}, #{predictionSource,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR},
-                #{meterPierNo,jdbcType=VARCHAR}, #{createDepname,jdbcType=VARCHAR}, #{createDepid,jdbcType=VARCHAR},
-                #{lineDesc,jdbcType=VARCHAR}, #{lineCode,jdbcType=VARCHAR}, #{shipNo,jdbcType=VARCHAR}
+                #{idNum,jdbcType=VARCHAR}, #{predictionSource,jdbcType=VARCHAR}, #{createDepname,jdbcType=VARCHAR},
+                #{createDepid,jdbcType=VARCHAR}, #{lineDesc,jdbcType=VARCHAR}, #{voucherIdentity,jdbcType=VARCHAR},
+                #{voucherItem,jdbcType=VARCHAR}, #{businessGroup,jdbcType=VARCHAR}, #{tempConveyance,jdbcType=VARCHAR},
+                #{conveyanceType,jdbcType=VARCHAR}, #{resourceSystem,jdbcType=VARCHAR}, #{groupPackageAmount,jdbcType=DECIMAL},
+                #{groupPackageUnit,jdbcType=VARCHAR}, #{packageAmount,jdbcType=DECIMAL}, #{packageUnit,jdbcType=VARCHAR},
+                #{theoryAmount,jdbcType=DECIMAL}, #{measureBatch,jdbcType=VARCHAR}, #{measureBatchCount,jdbcType=DECIMAL},
+                #{senderType,jdbcType=VARCHAR}, #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR},
+                #{receiverRemark,jdbcType=VARCHAR}, #{trustDepartmentName,jdbcType=VARCHAR}, #{trustDepartment,jdbcType=VARCHAR},
+                #{trustor,jdbcType=VARCHAR}, #{trustDateTime,jdbcType=TIMESTAMP}, #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+                #{trustIp,jdbcType=VARCHAR}, #{stationType,jdbcType=VARCHAR}, #{measureStation,jdbcType=VARCHAR},
+                #{measureStationName,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{trustDay,jdbcType=DECIMAL}
                )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.pretrack.pretrackscale.model.PreTrackScale">
@@ -997,12 +1262,6 @@
             <if test="predictionSource != null">
                 PREDICTION_SOURCE,
             </if>
-            <if test="meterPierName != null">
-                METER_PIER_NAME,
-            </if>
-            <if test="meterPierNo != null">
-                METER_PIER_NO,
-            </if>
             <if test="createDepname != null">
                 CREATE_DEPNAME,
             </if>
@@ -1012,11 +1271,89 @@
             <if test="lineDesc != null">
                 LINE_DESC,
             </if>
-            <if test="lineCode != null">
-                LINE_CODE,
+            <if test="voucherIdentity != null">
+                VOUCHER_IDENTITY,
+            </if>
+            <if test="voucherItem != null">
+                VOUCHER_ITEM,
+            </if>
+            <if test="businessGroup != null">
+                BUSINESS_GROUP,
+            </if>
+            <if test="tempConveyance != null">
+                TEMP_CONVEYANCE,
+            </if>
+            <if test="conveyanceType != null">
+                CONVEYANCE_TYPE,
+            </if>
+            <if test="resourceSystem != null">
+                RESOURCE_SYSTEM,
+            </if>
+            <if test="groupPackageAmount != null">
+                GROUP_PACKAGE_AMOUNT,
+            </if>
+            <if test="groupPackageUnit != null">
+                GROUP_PACKAGE_UNIT,
+            </if>
+            <if test="packageAmount != null">
+                PACKAGE_AMOUNT,
+            </if>
+            <if test="packageUnit != null">
+                PACKAGE_UNIT,
+            </if>
+            <if test="theoryAmount != null">
+                THEORY_AMOUNT,
+            </if>
+            <if test="measureBatch != null">
+                MEASURE_BATCH,
+            </if>
+            <if test="measureBatchCount != null">
+                MEASURE_BATCH_COUNT,
+            </if>
+            <if test="senderType != null">
+                SENDER_TYPE,
+            </if>
+            <if test="senderRemark != null">
+                SENDER_REMARK,
+            </if>
+            <if test="receiverType != null">
+                RECEIVER_TYPE,
+            </if>
+            <if test="receiverRemark != null">
+                RECEIVER_REMARK,
+            </if>
+            <if test="trustDepartmentName != null">
+                TRUST_DEPARTMENT_NAME,
+            </if>
+            <if test="trustDepartment != null">
+                TRUST_DEPARTMENT,
+            </if>
+            <if test="trustor != null">
+                TRUSTOR,
+            </if>
+            <if test="trustDateTime != null">
+                TRUST_DATE_TIME,
+            </if>
+            <if test="trustAvailabilityTime != null">
+                TRUST_AVAILABILITY_TIME,
+            </if>
+            <if test="trustIp != null">
+                TRUST_IP,
+            </if>
+            <if test="stationType != null">
+                STATION_TYPE,
+            </if>
+            <if test="measureStation != null">
+                MEASURE_STATION,
+            </if>
+            <if test="measureStationName != null">
+                MEASURE_STATION_NAME,
+            </if>
+            <if test="amountUnit != null">
+                AMOUNT_UNIT,
             </if>
-            <if test="shipNo != null">
-                SHIP_NO,
+            <if test="trustDay != null">
+                TRUST_DAY,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -1209,12 +1546,6 @@
             <if test="predictionSource != null">
                 #{predictionSource,jdbcType=VARCHAR},
             </if>
-            <if test="meterPierName != null">
-                #{meterPierName,jdbcType=VARCHAR},
-            </if>
-            <if test="meterPierNo != null">
-                #{meterPierNo,jdbcType=VARCHAR},
-            </if>
             <if test="createDepname != null">
                 #{createDepname,jdbcType=VARCHAR},
             </if>
@@ -1224,11 +1555,89 @@
             <if test="lineDesc != null">
                 #{lineDesc,jdbcType=VARCHAR},
             </if>
-            <if test="lineCode != null">
-                #{lineCode,jdbcType=VARCHAR},
+            <if test="voucherIdentity != null">
+                #{voucherIdentity,jdbcType=VARCHAR},
+            </if>
+            <if test="voucherItem != null">
+                #{voucherItem,jdbcType=VARCHAR},
+            </if>
+            <if test="businessGroup != null">
+                #{businessGroup,jdbcType=VARCHAR},
+            </if>
+            <if test="tempConveyance != null">
+                #{tempConveyance,jdbcType=VARCHAR},
+            </if>
+            <if test="conveyanceType != null">
+                #{conveyanceType,jdbcType=VARCHAR},
+            </if>
+            <if test="resourceSystem != null">
+                #{resourceSystem,jdbcType=VARCHAR},
+            </if>
+            <if test="groupPackageAmount != null">
+                #{groupPackageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupPackageUnit != null">
+                #{groupPackageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="packageAmount != null">
+                #{packageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="packageUnit != null">
+                #{packageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="theoryAmount != null">
+                #{theoryAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="measureBatch != null">
+                #{measureBatch,jdbcType=VARCHAR},
+            </if>
+            <if test="measureBatchCount != null">
+                #{measureBatchCount,jdbcType=DECIMAL},
+            </if>
+            <if test="senderType != null">
+                #{senderType,jdbcType=VARCHAR},
+            </if>
+            <if test="senderRemark != null">
+                #{senderRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverType != null">
+                #{receiverType,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverRemark != null">
+                #{receiverRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartmentName != null">
+                #{trustDepartmentName,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartment != null">
+                #{trustDepartment,jdbcType=VARCHAR},
+            </if>
+            <if test="trustor != null">
+                #{trustor,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDateTime != null">
+                #{trustDateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustAvailabilityTime != null">
+                #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustIp != null">
+                #{trustIp,jdbcType=VARCHAR},
+            </if>
+            <if test="stationType != null">
+                #{stationType,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStation != null">
+                #{measureStation,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStationName != null">
+                #{measureStationName,jdbcType=VARCHAR},
+            </if>
+            <if test="amountUnit != null">
+                #{amountUnit,jdbcType=VARCHAR},
             </if>
-            <if test="shipNo != null">
-                #{shipNo,jdbcType=VARCHAR},
+            <if test="trustDay != null">
+                #{trustDay,jdbcType=DECIMAL},
             </if>
         </trim>
     </insert>
@@ -1296,13 +1705,37 @@
             HEAT_NO = #{heatNo,jdbcType=VARCHAR},
             ID_NUM = #{idNum,jdbcType=VARCHAR},
             PREDICTION_SOURCE = #{predictionSource,jdbcType=VARCHAR},
-            METER_PIER_NAME = #{meterPierName,jdbcType=VARCHAR},
-            METER_PIER_NO = #{meterPierNo,jdbcType=VARCHAR},
             CREATE_DEPNAME = #{createDepname,jdbcType=VARCHAR},
             CREATE_DEPID = #{createDepid,jdbcType=VARCHAR},
             LINE_DESC = #{lineDesc,jdbcType=VARCHAR},
-            LINE_CODE = #{lineCode,jdbcType=VARCHAR},
-            SHIP_NO = #{shipNo,jdbcType=VARCHAR}
+            VOUCHER_IDENTITY = #{voucherIdentity,jdbcType=VARCHAR},
+            VOUCHER_ITEM = #{voucherItem,jdbcType=VARCHAR},
+            BUSINESS_GROUP = #{businessGroup,jdbcType=VARCHAR},
+            TEMP_CONVEYANCE = #{tempConveyance,jdbcType=VARCHAR},
+            CONVEYANCE_TYPE = #{conveyanceType,jdbcType=VARCHAR},
+            RESOURCE_SYSTEM = #{resourceSystem,jdbcType=VARCHAR},
+            GROUP_PACKAGE_AMOUNT = #{groupPackageAmount,jdbcType=DECIMAL},
+            GROUP_PACKAGE_UNIT = #{groupPackageUnit,jdbcType=VARCHAR},
+            PACKAGE_AMOUNT = #{packageAmount,jdbcType=DECIMAL},
+            PACKAGE_UNIT = #{packageUnit,jdbcType=VARCHAR},
+            THEORY_AMOUNT = #{theoryAmount,jdbcType=DECIMAL},
+            MEASURE_BATCH = #{measureBatch,jdbcType=VARCHAR},
+            MEASURE_BATCH_COUNT = #{measureBatchCount,jdbcType=DECIMAL},
+            SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+            SENDER_REMARK = #{senderRemark,jdbcType=VARCHAR},
+            RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+            RECEIVER_REMARK = #{receiverRemark,jdbcType=VARCHAR},
+            TRUST_DEPARTMENT_NAME = #{trustDepartmentName,jdbcType=VARCHAR},
+            TRUST_DEPARTMENT = #{trustDepartment,jdbcType=VARCHAR},
+            TRUSTOR = #{trustor,jdbcType=VARCHAR},
+            TRUST_DATE_TIME = #{trustDateTime,jdbcType=TIMESTAMP},
+            TRUST_AVAILABILITY_TIME = #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+            TRUST_IP = #{trustIp,jdbcType=VARCHAR},
+            STATION_TYPE = #{stationType,jdbcType=VARCHAR},
+            MEASURE_STATION = #{measureStation,jdbcType=VARCHAR},
+            MEASURE_STATION_NAME = #{measureStationName,jdbcType=VARCHAR},
+            AMOUNT_UNIT = #{amountUnit,jdbcType=VARCHAR},
+            TRUST_DAY = #{trustDay,jdbcType=DECIMAL}
         where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.pretrack.pretrackscale.model.PreTrackScale">
@@ -1494,12 +1927,6 @@
             <if test="predictionSource != null">
                 PREDICTION_SOURCE = #{predictionSource,jdbcType=VARCHAR},
             </if>
-            <if test="meterPierName != null">
-                METER_PIER_NAME = #{meterPierName,jdbcType=VARCHAR},
-            </if>
-            <if test="meterPierNo != null">
-                METER_PIER_NO = #{meterPierNo,jdbcType=VARCHAR},
-            </if>
             <if test="createDepname != null">
                 CREATE_DEPNAME = #{createDepname,jdbcType=VARCHAR},
             </if>
@@ -1509,11 +1936,89 @@
             <if test="lineDesc != null">
                 LINE_DESC = #{lineDesc,jdbcType=VARCHAR},
             </if>
-            <if test="lineCode != null">
-                LINE_CODE = #{lineCode,jdbcType=VARCHAR},
+            <if test="voucherIdentity != null">
+                VOUCHER_IDENTITY = #{voucherIdentity,jdbcType=VARCHAR},
+            </if>
+            <if test="voucherItem != null">
+                VOUCHER_ITEM = #{voucherItem,jdbcType=VARCHAR},
+            </if>
+            <if test="businessGroup != null">
+                BUSINESS_GROUP = #{businessGroup,jdbcType=VARCHAR},
+            </if>
+            <if test="tempConveyance != null">
+                TEMP_CONVEYANCE = #{tempConveyance,jdbcType=VARCHAR},
+            </if>
+            <if test="conveyanceType != null">
+                CONVEYANCE_TYPE = #{conveyanceType,jdbcType=VARCHAR},
+            </if>
+            <if test="resourceSystem != null">
+                RESOURCE_SYSTEM = #{resourceSystem,jdbcType=VARCHAR},
+            </if>
+            <if test="groupPackageAmount != null">
+                GROUP_PACKAGE_AMOUNT = #{groupPackageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupPackageUnit != null">
+                GROUP_PACKAGE_UNIT = #{groupPackageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="packageAmount != null">
+                PACKAGE_AMOUNT = #{packageAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="packageUnit != null">
+                PACKAGE_UNIT = #{packageUnit,jdbcType=VARCHAR},
+            </if>
+            <if test="theoryAmount != null">
+                THEORY_AMOUNT = #{theoryAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="measureBatch != null">
+                MEASURE_BATCH = #{measureBatch,jdbcType=VARCHAR},
+            </if>
+            <if test="measureBatchCount != null">
+                MEASURE_BATCH_COUNT = #{measureBatchCount,jdbcType=DECIMAL},
+            </if>
+            <if test="senderType != null">
+                SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+            </if>
+            <if test="senderRemark != null">
+                SENDER_REMARK = #{senderRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverType != null">
+                RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+            </if>
+            <if test="receiverRemark != null">
+                RECEIVER_REMARK = #{receiverRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartmentName != null">
+                TRUST_DEPARTMENT_NAME = #{trustDepartmentName,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDepartment != null">
+                TRUST_DEPARTMENT = #{trustDepartment,jdbcType=VARCHAR},
+            </if>
+            <if test="trustor != null">
+                TRUSTOR = #{trustor,jdbcType=VARCHAR},
+            </if>
+            <if test="trustDateTime != null">
+                TRUST_DATE_TIME = #{trustDateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustAvailabilityTime != null">
+                TRUST_AVAILABILITY_TIME = #{trustAvailabilityTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="trustIp != null">
+                TRUST_IP = #{trustIp,jdbcType=VARCHAR},
+            </if>
+            <if test="stationType != null">
+                STATION_TYPE = #{stationType,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStation != null">
+                MEASURE_STATION = #{measureStation,jdbcType=VARCHAR},
+            </if>
+            <if test="measureStationName != null">
+                MEASURE_STATION_NAME = #{measureStationName,jdbcType=VARCHAR},
+            </if>
+            <if test="amountUnit != null">
+                AMOUNT_UNIT = #{amountUnit,jdbcType=VARCHAR},
             </if>
-            <if test="shipNo != null">
-                SHIP_NO = #{shipNo,jdbcType=VARCHAR},
+            <if test="trustDay != null">
+                TRUST_DAY = #{trustDay,jdbcType=DECIMAL},
             </if>
         </set>
         where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
@@ -1525,12 +2030,10 @@
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="where"/>
-        order by  CREATE_TIME desc
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <include refid="whereLike"/>
-        order by  CREATE_TIME desc
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into PRE_TRACK_SCALE
@@ -1560,9 +2063,20 @@
         P_VALUE_FLAG, CAR_ALLOCATION_TIME,
         IS_COMPLETED, LIMS_SAMPLING_FLAG,
         HEAT_NO, ID_NUM, PREDICTION_SOURCE,
-        METER_PIER_NAME, METER_PIER_NO, CREATE_DEPNAME,
-        CREATE_DEPID, LINE_DESC, LINE_CODE,
-        SHIP_NO)
+        CREATE_DEPNAME, CREATE_DEPID, LINE_DESC,
+        VOUCHER_IDENTITY, VOUCHER_ITEM,
+        BUSINESS_GROUP, TEMP_CONVEYANCE,
+        CONVEYANCE_TYPE, RESOURCE_SYSTEM,
+        GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+        PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT,
+        MEASURE_BATCH, MEASURE_BATCH_COUNT,
+        SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+        RECEIVER_REMARK, TRUST_DEPARTMENT_NAME,
+        TRUST_DEPARTMENT, TRUSTOR, TRUST_DATE_TIME,
+        TRUST_AVAILABILITY_TIME, TRUST_IP,
+        STATION_TYPE, MEASURE_STATION,
+        MEASURE_STATION_NAME, AMOUNT_UNIT,
+        TRUST_DAY)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.predictionNo,jdbcType=VARCHAR},
@@ -1591,9 +2105,20 @@
         #{item.pValueFlag,jdbcType=VARCHAR}, #{item.carAllocationTime,jdbcType=TIMESTAMP},
         #{item.isCompleted,jdbcType=VARCHAR}, #{item.limsSamplingFlag,jdbcType=VARCHAR},
         #{item.heatNo,jdbcType=VARCHAR}, #{item.idNum,jdbcType=VARCHAR}, #{item.predictionSource,jdbcType=VARCHAR},
-        #{item.meterPierName,jdbcType=VARCHAR}, #{item.meterPierNo,jdbcType=VARCHAR}, #{item.createDepname,jdbcType=VARCHAR},
-        #{item.createDepid,jdbcType=VARCHAR}, #{item.lineDesc,jdbcType=VARCHAR}, #{item.lineCode,jdbcType=VARCHAR},
-        #{item.shipNo,jdbcType=VARCHAR} from dual
+        #{item.createDepname,jdbcType=VARCHAR}, #{item.createDepid,jdbcType=VARCHAR}, #{item.lineDesc,jdbcType=VARCHAR},
+        #{item.voucherIdentity,jdbcType=VARCHAR}, #{item.voucherItem,jdbcType=VARCHAR},
+        #{item.businessGroup,jdbcType=VARCHAR}, #{item.tempConveyance,jdbcType=VARCHAR},
+        #{item.conveyanceType,jdbcType=VARCHAR}, #{item.resourceSystem,jdbcType=VARCHAR},
+        #{item.groupPackageAmount,jdbcType=DECIMAL}, #{item.groupPackageUnit,jdbcType=VARCHAR},
+        #{item.packageAmount,jdbcType=DECIMAL}, #{item.packageUnit,jdbcType=VARCHAR}, #{item.theoryAmount,jdbcType=DECIMAL},
+        #{item.measureBatch,jdbcType=VARCHAR}, #{item.measureBatchCount,jdbcType=DECIMAL},
+        #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR},
+        #{item.receiverRemark,jdbcType=VARCHAR}, #{item.trustDepartmentName,jdbcType=VARCHAR},
+        #{item.trustDepartment,jdbcType=VARCHAR}, #{item.trustor,jdbcType=VARCHAR}, #{item.trustDateTime,jdbcType=TIMESTAMP},
+        #{item.trustAvailabilityTime,jdbcType=TIMESTAMP}, #{item.trustIp,jdbcType=VARCHAR},
+        #{item.stationType,jdbcType=VARCHAR}, #{item.measureStation,jdbcType=VARCHAR},
+        #{item.measureStationName,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR},
+        #{item.trustDay,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -1851,14 +2376,6 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
             when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionSource,jdbcType=VARCHAR}
         </foreach>
-        ,METER_PIER_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterPierName,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PIER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterPierNo,jdbcType=VARCHAR}
-        </foreach>
         ,CREATE_DEPNAME=
         <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
             when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createDepname,jdbcType=VARCHAR}
@@ -1871,13 +2388,117 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
             when #{item.predictionNo,jdbcType=VARCHAR} then #{item.lineDesc,jdbcType=VARCHAR}
         </foreach>
-        ,LINE_CODE=
+        ,VOUCHER_IDENTITY=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.voucherIdentity,jdbcType=VARCHAR}
+        </foreach>
+        ,VOUCHER_ITEM=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.voucherItem,jdbcType=VARCHAR}
+        </foreach>
+        ,BUSINESS_GROUP=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.businessGroup,jdbcType=VARCHAR}
+        </foreach>
+        ,TEMP_CONVEYANCE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.tempConveyance,jdbcType=VARCHAR}
+        </foreach>
+        ,CONVEYANCE_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.conveyanceType,jdbcType=VARCHAR}
+        </foreach>
+        ,RESOURCE_SYSTEM=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.resourceSystem,jdbcType=VARCHAR}
+        </foreach>
+        ,GROUP_PACKAGE_AMOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.groupPackageAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,GROUP_PACKAGE_UNIT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.groupPackageUnit,jdbcType=VARCHAR}
+        </foreach>
+        ,PACKAGE_AMOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.packageAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,PACKAGE_UNIT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.packageUnit,jdbcType=VARCHAR}
+        </foreach>
+        ,THEORY_AMOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.theoryAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,MEASURE_BATCH=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureBatch,jdbcType=VARCHAR}
+        </foreach>
+        ,MEASURE_BATCH_COUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureBatchCount,jdbcType=DECIMAL}
+        </foreach>
+        ,SENDER_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+        </foreach>
+        ,SENDER_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.senderRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,RECEIVER_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receiverType,jdbcType=VARCHAR}
+        </foreach>
+        ,RECEIVER_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receiverRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DEPARTMENT_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDepartmentName,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DEPARTMENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDepartment,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUSTOR=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustor,jdbcType=VARCHAR}
+        </foreach>
+        ,TRUST_DATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,TRUST_AVAILABILITY_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustAvailabilityTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,TRUST_IP=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustIp,jdbcType=VARCHAR}
+        </foreach>
+        ,STATION_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.stationType,jdbcType=VARCHAR}
+        </foreach>
+        ,MEASURE_STATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureStation,jdbcType=VARCHAR}
+        </foreach>
+        ,MEASURE_STATION_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.measureStationName,jdbcType=VARCHAR}
+        </foreach>
+        ,AMOUNT_UNIT=
         <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.lineCode,jdbcType=VARCHAR}
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.amountUnit,jdbcType=VARCHAR}
         </foreach>
-        ,SHIP_NO=
+        ,TRUST_DAY=
         <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipNo,jdbcType=VARCHAR}
+            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trustDay,jdbcType=DECIMAL}
         </foreach>
         where PREDICTION_NO in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">

src/main/java/com/steerinfo/pretrack/pretrackscale/model/PreTrackScale.java

@@ -69,9 +69,9 @@ public class PreTrackScale implements IBasePO<String> {
     private String customerSupplierName;
 
     /**
-     * 原产地(SOURCE_AREA,VARCHAR,50)
+     * 原产地(委托货源)(SOURCE_AREA,VARCHAR,50)
      */
-    @ApiModelProperty(value="原产地",required=false)
+    @ApiModelProperty(value="原产地(委托货源)",required=false)
     private String sourceArea;
 
     /**
@@ -189,13 +189,13 @@ public class PreTrackScale implements IBasePO<String> {
     private String carrierUnitName;
 
     /**
-     * 预报类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报；4：集装箱预报（同单次预报）
+     * 委托类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报；4：集装箱预报（同单次预报）
 
 
      分检预报：火车皮上托运了几种物料，在完成计量后需修改动态轨道衡那边的数据
      ）(PREDICTION_TYPE,VARCHAR,1)
      */
-    @ApiModelProperty(value="预报类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报；4：集装箱预报（同单次预报）分检预报：火车皮上托运了几种物料，在完成计量后需修改动态轨道衡那边的数据）",required=false)
+    @ApiModelProperty(value="委托类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报；4：集装箱预报（同单次预报）分检预报：火车皮上托运了几种物料，在完成计量后需修改动态轨道衡那边的数据）",required=false)
     private String predictionType;
 
     /**
@@ -390,18 +390,6 @@ public class PreTrackScale implements IBasePO<String> {
     @ApiModelProperty(value="预报来源:物流、计量小程序、计量WEB、MES接口",required=false)
     private String predictionSource;
 
-    /**
-     * 计量码头名称(METER_PIER_NAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value="计量码头名称",required=false)
-    private String meterPierName;
-
-    /**
-     * 计量码头编号(METER_PIER_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="计量码头编号",required=false)
-    private String meterPierNo;
-
     /**
      * 创建机构名称(CREATE_DEPNAME,VARCHAR,40)
      */
@@ -415,22 +403,178 @@ public class PreTrackScale implements IBasePO<String> {
     private String createDepid;
 
     /**
-     * 物流线路描述(LINE_DESC,VARCHAR,256)
+     * 是否为当次使用预报（0为否，1为是）默认为否(LINE_DESC,VARCHAR,256)
      */
-    @ApiModelProperty(value="物流线路描述",required=false)
+    @ApiModelProperty(value="是否为当次使用预报（0为否，1为是）默认为否",required=false)
     private String lineDesc;
 
     /**
-     * 线路编号（即:作业地点）(LINE_CODE,VARCHAR,40)
+     * 主凭据号(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 lineCode;
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String receiverType;
 
     /**
-     * 船号(SHIP_NO,VARCHAR,20)
+     * 收货点备注(RECEIVER_REMARK,VARCHAR,100)
      */
-    @ApiModelProperty(value="船号",required=false)
-    private String shipNo;
+    @ApiModelProperty(value="收货点备注",required=false)
+    private String receiverRemark;
+
+    /**
+     * 委托部门名称(TRUST_DEPARTMENT_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="委托部门名称",required=false)
+    private String trustDepartmentName;
+
+    /**
+     * 签发部门编码(TRUST_DEPARTMENT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="签发部门编码",required=false)
+    private String trustDepartment;
+
+    /**
+     * 签发人(TRUSTOR,VARCHAR,30)
+     */
+    @ApiModelProperty(value="签发人",required=false)
+    private String trustor;
+
+    /**
+     * 签发时间(TRUST_DATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签发时间",required=false)
+    private Date trustDateTime;
+
+    /**
+     * 有效期截至时间(TRUST_AVAILABILITY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="有效期截至时间",required=false)
+    private Date trustAvailabilityTime;
+
+    /**
+     * 签发机器ip(TRUST_IP,VARCHAR,30)
+     */
+    @ApiModelProperty(value="签发机器ip",required=false)
+    private String trustIp;
+
+    /**
+     * 使用秤体类型(STATION_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="使用秤体类型",required=false)
+    private String stationType;
+
+    /**
+     * 使用站点编号(MEASURE_STATION,VARCHAR,30)
+     */
+    @ApiModelProperty(value="使用站点编号",required=false)
+    private String measureStation;
+
+    /**
+     * 使用站点(MEASURE_STATION_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="使用站点",required=false)
+    private String measureStationName;
+
+    /**
+     * 计量单位(AMOUNT_UNIT,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量单位",required=false)
+    private String amountUnit;
+
+    /**
+     * 委托有效天数(TRUST_DAY,DECIMAL,1)
+     */
+    @ApiModelProperty(value="委托有效天数",required=false)
+    private Short trustDay;
 
     private static final long serialVersionUID = 1L;
 
@@ -948,22 +1092,6 @@ public class PreTrackScale implements IBasePO<String> {
         this.predictionSource = predictionSource == null ? null : predictionSource.trim();
     }
 
-    public String getMeterPierName() {
-        return meterPierName;
-    }
-
-    public void setMeterPierName(String meterPierName) {
-        this.meterPierName = meterPierName == null ? null : meterPierName.trim();
-    }
-
-    public String getMeterPierNo() {
-        return meterPierNo;
-    }
-
-    public void setMeterPierNo(String meterPierNo) {
-        this.meterPierNo = meterPierNo == null ? null : meterPierNo.trim();
-    }
-
     public String getCreateDepname() {
         return createDepname;
     }
@@ -988,20 +1116,228 @@ public class PreTrackScale implements IBasePO<String> {
         this.lineDesc = lineDesc == null ? null : lineDesc.trim();
     }
 
-    public String getLineCode() {
-        return lineCode;
+    public String getVoucherIdentity() {
+        return voucherIdentity;
+    }
+
+    public void setVoucherIdentity(String voucherIdentity) {
+        this.voucherIdentity = voucherIdentity == null ? null : voucherIdentity.trim();
+    }
+
+    public String getVoucherItem() {
+        return voucherItem;
+    }
+
+    public void setVoucherItem(String voucherItem) {
+        this.voucherItem = voucherItem == null ? null : voucherItem.trim();
+    }
+
+    public String getBusinessGroup() {
+        return businessGroup;
+    }
+
+    public void setBusinessGroup(String businessGroup) {
+        this.businessGroup = businessGroup == null ? null : businessGroup.trim();
+    }
+
+    public String getTempConveyance() {
+        return tempConveyance;
+    }
+
+    public void setTempConveyance(String tempConveyance) {
+        this.tempConveyance = tempConveyance == null ? null : tempConveyance.trim();
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType == null ? null : conveyanceType.trim();
+    }
+
+    public String getResourceSystem() {
+        return resourceSystem;
+    }
+
+    public void setResourceSystem(String resourceSystem) {
+        this.resourceSystem = resourceSystem == null ? null : resourceSystem.trim();
+    }
+
+    public Long getGroupPackageAmount() {
+        return groupPackageAmount;
+    }
+
+    public void setGroupPackageAmount(Long groupPackageAmount) {
+        this.groupPackageAmount = groupPackageAmount;
+    }
+
+    public String getGroupPackageUnit() {
+        return groupPackageUnit;
+    }
+
+    public void setGroupPackageUnit(String groupPackageUnit) {
+        this.groupPackageUnit = groupPackageUnit == null ? null : groupPackageUnit.trim();
+    }
+
+    public Long getPackageAmount() {
+        return packageAmount;
+    }
+
+    public void setPackageAmount(Long packageAmount) {
+        this.packageAmount = packageAmount;
+    }
+
+    public String getPackageUnit() {
+        return packageUnit;
+    }
+
+    public void setPackageUnit(String packageUnit) {
+        this.packageUnit = packageUnit == null ? null : packageUnit.trim();
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public String getMeasureBatch() {
+        return measureBatch;
+    }
+
+    public void setMeasureBatch(String measureBatch) {
+        this.measureBatch = measureBatch == null ? null : measureBatch.trim();
+    }
+
+    public Long getMeasureBatchCount() {
+        return measureBatchCount;
+    }
+
+    public void setMeasureBatchCount(Long measureBatchCount) {
+        this.measureBatchCount = measureBatchCount;
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark == null ? null : senderRemark.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getReceiverRemark() {
+        return receiverRemark;
+    }
+
+    public void setReceiverRemark(String receiverRemark) {
+        this.receiverRemark = receiverRemark == null ? null : receiverRemark.trim();
+    }
+
+    public String getTrustDepartmentName() {
+        return trustDepartmentName;
+    }
+
+    public void setTrustDepartmentName(String trustDepartmentName) {
+        this.trustDepartmentName = trustDepartmentName == null ? null : trustDepartmentName.trim();
+    }
+
+    public String getTrustDepartment() {
+        return trustDepartment;
+    }
+
+    public void setTrustDepartment(String trustDepartment) {
+        this.trustDepartment = trustDepartment == null ? null : trustDepartment.trim();
+    }
+
+    public String getTrustor() {
+        return trustor;
+    }
+
+    public void setTrustor(String trustor) {
+        this.trustor = trustor == null ? null : trustor.trim();
+    }
+
+    public Date getTrustDateTime() {
+        return trustDateTime;
+    }
+
+    public void setTrustDateTime(Date trustDateTime) {
+        this.trustDateTime = trustDateTime;
+    }
+
+    public Date getTrustAvailabilityTime() {
+        return trustAvailabilityTime;
+    }
+
+    public void setTrustAvailabilityTime(Date trustAvailabilityTime) {
+        this.trustAvailabilityTime = trustAvailabilityTime;
+    }
+
+    public String getTrustIp() {
+        return trustIp;
+    }
+
+    public void setTrustIp(String trustIp) {
+        this.trustIp = trustIp == null ? null : trustIp.trim();
+    }
+
+    public String getStationType() {
+        return stationType;
+    }
+
+    public void setStationType(String stationType) {
+        this.stationType = stationType == null ? null : stationType.trim();
+    }
+
+    public String getMeasureStation() {
+        return measureStation;
+    }
+
+    public void setMeasureStation(String measureStation) {
+        this.measureStation = measureStation == null ? null : measureStation.trim();
+    }
+
+    public String getMeasureStationName() {
+        return measureStationName;
+    }
+
+    public void setMeasureStationName(String measureStationName) {
+        this.measureStationName = measureStationName == null ? null : measureStationName.trim();
+    }
+
+    public String getAmountUnit() {
+        return amountUnit;
     }
 
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode == null ? null : lineCode.trim();
+    public void setAmountUnit(String amountUnit) {
+        this.amountUnit = amountUnit == null ? null : amountUnit.trim();
     }
 
-    public String getShipNo() {
-        return shipNo;
+    public Short getTrustDay() {
+        return trustDay;
     }
 
-    public void setShipNo(String shipNo) {
-        this.shipNo = shipNo == null ? null : shipNo.trim();
+    public void setTrustDay(Short trustDay) {
+        this.trustDay = trustDay;
     }
 
     @Override
@@ -1073,13 +1409,37 @@ public class PreTrackScale implements IBasePO<String> {
         sb.append(", heatNo=").append(heatNo);
         sb.append(", idNum=").append(idNum);
         sb.append(", predictionSource=").append(predictionSource);
-        sb.append(", meterPierName=").append(meterPierName);
-        sb.append(", meterPierNo=").append(meterPierNo);
         sb.append(", createDepname=").append(createDepname);
         sb.append(", createDepid=").append(createDepid);
         sb.append(", lineDesc=").append(lineDesc);
-        sb.append(", lineCode=").append(lineCode);
-        sb.append(", shipNo=").append(shipNo);
+        sb.append(", voucherIdentity=").append(voucherIdentity);
+        sb.append(", voucherItem=").append(voucherItem);
+        sb.append(", businessGroup=").append(businessGroup);
+        sb.append(", tempConveyance=").append(tempConveyance);
+        sb.append(", conveyanceType=").append(conveyanceType);
+        sb.append(", resourceSystem=").append(resourceSystem);
+        sb.append(", groupPackageAmount=").append(groupPackageAmount);
+        sb.append(", groupPackageUnit=").append(groupPackageUnit);
+        sb.append(", packageAmount=").append(packageAmount);
+        sb.append(", packageUnit=").append(packageUnit);
+        sb.append(", theoryAmount=").append(theoryAmount);
+        sb.append(", measureBatch=").append(measureBatch);
+        sb.append(", measureBatchCount=").append(measureBatchCount);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", senderRemark=").append(senderRemark);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", receiverRemark=").append(receiverRemark);
+        sb.append(", trustDepartmentName=").append(trustDepartmentName);
+        sb.append(", trustDepartment=").append(trustDepartment);
+        sb.append(", trustor=").append(trustor);
+        sb.append(", trustDateTime=").append(trustDateTime);
+        sb.append(", trustAvailabilityTime=").append(trustAvailabilityTime);
+        sb.append(", trustIp=").append(trustIp);
+        sb.append(", stationType=").append(stationType);
+        sb.append(", measureStation=").append(measureStation);
+        sb.append(", measureStationName=").append(measureStationName);
+        sb.append(", amountUnit=").append(amountUnit);
+        sb.append(", trustDay=").append(trustDay);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();