Merge branch 'master' of https://git.steerinfo.com/caol/jg_wzjl_api.git

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

@@ -377,12 +377,13 @@ throw new MarkerMetException(500, "操作异常！！");
         RESTfulResult rm = failed();
         try {
             String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
+            String lcNo = param.get("lcNo") == null ? "" : param.get("lcNo").toString();
             String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
             String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
             String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
             String dataSource = param.get("dataSource") == null ? "":param.get("dataSource").toString();
             String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
-            List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayTypeNo,railwayNo, startTime, endTime, dataSource,valueFlag);
+            List<String> rows = meterWorkRailwayActFirstService.distinctCarNo(railwayTypeNo, lcNo, railwayNo, startTime, endTime, dataSource,valueFlag);
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();
@@ -396,6 +397,30 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "一次数据维护-网页", notes = "根据传入时间查询去重列次编号")
+    @PostMapping(value = "/distinctRailwayNo")
+    public RESTfulResult distinctRailwayNo(@RequestBody HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
+            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+            String dataSource = param.get("dataSource") == null ? "":param.get("dataSource").toString();
+            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(railwayTypeNo, startTime, endTime, dataSource);
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            //rm.setCode("200");
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "匹配委托-网页", notes = "根据MeterWorkRailwayActFirst对象创建")
     @PostMapping(value = "/match")
     public RESTfulResult match(@RequestBody MeterWorkRailwayActFirstDto model) {

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

@@ -45,6 +45,8 @@ public interface MeterWorkRailwayActFirstMapper extends IBaseMapper<MeterWorkRai
      */
     List<MeterWorkRailwayActFirst> distinctCarNo(HashMap<String, Object> obj);
 
+    List<MeterWorkRailwayActFirst> distinctRailwayNo(HashMap<String, Object> obj);
+
     int getDataCount(Map<String, Object> mp);
 
     void repairPre(Map<String, Object> map);

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

@@ -95,6 +95,9 @@
     <result column="NOTE" jdbcType="VARCHAR" property="note" />
     <result column="TRAIN_NUMBER_NO" jdbcType="VARCHAR" property="trainNumberNo" />
     <result column="IS_PRE_SACALE" jdbcType="VARCHAR" property="isPreSacale" />
+    <result column="HC15" jdbcType="VARCHAR" property="hc15" />
+    <result column="CANCEL_TYPE" jdbcType="VARCHAR" property="cancelType" />
+    <result column="LC_NO" jdbcType="VARCHAR" property="lcNo" />
   </resultMap>
   <sql id="columns">
     ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
@@ -113,7 +116,7 @@
     CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, 
     PACKAGE_UNIT, THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, 
     RECEIVER_TYPE, RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, 
-    DATA_SOURCE, NOTE, TRAIN_NUMBER_NO, IS_PRE_SACALE
+    DATA_SOURCE, NOTE, TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15, CANCEL_TYPE, LC_NO
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, 
@@ -134,7 +137,7 @@
     t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT, t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH, 
     t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, 
     t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.DATA_SOURCE, t.NOTE, 
-    t.TRAIN_NUMBER_NO, t.IS_PRE_SACALE
+    t.TRAIN_NUMBER_NO, t.IS_PRE_SACALE, t.HC15, t.CANCEL_TYPE, t.LC_NO
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_WORK_RAILWAY_ACT_FIRST
@@ -423,6 +426,15 @@
       <if test="isPreSacale != null and isPreSacale != ''">
         and IS_PRE_SACALE = #{isPreSacale}
       </if>
+      <if test="hc15 != null and hc15 != ''">
+        and HC15 = #{hc15}
+      </if>
+      <if test="cancelType != null and cancelType != ''">
+        and CANCEL_TYPE = #{cancelType}
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        and LC_NO = #{lcNo}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -706,6 +718,15 @@
       <if test="isPreSacale != null and isPreSacale != ''">
         and IS_PRE_SACALE LIKE '%${isPreSacale}%'
       </if>
+      <if test="hc15 != null and hc15 != ''">
+        and HC15 LIKE '%${hc15}%'
+      </if>
+      <if test="cancelType != null and cancelType != ''">
+        and CANCEL_TYPE LIKE '%${cancelType}%'
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        and LC_NO LIKE '%${lcNo}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -991,6 +1012,15 @@
       <if test="isPreSacale != null and isPreSacale != ''">
         or IS_PRE_SACALE = #{isPreSacale}
       </if>
+      <if test="hc15 != null and hc15 != ''">
+        or HC15 = #{hc15}
+      </if>
+      <if test="cancelType != null and cancelType != ''">
+        or CANCEL_TYPE = #{cancelType}
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        or LC_NO = #{lcNo}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
     insert into METER_WORK_RAILWAY_ACT_FIRST (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1024,7 +1054,8 @@
       SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
       RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
       MEASURE_TASK_NUM, DATA_SOURCE, NOTE, 
-      TRAIN_NUMBER_NO, IS_PRE_SACALE)
+      TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15, 
+      CANCEL_TYPE, LC_NO)
     values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR}, 
       #{railwaySpeed,jdbcType=DECIMAL}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
@@ -1056,7 +1087,8 @@
       #{senderType,jdbcType=VARCHAR}, #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR}, 
       #{receiverRemark,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR}, 
       #{measureTaskNum,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{trainNumberNo,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR})
+      #{trainNumberNo,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{hc15,jdbcType=VARCHAR}, 
+      #{cancelType,jdbcType=VARCHAR}, #{lcNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
     insert into METER_WORK_RAILWAY_ACT_FIRST
@@ -1340,6 +1372,15 @@
       <if test="isPreSacale != null">
         IS_PRE_SACALE,
       </if>
+      <if test="hc15 != null">
+        HC15,
+      </if>
+      <if test="cancelType != null">
+        CANCEL_TYPE,
+      </if>
+      <if test="lcNo != null">
+        LC_NO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualFirstNo != null">
@@ -1621,6 +1662,15 @@
       <if test="isPreSacale != null">
         #{isPreSacale,jdbcType=VARCHAR},
       </if>
+      <if test="hc15 != null">
+        #{hc15,jdbcType=VARCHAR},
+      </if>
+      <if test="cancelType != null">
+        #{cancelType,jdbcType=VARCHAR},
+      </if>
+      <if test="lcNo != null">
+        #{lcNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
@@ -1716,7 +1766,10 @@
       DATA_SOURCE = #{dataSource,jdbcType=VARCHAR},
       NOTE = #{note,jdbcType=VARCHAR},
       TRAIN_NUMBER_NO = #{trainNumberNo,jdbcType=VARCHAR},
-      IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR}
+      IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR},
+      HC15 = #{hc15,jdbcType=VARCHAR},
+      CANCEL_TYPE = #{cancelType,jdbcType=VARCHAR},
+      LC_NO = #{lcNo,jdbcType=VARCHAR}
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
@@ -1998,6 +2051,15 @@
       <if test="isPreSacale != null">
         IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR},
       </if>
+      <if test="hc15 != null">
+        HC15 = #{hc15,jdbcType=VARCHAR},
+      </if>
+      <if test="cancelType != null">
+        CANCEL_TYPE = #{cancelType,jdbcType=VARCHAR},
+      </if>
+      <if test="lcNo != null">
+        LC_NO = #{lcNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
@@ -2052,7 +2114,8 @@
       SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
       RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
       MEASURE_TASK_NUM, DATA_SOURCE, NOTE, 
-      TRAIN_NUMBER_NO, IS_PRE_SACALE)
+      TRAIN_NUMBER_NO, IS_PRE_SACALE, HC15, 
+      CANCEL_TYPE, LC_NO)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualFirstNo,jdbcType=VARCHAR}, 
@@ -2092,7 +2155,8 @@
       #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR}, 
       #{item.receiverRemark,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR}, 
       #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, 
-      #{item.trainNumberNo,jdbcType=VARCHAR}, #{item.isPreSacale,jdbcType=VARCHAR} from dual  
+      #{item.trainNumberNo,jdbcType=VARCHAR}, #{item.isPreSacale,jdbcType=VARCHAR}, #{item.hc15,jdbcType=VARCHAR}, 
+      #{item.cancelType,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2470,6 +2534,18 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.isPreSacale,jdbcType=VARCHAR}
        </foreach>
+       ,HC15=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.hc15,jdbcType=VARCHAR}
+       </foreach>
+       ,CANCEL_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.cancelType,jdbcType=VARCHAR}
+       </foreach>
+       ,LC_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.lcNo,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_FIRST_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualFirstNo,jdbcType=VARCHAR}
@@ -2544,32 +2620,32 @@
 
   <select id="selectAndMatch" parameterType="java.lang.String" resultMap="BaseResultMap">
     select t.ACTUAL_FIRST_NO, t1.PREDICTION_NO, t1.NOTICE_NO, t1.RAILWAY_NO, t1.RAILWAY_CARRIAGE_NO,
-    t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.RAILWAY_MODEL_NO,t.RAILWAY_MODEL_NAME, t1.MATTER_NO, t1.MATTER_NAME,
-    t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME, t1.FORWARDING_UNIT_NO,
-    t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME, t1.MATERIAL_NO,
-    t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
-    t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
-    t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
-    t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
-    t1.MATERIAL_NAME, t1.SPEC_NO, t1.SPEC_NAME, t1.SHIPMENT_GROSS_WEIGHT, t1.SHIPMENT_NET_WEIGHT,
-    t1.SHIPMENT_NUM, t.BIND_CARD_NO, t1.LOAD_POINT_NO, t1.LOAD_POINT_NAME, t1.SAMPLE_NO,
-    t1.SAMPLE_VOUCHER, t1.CARRIER_UNIT_NO, t1.CARRIER_UNIT_NAME, t1.PREDICTION_TYPE, t1.PREDICTION_COMBINATION,
-    t1.METER_TYPE_NO, t1.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO,
-    t.METER_WEIGHT, t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, t.CREATE_MAN_NO,
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS,t.data_source,
-    t.METER_GROUP, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
-    t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO,
-    t.RAILWAY_TYPE_NAME, T1.ARRIVAL, T1.STATION, T1.MEMO,T1.SOURCE_AREA
+           t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.RAILWAY_MODEL_NO,t.RAILWAY_MODEL_NAME, t1.MATTER_NO, t1.MATTER_NAME,
+           t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME, t1.FORWARDING_UNIT_NO,
+           t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME, t1.MATERIAL_NO,
+           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+           t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+           t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
+           t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
+           t1.MATERIAL_NAME, t1.SPEC_NO, t1.SPEC_NAME, t1.SHIPMENT_GROSS_WEIGHT, t1.SHIPMENT_NET_WEIGHT,
+           t1.SHIPMENT_NUM, t.BIND_CARD_NO, t1.LOAD_POINT_NO, t1.LOAD_POINT_NAME, t1.SAMPLE_NO,
+           t1.SAMPLE_VOUCHER, t1.CARRIER_UNIT_NO, t1.CARRIER_UNIT_NAME, t1.PREDICTION_TYPE, t1.PREDICTION_COMBINATION,
+           t1.METER_TYPE_NO, t1.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO,
+           t.METER_WEIGHT, t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, t.CREATE_MAN_NO,
+           t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS,t.data_source,
+           t.METER_GROUP, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
+           t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO,
+           t.RAILWAY_TYPE_NAME, T1.ARRIVAL, T1.STATION, T1.MEMO,T1.SOURCE_AREA
     from METER_WORK_RAILWAY_ACT_FIRST t,PRE_RAILWAY_SCALE t1
     where t.ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR} and t1.PREDICTION_NO= #{predictionNo,jdbcType=VARCHAR}
   </select>
   <select id="selectAndRemove" parameterType="java.lang.String" resultMap="BaseResultMap">
     select  ACTUAL_FIRST_NO,  RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, data_source,
-    RAILWAY_SPEED, RAILWAY_MODEL_NO,RAILWAY_MODEL_NAME, BIND_CARD_NO,  METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
-    WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
-    CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
-    CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME
+            RAILWAY_SPEED, RAILWAY_MODEL_NO,RAILWAY_MODEL_NAME, BIND_CARD_NO,  METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
+            WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
+            CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
+            UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+            CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME
     from METER_WORK_RAILWAY_ACT_FIRST
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}
   </select>
@@ -3149,6 +3225,9 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
+    <if test="lcNo != null and lcNo != ''">
+      and lc_No = #{lcNo}
+    </if>
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
@@ -3160,6 +3239,24 @@
     </if>
   </select>
 
+  <select id="distinctRailwayNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT distinct LC_NO
+    from METER_WORK_RAILWAY_ACT_FIRST
+    where 1=1
+    <!--and RAILWAY_NO like '%${railwayNo}%'-->
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and  RAILWAY_TYPE_NO = #{railwayTypeNo}
+    </if>
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="dataSource != null and dataSource != ''">
+      and  data_source = '${dataSource}'
+    </if>
+    and lc_no is not null
+  </select>
+
+
   <update id="repairPre" parameterType="java.util.HashMap">
     update METER_WORK_RAILWAY_ACT_FIRST set PREDICTION_NO = #{predictionNo} where ACTUAL_FIRST_NO = #{actualFirstNo}
   </update>

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

@@ -566,6 +566,24 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
     @ApiModelProperty(value="是否匹配委托(0：未匹配,1：已匹配)",required=false)
     private String isPreSacale;
 
+    /**
+     * 是否集装箱超过1.5（0：未超过,1：已超过）(HC15,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否集装箱超过1.5（0：未超过,1：已超过）",required=false)
+    private String hc15;
+
+    /**
+     * 是否委托撤销（0：正常,1:已撤销）(CANCEL_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否委托撤销（0：正常,1:已撤销）",required=false)
+    private String cancelType;
+
+    /**
+     * 列次编号(LC_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="列次编号",required=false)
+    private String lcNo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1322,6 +1340,30 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
         this.isPreSacale = isPreSacale == null ? null : isPreSacale.trim();
     }
 
+    public String getHc15() {
+        return hc15;
+    }
+
+    public void setHc15(String hc15) {
+        this.hc15 = hc15 == null ? null : hc15.trim();
+    }
+
+    public String getCancelType() {
+        return cancelType;
+    }
+
+    public void setCancelType(String cancelType) {
+        this.cancelType = cancelType == null ? null : cancelType.trim();
+    }
+
+    public String getLcNo() {
+        return lcNo;
+    }
+
+    public void setLcNo(String lcNo) {
+        this.lcNo = lcNo == null ? null : lcNo.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1421,6 +1463,9 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
         sb.append(", note=").append(note);
         sb.append(", trainNumberNo=").append(trainNumberNo);
         sb.append(", isPreSacale=").append(isPreSacale);
+        sb.append(", hc15=").append(hc15);
+        sb.append(", cancelType=").append(cancelType);
+        sb.append(", lcNo=").append(lcNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

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

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

@@ -305,9 +305,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctCarNo(String railwayTypeNo,String railwayNo, String startTime, String endTime, String dataSource,String valueFlag) {
+    public List<String> distinctCarNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String dataSource,String valueFlag) {
         HashMap<String, Object> obj = new HashMap<>();
         obj.put("railwayTypeNo", railwayTypeNo);
+        obj.put("lcNo", lcNo);
         obj.put("railwayNo", railwayNo);
         obj.put("startTime", startTime);
         obj.put("endTime", endTime);
@@ -317,6 +318,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return list;
     }
 
+    @Override
+    public List<String> distinctRailwayNo(String railwayTypeNo, String startTime, String endTime, String dataSource){
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("railwayTypeNo", railwayTypeNo);
+        obj.put("startTime", startTime);
+        obj.put("endTime", endTime);
+        obj.put("dataSource", dataSource);
+        List<MeterWorkRailwayActFirst> templist = meterWorkRailwayActFirstMapper.distinctRailwayNo(obj);
+        List<String> list = null;
+        if(templist.size() != 0)
+        {
+            list = templist.stream().map(MeterWorkRailwayActFirst::getLcNo).collect(Collectors.toList());
+        }
+        return list;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<MeterWorkRailwayActFirst> selectAct(HashMap parmas, Integer pageNum, Integer pageSize) {

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

@@ -104,6 +104,7 @@
     <result column="DATA_SOURCE" jdbcType="VARCHAR" property="dataSource" />
     <result column="NOTE" jdbcType="VARCHAR" property="note" />
     <result column="IS_PRE_SACALE" jdbcType="VARCHAR" property="isPreSacale" />
+    <result column="IC_NO" jdbcType="VARCHAR" property="icNo" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
@@ -123,7 +124,7 @@
     GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT, 
     MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, RECEIVER_REMARK, 
     AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, CREATE_TIME, 
-    DATA_SOURCE, NOTE, IS_PRE_SACALE
+    DATA_SOURCE, NOTE, IS_PRE_SACALE, IC_NO
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, 
@@ -145,7 +146,7 @@
     t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH, t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, 
     t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, 
     t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DATA_SOURCE, 
-    t.NOTE, t.IS_PRE_SACALE
+    t.NOTE, t.IS_PRE_SACALE, t.IC_NO
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_WORK_RAILWAY_ACTUAL
@@ -461,8 +462,8 @@
       <if test="isPreSacale != null and isPreSacale != ''">
         and IS_PRE_SACALE = #{isPreSacale}
       </if>
-      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-        and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      <if test="icNo != null and icNo != ''">
+        and IC_NO = #{icNo}
       </if>
     </where>
   </sql>
@@ -774,8 +775,8 @@
       <if test="isPreSacale != null and isPreSacale != ''">
         and IS_PRE_SACALE LIKE '%${isPreSacale}%'
       </if>
-      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-        and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      <if test="icNo != null and icNo != ''">
+        and IC_NO LIKE '%${icNo}%'
       </if>
     </where>
   </sql>
@@ -1089,6 +1090,9 @@
       <if test="isPreSacale != null and isPreSacale != ''">
         or IS_PRE_SACALE = #{isPreSacale}
       </if>
+      <if test="icNo != null and icNo != ''">
+        or IC_NO = #{icNo}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_RAILWAY_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1125,7 +1129,8 @@
       RECEIVER_TYPE, RECEIVER_REMARK, AMOUNT_UNIT, 
       MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, 
       CREATE_MAN_NAME, CREATE_TIME, DATA_SOURCE, 
-      NOTE, IS_PRE_SACALE)
+      NOTE, IS_PRE_SACALE, IC_NO
+      )
     values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
       #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
@@ -1160,7 +1165,8 @@
       #{receiverType,jdbcType=VARCHAR}, #{receiverRemark,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, 
       #{measureObjectType,jdbcType=VARCHAR}, #{measureTaskNum,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, 
       #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{dataSource,jdbcType=VARCHAR}, 
-      #{note,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR})
+      #{note,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{icNo,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_RAILWAY_ACTUAL
@@ -1471,6 +1477,9 @@
       <if test="isPreSacale != null">
         IS_PRE_SACALE,
       </if>
+      <if test="icNo != null">
+        IC_NO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -1779,6 +1788,9 @@
       <if test="isPreSacale != null">
         #{isPreSacale,jdbcType=VARCHAR},
       </if>
+      <if test="icNo != null">
+        #{icNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -1883,7 +1895,8 @@
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       DATA_SOURCE = #{dataSource,jdbcType=VARCHAR},
       NOTE = #{note,jdbcType=VARCHAR},
-      IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR}
+      IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR},
+      IC_NO = #{icNo,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -2192,6 +2205,9 @@
       <if test="isPreSacale != null">
         IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR},
       </if>
+      <if test="icNo != null">
+        IC_NO = #{icNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
@@ -2247,7 +2263,7 @@
       RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
       MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
       CREATE_TIME, DATA_SOURCE, NOTE, 
-      IS_PRE_SACALE)
+      IS_PRE_SACALE, IC_NO)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
@@ -2288,7 +2304,7 @@
       #{item.receiverRemark,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR}, 
       #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.billType,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
       #{item.createTime,jdbcType=TIMESTAMP}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, 
-      #{item.isPreSacale,jdbcType=VARCHAR} from dual  
+      #{item.isPreSacale,jdbcType=VARCHAR}, #{item.icNo,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2702,6 +2718,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.isPreSacale,jdbcType=VARCHAR}
        </foreach>
+       ,IC_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.icNo,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualNo,jdbcType=VARCHAR}
@@ -2716,10 +2736,6 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <sql id="whereTime">
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -2778,24 +2794,24 @@
 
   <select id="manualAdd" parameterType="java.lang.String" resultMap="BaseResultMap">
     select t1.prediction_no PREDICTION_NO, t1.notice_no NOTICE_NO, t1.railway_no RAILWAY_NO, t1.railway_carriage_no RAILWAY_CARRIAGE_NO, t1.matter_no MATTER_NO,
-       t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
-       t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
-       t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,
-       t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
-       t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
-       t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
-       t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,t1.data_source,
-       t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
-       t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
-       t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
-       t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
-       t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t1.railway_type_no RAILWAY_TYPE_NO,t1.railway_type_name RAILWAY_TYPE_NAME,
-       t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-       t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE
-       ,t2.arrival ARRIVAL, t2.station STATION,t2.memo MEMO,t2.source_area SOURCE_AREA
+           t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
+           t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
+           t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,
+           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+           t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+           t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
+           t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,t1.data_source,
+           t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
+           t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
+           t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
+           t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
+           t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t1.railway_type_no RAILWAY_TYPE_NO,t1.railway_type_name RAILWAY_TYPE_NAME,
+           t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
+           t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE
+            ,t2.arrival ARRIVAL, t2.station STATION,t2.memo MEMO,t2.source_area SOURCE_AREA
     from METER_WORK_RAILWAY_ACT_FIRST t1,METER_WORK_RAILWAY_ACT_FIRST t2
     where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR}
- </select>
+  </select>
 
   <select id="manualAddPre" parameterType="java.lang.String" resultMap="BaseResultMap">
     select T3.prediction_no PREDICTION_NO, T3.notice_no NOTICE_NO, T3.railway_no RAILWAY_NO, T3.railway_carriage_no RAILWAY_CARRIAGE_NO, T3.matter_no MATTER_NO,
@@ -2837,7 +2853,7 @@
            t.upload_man_no,t.upload_man_name,t.upload_time,t.sample_no,t.railway_type_no,t.data_source,
            t.railway_type_name, t.memo,t.water_num,t1.arrival,t1.station,t.update_man_no,
            t.update_man_name, t.update_time,t.source_area
-      from meter_work_railway_actual t, pre_railway_scale t1 where t.actual_no = #{actualNo,jdbcType=VARCHAR} and t1.prediction_no = #{predictionNo,jdbcType=VARCHAR}
+    from meter_work_railway_actual t, pre_railway_scale t1 where t.actual_no = #{actualNo,jdbcType=VARCHAR} and t1.prediction_no = #{predictionNo,jdbcType=VARCHAR}
   </select>
 
   <select id="cleanPredcition" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -2854,19 +2870,19 @@
   </select>
 
   <select id="tareAdd" parameterType="java.lang.String" resultMap="BaseResultMap">
-   select t1.prediction_no PREDICTION_NO, t1.notice_no NOTICE_NO, t1.railway_no RAILWAY_NO, t1.railway_carriage_no RAILWAY_CARRIAGE_NO, t1.matter_no MATTER_NO,
-       t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
-       t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
-       t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,t1.data_source,
-       t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
-       t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
-       t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
-       t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
-       t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t1.railway_type_no RAILWAY_TYPE_NO,t1.railway_type_name RAILWAY_TYPE_NAME,
-       t2.railway_pk ACTUAL_FIRST2_NO, t2.railway_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME
+    select t1.prediction_no PREDICTION_NO, t1.notice_no NOTICE_NO, t1.railway_no RAILWAY_NO, t1.railway_carriage_no RAILWAY_CARRIAGE_NO, t1.matter_no MATTER_NO,
+           t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
+           t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
+           t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,t1.data_source,
+           t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
+           t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
+           t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
+           t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
+           t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t1.railway_type_no RAILWAY_TYPE_NO,t1.railway_type_name RAILWAY_TYPE_NAME,
+           t2.railway_pk ACTUAL_FIRST2_NO, t2.railway_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME
     from METER_WORK_RAILWAY_ACT_FIRST t1,METER_BASE_RAILWAY_WEIGHT t2
     where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.railway_pk=#{dataNo,jdbcType=VARCHAR}
- </select>
+  </select>
 
   <!--结净数据查询-->
   <select id="selectDiff" parameterType="java.util.HashMap" resultMap="BaseResultMap">
@@ -3545,12 +3561,12 @@
   </insert>
 
   <select id="getGrossAvg"  parameterType="java.util.HashMap" resultType="java.lang.Double">
-select nvl(round(avg(gross_weight / 1000), 2),0)
-  from METER_WORK_RAILWAY_ACTUAL
- where matter_no = #{matterNo}
-   and net_time between to_date(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and
-       to_date(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-   and net_spot3_no = #{netSpot3No}
+    select nvl(round(avg(gross_weight / 1000), 2),0)
+    from METER_WORK_RAILWAY_ACTUAL
+    where matter_no = #{matterNo}
+      and net_time between to_date(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and
+      to_date(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and net_spot3_no = #{netSpot3No}
   </select>
 
   <!-- 查询：根据传入时间和车号，查询给定时间段去重车号 -->
@@ -3567,8 +3583,8 @@ select nvl(round(avg(gross_weight / 1000), 2),0)
   </select>
 
   <select id="selectActual" parameterType="java.lang.String" resultMap="BaseResultMap">
-      SELECT *
-      from METER_WORK_RAILWAY_ACTUAL
-      where ACTUAL_FIRST1_NO = #{actualFirstNo} or ACTUAL_FIRST2_NO = #{actualFirstNo}
-    </select>
+    SELECT *
+    from METER_WORK_RAILWAY_ACTUAL
+    where ACTUAL_FIRST1_NO = #{actualFirstNo} or ACTUAL_FIRST2_NO = #{actualFirstNo}
+  </select>
 </mapper>

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

@@ -620,6 +620,12 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="是否匹配委托(0：未匹配,1：已匹配)",required=false)
     private String isPreSacale;
 
+    /**
+     * 列次编号(IC_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="列次编号",required=false)
+    private String icNo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1448,6 +1454,14 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.isPreSacale = isPreSacale == null ? null : isPreSacale.trim();
     }
 
+    public String getIcNo() {
+        return icNo;
+    }
+
+    public void setIcNo(String icNo) {
+        this.icNo = icNo == null ? null : icNo.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1556,6 +1570,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", dataSource=").append(dataSource);
         sb.append(", note=").append(note);
         sb.append(", isPreSacale=").append(isPreSacale);
+        sb.append(", icNo=").append(icNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();