后端修改

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java

@@ -53,7 +53,6 @@ public class MeterBaseRailwayAiweightServiceImpl extends BaseServiceImpl<MeterBa
             for(MeterBaseRailwayAiweight model: models) {
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("railwayNo", model.getRailwayNo());
-                map.put("valueFlag", "0");
                 List<MeterBaseRailwayAiweight> AiModels =  meterBaseRailwayAiweightMapper.selectByParameters(map);
                 if(AiModels.size() >= 1) {
                     model.setActualFirstNo(AiModels.get(0).getActualFirstNo());

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

@@ -7096,8 +7096,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 //                        }
 //                    }
                     //作废AI标志皮
-                    AiWeightModel.setValueFlag("1");
-                    meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AiWeightModel);
+//                    AiWeightModel.setValueFlag("1");
+//                    meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AiWeightModel);
 
                     //从表赋值grossModel、AI也赋值tareModel并修改重量
                     BeanUtils.copyProperties(receivedModel, grossModel);
@@ -7163,6 +7163,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetManNo(userId);
                     actualRow.setNetManName(userName);
                     actualRow.setNetTime(new Date());
+                    actualRow.setMemo("标识皮结净");
                     actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -7279,7 +7280,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     grossModel.setValueFlag(DbConstants.NET);
                     grossModel.setWeightType("0");
-                    grossModel.setNote("标准皮匹配委托结净更新");
+                    grossModel.setNote("规则皮匹配委托结净更新");
                     grossModel.setIsPreSacale("1");
                     grossModel.setPredictionNo(railwayScale.getPredictionNo());
                     grossModel.setPredictionType("1");
@@ -7303,7 +7304,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setTareWeight(tareModel.getMeterWeight());
                     actualRow.setNetTime(new Date());
                     actualRow.setNetMode(DbConstants.TYPE);
-                    actualRow.setNote("标准皮配委托结净更新");
+                    actualRow.setNote("规则皮配委托结净更新");
                     actualRow.setNetMode("2");
                     actualRow.setUploadFlag("0");
                     actualRow.setIsPreSacale("1");
@@ -7334,6 +7335,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetManNo(userId);
                     actualRow.setNetManName(userName);
                     actualRow.setNetTime(new Date());
+                    actualRow.setMemo("规则皮结净");
                     actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -7520,6 +7522,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setUpdateManNo(userId);
                     actualRow.setUpdateManName(userName);
                     actualRow.setUpdateTime(new Date());
+                    actualRow.setMemo("回空皮结净");
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                     //更新预报数
@@ -7689,6 +7692,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetManNo(userId);
                     actualRow.setNetManName(userName);
                     actualRow.setNetTime(new Date());
+                    actualRow.setMemo("历史皮结净");
                     actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 

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

@@ -112,6 +112,7 @@
     <result column="CONTRACT_ID" jdbcType="VARCHAR" property="contractId" />
     <result column="IS_BOUND_LIST_DOWNLOADED" jdbcType="VARCHAR" property="isBoundListDownloaded" />
     <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
+    <result column="is_auto_publish" jdbcType="VARCHAR" property="isAutoPublish" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
@@ -132,7 +133,8 @@
     MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, RECEIVER_REMARK, 
     AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, CREATE_TIME, 
     DATA_SOURCE, NOTE, IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, PREDICTION_COMBINATION, 
-    BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID
+    BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
+    is_auto_publish
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, 
@@ -155,7 +157,7 @@
     t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, 
     t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DATA_SOURCE, 
     t.NOTE, t.IS_PRE_SACALE, t.LC_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.BOUND_LIST_URL, 
-    t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID
+    t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.is_auto_publish
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_RAILWAY_ACTUAL
@@ -495,6 +497,9 @@
       <if test="documentId != null and documentId != ''">
         and DOCUMENT_ID = #{documentId}
       </if>
+      <if test="isAutoPublish != null and isAutoPublish != ''">
+        and is_auto_publish = #{isAutoPublish}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -829,6 +834,9 @@
       <if test="documentId != null and documentId != ''">
         and DOCUMENT_ID LIKE '%${documentId}%'
       </if>
+      <if test="isAutoPublish != null and isAutoPublish != ''">
+        and is_auto_publish LIKE '%${isAutoPublish}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -1165,6 +1173,9 @@
       <if test="documentId != null and documentId != ''">
         or DOCUMENT_ID = #{documentId}
       </if>
+      <if test="isAutoPublish != null and isAutoPublish != ''">
+        or is_auto_publish = #{isAutoPublish}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_RAILWAY_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1204,7 +1215,8 @@
       NOTE, IS_PRE_SACALE, LC_NO, 
       PREDICTION_TYPE, PREDICTION_COMBINATION, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID)
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, is_auto_publish
+      )
     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}, 
@@ -1242,7 +1254,8 @@
       #{note,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{lcNo,jdbcType=VARCHAR}, 
       #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR}, 
       #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
-      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR})
+      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{isAutoPublish,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_RAILWAY_ACTUAL
@@ -1577,6 +1590,9 @@
       <if test="documentId != null">
         DOCUMENT_ID,
       </if>
+      <if test="isAutoPublish != null">
+        is_auto_publish,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -1909,6 +1925,9 @@
       <if test="documentId != null">
         #{documentId,jdbcType=VARCHAR},
       </if>
+      <if test="isAutoPublish != null">
+        #{isAutoPublish,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -2021,7 +2040,8 @@
       IS_BOUND_LIST = #{isBoundList,jdbcType=VARCHAR},
       CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
       IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR},
-      DOCUMENT_ID = #{documentId,jdbcType=VARCHAR}
+      DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
+      is_auto_publish = #{isAutoPublish,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -2354,6 +2374,9 @@
       <if test="documentId != null">
         DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
       </if>
+      <if test="isAutoPublish != null">
+        is_auto_publish = #{isAutoPublish,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
@@ -2412,7 +2435,7 @@
       IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, 
       PREDICTION_COMBINATION, BOUND_LIST_URL, 
       IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, 
-      DOCUMENT_ID)
+      DOCUMENT_ID, is_auto_publish)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
@@ -2456,7 +2479,7 @@
       #{item.isPreSacale,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, 
       #{item.predictionCombination,jdbcType=VARCHAR}, #{item.boundListUrl,jdbcType=VARCHAR}, 
       #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, #{item.isBoundListDownloaded,jdbcType=VARCHAR}, 
-      #{item.documentId,jdbcType=VARCHAR} from dual  
+      #{item.documentId,jdbcType=VARCHAR}, #{item.isAutoPublish,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2902,6 +2925,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.documentId,jdbcType=VARCHAR}
        </foreach>
+       ,is_auto_publish=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.isAutoPublish,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
@@ -3775,7 +3802,7 @@
     </if>
     <if test="grossLcNo != null and grossLcNo != ''">
       and actual_first1_no in (
-            select B.actual_first_no from meter_work_railway_act_first B where B.lc_no = #{grossLcNo}
+      select B.actual_first_no from meter_work_railway_act_first B where B.lc_no = #{grossLcNo}
       )
     </if>
     <if test="tareLcNo != null and tareLcNo != ''">
@@ -3787,9 +3814,9 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
-<!--    <if test="lcNo != null and lcNo != ''">-->
-<!--      and lc_No like '%${lcNo}%'-->
-<!--    </if>-->
+    <!--    <if test="lcNo != null and lcNo != ''">-->
+    <!--      and lc_No like '%${lcNo}%'-->
+    <!--    </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>
@@ -3928,7 +3955,7 @@
       and  lc_No like '%${lcNo}%'
     </if>
     and value_flag != '0'
---     and lc_no is not null
+    --     and lc_no is not null
     order by net_time desc
   </select>
 
@@ -3947,243 +3974,243 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     <where>
-        1 = 1
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-          and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
-        <if test="actualNo != null and actualNo != ''">
-          and ACTUAL_NO LIKE '%${actualNo}%'
-        </if>
-        <if test="predictionNo != null and predictionNo != ''">
-          and PREDICTION_NO LIKE '%${predictionNo}%'
-        </if>
-        <if test="noticeNo != null and noticeNo != ''">
-          and NOTICE_NO LIKE '%${noticeNo}%'
-        </if>
-        <if test="railwayNo != null and railwayNo != ''">
-          and RAILWAY_NO LIKE '%${railwayNo}%'
-        </if>
-        <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-          and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
-        </if>
-        <if test="matterNo != null and matterNo != ''">
-          and MATTER_NO LIKE '%${matterNo}%'
-        </if>
-        <if test="matterName != null and matterName != ''">
-          and MATTER_NAME LIKE '%${matterName}%'
-        </if>
-        <if test="contractNo != null and contractNo != ''">
-          and CONTRACT_NO LIKE '%${contractNo}%'
-        </if>
-        <if test="batchNo != null and batchNo != ''">
-          and BATCH_NO LIKE '%${batchNo}%'
-        </if>
-        <if test="customerSupplierNo != null and customerSupplierNo != ''">
-          and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
-        </if>
-        <if test="customerSupplierName != null and customerSupplierName != ''">
-          and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
-        </if>
-        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-          and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-        </if>
-        <if test="forwardingUnitName != null and forwardingUnitName != ''">
-          and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-        </if>
-        <if test="receivingUintNo != null and receivingUintNo != ''">
-          and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-        </if>
-        <if test="receivingUintName != null and receivingUintName != ''">
-          and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-        </if>
-        <if test="materialNo != null and materialNo != ''">
-          and MATERIAL_NO LIKE '%${materialNo}%'
-        </if>
-        <if test="materialName != null and materialName != ''">
-          and MATERIAL_NAME LIKE '%${materialName}%'
-        </if>
-        <if test="specNo != null and specNo != ''">
-          and SPEC_NO LIKE '%${specNo}%'
-        </if>
-        <if test="specName != null and specName != ''">
-          and SPEC_NAME LIKE '%${specName}%'
-        </if>
-        <if test="loadPointNo != null and loadPointNo != ''">
-          and LOAD_POINT_NO LIKE '%${loadPointNo}%'
-        </if>
-        <if test="loadPointName != null and loadPointName != ''">
-          and LOAD_POINT_NAME LIKE '%${loadPointName}%'
-        </if>
-        <if test="sampleVoucher != null and sampleVoucher != ''">
-          and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
-        </if>
-        <if test="carrierUnitNo != null and carrierUnitNo != ''">
-          and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
-        </if>
-        <if test="carrierUnitName != null and carrierUnitName != ''">
-          and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
-        </if>
-        <if test="meterTypeNo != null and meterTypeNo != ''">
-          and METER_TYPE_NO LIKE '%${meterTypeNo}%'
-        </if>
-        <if test="meterTypeName != null and meterTypeName != ''">
-          and METER_TYPE_NAME LIKE '%${meterTypeName}%'
-        </if>
-        <if test="meterProcessNo != null and meterProcessNo != ''">
-          and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
-        </if>
-        <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-          and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
-        </if>
-        <if test="actualFirst1No != null and actualFirst1No != ''">
-          and ACTUAL_FIRST1_NO LIKE '%${actualFirst1No}%'
-        </if>
-        <if test="grossWeight != null">
-          and GROSS_WEIGHT = #{grossWeight}
-        </if>
-        <if test="grossManNo != null and grossManNo != ''">
-          and GROSS_MAN_NO LIKE '%${grossManNo}%'
-        </if>
-        <if test="grossManName != null and grossManName != ''">
-          and GROSS_MAN_NAME LIKE '%${grossManName}%'
-        </if>
-        <if test="grossTime != null">
-          and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
-        </if>
-        <if test="baseSpot1No != null and baseSpot1No != ''">
-          and BASE_SPOT1_NO LIKE '%${baseSpot1No}%'
-        </if>
-        <if test="baseSpot1Name != null and baseSpot1Name != ''">
-          and BASE_SPOT1_NAME LIKE '%${baseSpot1Name}%'
-        </if>
-        <if test="grossClass != null and grossClass != ''">
-          and GROSS_CLASS LIKE '%${grossClass}%'
-        </if>
-        <if test="grossGroup != null and grossGroup != ''">
-          and GROSS_GROUP LIKE '%${grossGroup}%'
-        </if>
-        <if test="grossMode != null and grossMode != ''">
-          and GROSS_MODE LIKE '%${grossMode}%'
-        </if>
-        <if test="actualFirst2No != null and actualFirst2No != ''">
-          and ACTUAL_FIRST2_NO LIKE '%${actualFirst2No}%'
-        </if>
-        <if test="tareWeight != null">
-          and TARE_WEIGHT = #{tareWeight}
-        </if>
-        <if test="tareManNo != null and tareManNo != ''">
-          and TARE_MAN_NO LIKE '%${tareManNo}%'
-        </if>
-        <if test="tareManName != null and tareManName != ''">
-          and TARE_MAN_NAME LIKE '%${tareManName}%'
-        </if>
-        <if test="tareTime != null">
-          and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
-        </if>
-        <if test="baseSpot2No != null and baseSpot2No != ''">
-          and BASE_SPOT2_NO LIKE '%${baseSpot2No}%'
-        </if>
-        <if test="baseSpot2Name != null and baseSpot2Name != ''">
-          and BASE_SPOT2_NAME LIKE '%${baseSpot2Name}%'
-        </if>
-        <if test="tareClass != null and tareClass != ''">
-          and TARE_CLASS LIKE '%${tareClass}%'
-        </if>
-        <if test="tareGroup != null and tareGroup != ''">
-          and TARE_GROUP LIKE '%${tareGroup}%'
-        </if>
-        <if test="tareMode != null and tareMode != ''">
-          and TARE_MODE LIKE '%${tareMode}%'
-        </if>
-        <if test="netWeight != null">
-          and NET_WEIGHT = #{netWeight}
-        </if>
-        <if test="netManNo != null and netManNo != ''">
-          and NET_MAN_NO LIKE '%${netManNo}%'
-        </if>
-        <if test="netManName != null and netManName != ''">
-          and NET_MAN_NAME LIKE '%${netManName}%'
-        </if>
-        <if test="netTime != null">
-          and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-        </if>
-        <if test="netSpot3No != null and netSpot3No != ''">
-          and NET_SPOT3_NO LIKE '%${netSpot3No}%'
-        </if>
-        <if test="netSpot3Name != null and netSpot3Name != ''">
-          and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
-        </if>
-        <if test="netMode != null and netMode != ''">
-          and NET_MODE LIKE '%${netMode}%'
-        </if>
-        <if test="valueFlag != null and valueFlag != ''">
-          and VALUE_FLAG LIKE '%${valueFlag}%'
-        </if>
-        <if test="uploadFlag != null and uploadFlag != ''">
-          and UPLOAD_FLAG LIKE '%${uploadFlag}%'
-        </if>
-        <if test="sampleNo != null and sampleNo != ''">
-          and SAMPLE_NO LIKE '%${sampleNo}%'
-        </if>
-        <if test="railwayTypeNo != null and railwayTypeNo != ''">
-          and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
-        </if>
-        <if test="railwayTypeName != null and railwayTypeName != ''">
-          and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
-        </if>
-        <if test="waterNum != null">
-          and WATER_NUM = #{waterNum}
-        </if>
-        <if test="arrival != null and arrival != ''">
-          and ARRIVAL LIKE '%${arrival}%'
-        </if>
-        <if test="station != null and station != ''">
-          and STATION LIKE '%${station}%'
-        </if>
-        <if test="senderType != null and senderType != ''">
-          and SENDER_TYPE LIKE '%${senderType}%'
-        </if>
-        <if test="senderRemark != null and senderRemark != ''">
-          and SENDER_REMARK LIKE '%${senderRemark}%'
-        </if>
-        <if test="receiverRemark != null and receiverRemark != ''">
-          and RECEIVER_REMARK LIKE '%${receiverRemark}%'
-        </if>
-        <if test="dataSource != null and dataSource != ''">
-          and DATA_SOURCE LIKE '%${dataSource}%'
-        </if>
-        <if test="isPreSacale != null and isPreSacale != ''">
-          and IS_PRE_SACALE LIKE '%${isPreSacale}%'
-        </if>
-        <if test="lcNo != null and lcNo != ''">
-          and LC_NO LIKE '%${lcNo}%'
-        </if>
-        <if test="baseSpotNo != null and baseSpotNo != ''">
-          and NET_SPOT3_NO LIKE '%${baseSpotNo}%'
-        </if>
-        <if test="baseSpotName != null and baseSpotName != ''">
-          and NET_SPOT3_NAME LIKE '%${baseSpotName}%'
-        </if>
-        <if test="lcNoTemp != null and lcNoTemp != ''">
-          and ( lc_no in
-          <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
-            #{item}
-          </foreach>
-          <if test="lcNoNull != null and lcNoNull != ''">
-            or lc_no is null )
-          </if>
-          <if test="lcNoNull == null or lcNoNull == ''">
-            and lc_no is not null)
-          </if>
-        </if>
-        <if test="predictionType != null and predictionType != ''">
-          and PREDICTION_TYPE LIKE '%${predictionType}%'
+      1 = 1
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="actualNo != null and actualNo != ''">
+        and ACTUAL_NO LIKE '%${actualNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        and NOTICE_NO LIKE '%${noticeNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+        and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="contractNo != null and contractNo != ''">
+        and CONTRACT_NO LIKE '%${contractNo}%'
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        and BATCH_NO LIKE '%${batchNo}%'
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO LIKE '%${materialNo}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="specNo != null and specNo != ''">
+        and SPEC_NO LIKE '%${specNo}%'
+      </if>
+      <if test="specName != null and specName != ''">
+        and SPEC_NAME LIKE '%${specName}%'
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        and LOAD_POINT_NO LIKE '%${loadPointNo}%'
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="meterProcessNo != null and meterProcessNo != ''">
+        and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
+      </if>
+      <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+        and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
+      </if>
+      <if test="actualFirst1No != null and actualFirst1No != ''">
+        and ACTUAL_FIRST1_NO LIKE '%${actualFirst1No}%'
+      </if>
+      <if test="grossWeight != null">
+        and GROSS_WEIGHT = #{grossWeight}
+      </if>
+      <if test="grossManNo != null and grossManNo != ''">
+        and GROSS_MAN_NO LIKE '%${grossManNo}%'
+      </if>
+      <if test="grossManName != null and grossManName != ''">
+        and GROSS_MAN_NAME LIKE '%${grossManName}%'
+      </if>
+      <if test="grossTime != null">
+        and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
+      </if>
+      <if test="baseSpot1No != null and baseSpot1No != ''">
+        and BASE_SPOT1_NO LIKE '%${baseSpot1No}%'
+      </if>
+      <if test="baseSpot1Name != null and baseSpot1Name != ''">
+        and BASE_SPOT1_NAME LIKE '%${baseSpot1Name}%'
+      </if>
+      <if test="grossClass != null and grossClass != ''">
+        and GROSS_CLASS LIKE '%${grossClass}%'
+      </if>
+      <if test="grossGroup != null and grossGroup != ''">
+        and GROSS_GROUP LIKE '%${grossGroup}%'
+      </if>
+      <if test="grossMode != null and grossMode != ''">
+        and GROSS_MODE LIKE '%${grossMode}%'
+      </if>
+      <if test="actualFirst2No != null and actualFirst2No != ''">
+        and ACTUAL_FIRST2_NO LIKE '%${actualFirst2No}%'
+      </if>
+      <if test="tareWeight != null">
+        and TARE_WEIGHT = #{tareWeight}
+      </if>
+      <if test="tareManNo != null and tareManNo != ''">
+        and TARE_MAN_NO LIKE '%${tareManNo}%'
+      </if>
+      <if test="tareManName != null and tareManName != ''">
+        and TARE_MAN_NAME LIKE '%${tareManName}%'
+      </if>
+      <if test="tareTime != null">
+        and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
+      </if>
+      <if test="baseSpot2No != null and baseSpot2No != ''">
+        and BASE_SPOT2_NO LIKE '%${baseSpot2No}%'
+      </if>
+      <if test="baseSpot2Name != null and baseSpot2Name != ''">
+        and BASE_SPOT2_NAME LIKE '%${baseSpot2Name}%'
+      </if>
+      <if test="tareClass != null and tareClass != ''">
+        and TARE_CLASS LIKE '%${tareClass}%'
+      </if>
+      <if test="tareGroup != null and tareGroup != ''">
+        and TARE_GROUP LIKE '%${tareGroup}%'
+      </if>
+      <if test="tareMode != null and tareMode != ''">
+        and TARE_MODE LIKE '%${tareMode}%'
+      </if>
+      <if test="netWeight != null">
+        and NET_WEIGHT = #{netWeight}
+      </if>
+      <if test="netManNo != null and netManNo != ''">
+        and NET_MAN_NO LIKE '%${netManNo}%'
+      </if>
+      <if test="netManName != null and netManName != ''">
+        and NET_MAN_NAME LIKE '%${netManName}%'
+      </if>
+      <if test="netTime != null">
+        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+      </if>
+      <if test="netMode != null and netMode != ''">
+        and NET_MODE LIKE '%${netMode}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG LIKE '%${uploadFlag}%'
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        and SAMPLE_NO LIKE '%${sampleNo}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="waterNum != null">
+        and WATER_NUM = #{waterNum}
+      </if>
+      <if test="arrival != null and arrival != ''">
+        and ARRIVAL LIKE '%${arrival}%'
+      </if>
+      <if test="station != null and station != ''">
+        and STATION LIKE '%${station}%'
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK LIKE '%${senderRemark}%'
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        and DATA_SOURCE LIKE '%${dataSource}%'
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE LIKE '%${isPreSacale}%'
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        and LC_NO LIKE '%${lcNo}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and NET_SPOT3_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and NET_SPOT3_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="lcNoTemp != null and lcNoTemp != ''">
+        and ( lc_no in
+        <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+        <if test="lcNoNull != null and lcNoNull != ''">
+          or lc_no is null )
         </if>
-        <if test="flag != null and flag !=''">
-          and ( lc_no is null or lc_no = '无列次' )
+        <if test="lcNoNull == null or lcNoNull == ''">
+          and lc_no is not null)
         </if>
-      </where>
-      and value_flag != '0'
+      </if>
+      <if test="predictionType != null and predictionType != ''">
+        and PREDICTION_TYPE LIKE '%${predictionType}%'
+      </if>
+      <if test="flag != null and flag !=''">
+        and ( lc_no is null or lc_no = '无列次' )
+      </if>
+    </where>
+    and value_flag != '0'
     order by net_time desc
   </select>
 
@@ -4304,9 +4331,9 @@
         )
       </if>
       <if test="tareLcNo != null and tareLcNo != ''">
-      and actual_first2_no in (
-            select C.actual_first_no from meter_work_railway_act_first C where C.lc_no = #{tareLcNo}
-      )
+        and actual_first2_no in (
+        select C.actual_first_no from meter_work_railway_act_first C where C.lc_no = #{tareLcNo}
+        )
       </if>
     </where>
     and value_flag != '0'
@@ -4322,113 +4349,113 @@
   <select id="autoPrintRailway" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 = 1
-        <if test="railwayNo != null and railwayNo != ''">
-            and railway_no like '%railwayNo%'
-        </if>
-        and forwarding_unit_no in
-        <foreach collection="list" item="id" separator="," open="(" close=")">
-          #{id}
-        </foreach>
-        <if test="matterNo != null and matterNo != ''">
-          and MATTER_NO LIKE '%${matterNo}%'
-        </if>
-        <if test="matterName != null and matterName != ''">
-          and MATTER_NAME LIKE '%${matterName}%'
-        </if>
-        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-          and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-        </if>
-        <if test="forwardingUnitName != null and forwardingUnitName != ''">
-          and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-        </if>
-        <if test="receivingUintNo != null and receivingUintNo != ''">
-          and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-        </if>
-        <if test="receivingUintName != null and receivingUintName != ''">
-          and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-        </if>
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-          and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
-        <if test="netSpot3No != null and netSpot3No != ''">
-          and NET_SPOT3_NO LIKE '%${netSpot3No}%'
-        </if>
-        <if test="netSpot3Name != null and netSpot3Name != ''">
-          and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
-        </if>
-        and value_flag != '0'
+    <if test="railwayNo != null and railwayNo != ''">
+      and railway_no like '%railwayNo%'
+    </if>
+    and forwarding_unit_no in
+    <foreach collection="list" item="id" separator="," open="(" close=")">
+      #{id}
+    </foreach>
+    <if test="matterNo != null and matterNo != ''">
+      and MATTER_NO LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and MATTER_NAME LIKE '%${matterName}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="netSpot3No != null and netSpot3No != ''">
+      and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+    </if>
+    <if test="netSpot3Name != null and netSpot3Name != ''">
+      and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+    </if>
+    and value_flag != '0'
     order by net_time desc
   </select>
 
   <select id="batchMatchActualView" parameterType="java.util.HashMap" resultType="HashMap">
-    select A.lc_no,
-    A.actual_no actual_no,
-    A.railway_no railway_no,
-    A.prediction_no prediction_no,
-    A.matter_name matter_name,
-    A.forwarding_unit_name forwarding_unit_name,
-    A.receiving_uint_name receiving_uint_name,
-    A.actual_first1_no grossNo,
-    to_char(round(A.gross_weight / 1000,3),'FM9999999999999999.000') grossWeight,
-    A.gross_time grossTime,
-    A.base_spot1_name grossSpot,
-    A.actual_first2_no tareNo,
-    to_char(round(A.tare_weight / 1000, 3),'FM9999999999999999.000') tareWeight,
-    A.tare_time tareTime,
-    A.base_spot2_name tareSpot,
-    to_char(round(A.net_weight / 1000, 3),'FM9999999999999999.000') netWeight,
-    A.net_time netTime,
-    A.net_spot3_name netSpot,
-    A.note note,
-    E.Lc_No tare_lc_no,
-    E.Actual_First_No tare_no,
-    E.create_time tare_time,
-    E.PREDICTION_NO tare_scale_no,
-    to_char(round(E.Meter_weight / 1000, 3),'FM9999999999999999.000') tare_weight,
-    E.Weight_Type tare_weight_type,
-    A.conveyance_type conveyance_type,
-    to_char(round(B.CARRIAGE_WEIGHT / 1000, 3) ,'FM9999999999999999.000') crriage_weight,
-    A.is_pre_sacale is_pre_sacale,
-    A.value_flag value_Flag
-    from meter_work_railway_actual A
-    left join meter_base_railway_carriage_weight B
-    on A.conveyance_type = B.Carriage_Code
-    and B.value_flag = '1'
-    left join meter_work_railway_act_first E
-    on A.railway_no = E.railway_no
-    and E.value_flag = '1'
-    and E.meter_weight &lt; 35000
-    where A.value_flag != '0'
-<!--        and ( A.lc_no in-->
-<!--        <foreach collection="lcNoStr" item="item" open="(" separator="," close=")">-->
-<!--          #{item}-->
-<!--        </foreach>-->
-<!--        <if test="lcNoNull != null and lcNoNull != ''">-->
-<!--          or A.lc_no is null )-->
-<!--        </if>-->
-<!--        <if test="lcNoNull == null or lcNoNull == ''">-->
-<!--          and A.lc_no is not null)-->
-<!--        </if>-->
-        <choose>
-          <when test="lcNo != null and lcNo == 'kong'">
-            and A.lc_no is null
-          </when>
-          <when test=" lcNo != null and lcNo != 'kong'">
-            and A.lc_no = #{lcNo}
-          </when>
-        </choose>
-        <if test="railwayTypeNo != null and railwayTypeNo != ''">
-          and  A.RAILWAY_TYPE_NO = #{railwayTypeNo}
-        </if>
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-          and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
-        <if test="isPreSacale != null and isPreSacale != ''">
-          and A.is_pre_sacale = #{isPreSacale}
-        </if>
-        <if test="valueFlag != null and valueFlag != ''">
-          and A.value_flag = #{valueFlag}
-        </if>
-    order by conveyance_type asc, netTime desc
+      select A.lc_no,
+      A.actual_no actual_no,
+      A.railway_no railway_no,
+      A.prediction_no prediction_no,
+      A.matter_name matter_name,
+      A.forwarding_unit_name forwarding_unit_name,
+      A.receiving_uint_name receiving_uint_name,
+      A.actual_first1_no grossNo,
+      to_char(round(A.gross_weight / 1000,3),'FM9999999999999999.000') grossWeight,
+      A.gross_time grossTime,
+      A.base_spot1_name grossSpot,
+      A.actual_first2_no tareNo,
+      to_char(round(A.tare_weight / 1000, 3),'FM9999999999999999.000') tareWeight,
+      A.tare_time tareTime,
+      A.base_spot2_name tareSpot,
+      to_char(round(A.net_weight / 1000, 3),'FM9999999999999999.000') netWeight,
+      A.net_time netTime,
+      A.net_spot3_name netSpot,
+      A.note note,
+      E.Lc_No tare_lc_no,
+      E.Actual_First_No tare_no,
+      E.create_time tare_time,
+      E.PREDICTION_NO tare_scale_no,
+      to_char(round(E.Meter_weight / 1000, 3),'FM9999999999999999.000') tare_weight,
+      E.Weight_Type tare_weight_type,
+      A.conveyance_type conveyance_type,
+      to_char(round(B.CARRIAGE_WEIGHT / 1000, 3) ,'FM9999999999999999.000') crriage_weight,
+      A.is_pre_sacale is_pre_sacale,
+      A.value_flag value_Flag
+      from meter_work_railway_actual A
+      left join meter_base_railway_carriage_weight B
+      on A.conveyance_type = B.Carriage_Code
+      and B.value_flag = '1'
+      left join meter_work_railway_act_first E
+      on A.railway_no = E.railway_no
+      and E.value_flag = '1'
+      and E.meter_weight &lt; 35000
+      where A.value_flag != '0'
+      <!--        and ( A.lc_no in-->
+      <!--        <foreach collection="lcNoStr" item="item" open="(" separator="," close=")">-->
+      <!--          #{item}-->
+      <!--        </foreach>-->
+      <!--        <if test="lcNoNull != null and lcNoNull != ''">-->
+      <!--          or A.lc_no is null )-->
+      <!--        </if>-->
+      <!--        <if test="lcNoNull == null or lcNoNull == ''">-->
+      <!--          and A.lc_no is not null)-->
+      <!--        </if>-->
+      <choose>
+        <when test="lcNo != null and lcNo == 'kong'">
+          and A.lc_no is null
+        </when>
+        <when test=" lcNo != null and lcNo != 'kong'">
+          and A.lc_no = #{lcNo}
+        </when>
+      </choose>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and  A.RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and A.is_pre_sacale = #{isPreSacale}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and A.value_flag = #{valueFlag}
+      </if>
+      order by conveyance_type asc, netTime desc
   </select>
 </mapper>

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

@@ -346,9 +346,9 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
     private String netMode;
 
     /**
@@ -622,7 +622,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String isPreSacale;
 
     /**
-     * 列次编号(LC_NO,VARCHAR,20)
+     * 列次编号(LC_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="列次编号",required=false)
     private String lcNo;
@@ -640,7 +640,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String predictionCombination;
 
     /**
-     * 电子磅单地址(BOUND_LIST_URL,VARCHAR,100)
+     * 电子磅单地址(BOUND_LIST_URL,VARCHAR,400)
      */
     @ApiModelProperty(value="电子磅单地址",required=false)
     private String boundListUrl;
@@ -669,6 +669,12 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="电子签章系统合同文档ID",required=false)
     private String documentId;
 
+    /**
+     * 取消发布，控制不自动发布（0：自动发布，1：不自动发布）(is_auto_publish,VARCHAR,1)
+     */
+    @ApiModelProperty(value="取消发布，控制不自动发布（0：自动发布，1：不自动发布）",required=false)
+    private String isAutoPublish;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1561,6 +1567,14 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.documentId = documentId == null ? null : documentId.trim();
     }
 
+    public String getIsAutoPublish() {
+        return isAutoPublish;
+    }
+
+    public void setIsAutoPublish(String isAutoPublish) {
+        this.isAutoPublish = isAutoPublish == null ? null : isAutoPublish.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1677,6 +1691,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", contractId=").append(contractId);
         sb.append(", isBoundListDownloaded=").append(isBoundListDownloaded);
         sb.append(", documentId=").append(documentId);
+        sb.append(", isAutoPublish=").append(isAutoPublish);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -3399,7 +3399,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的洁净数据");
 
                 MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst1No());
-                MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst2No());
                 if(grossModel != null) {            //作废毛重数据、并回复从表数据
                     grossModel.setIsPreSacale("0");
                     grossModel.setValueFlag("0");
@@ -3412,6 +3411,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     //恢复从表数据
                     preRailwayScaleMapper.updateMeterWorkRailwayReceiveds(grossModel.getActualFirstNo());
                 }
+                MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst2No());
                 if(tareModel != null) {
                     tareModel.setIsPreSacale("0");
                     tareModel.setValueFlag("1");
@@ -3430,7 +3430,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setUpdateTime(new Date());
                 actualRow.setNote("动态衡毛皮分解");
                 actualRow.setIsPreSacale("0");
-                meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
+//                meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
+                meterWorkRailwayActualMapper.deleteByPrimaryKey(actualRow.getActualNo());
             }
             rm.setSucceed(true);
             rm.setMessage("毛皮分解成功");

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -67,6 +67,7 @@
     <result column="LIMIT_WEIGHT" jdbcType="DECIMAL" property="limitWeight" />
     <result column="RAILWAY_MODEL_NO" jdbcType="VARCHAR" property="railwayModelNo" />
     <result column="RAILWAY_MODEL_NAME" jdbcType="VARCHAR" property="railwayModelName" />
+    <result column="is_auto_operation" jdbcType="VARCHAR" property="isAutoOperation" />
   </resultMap>
   <sql id="columns">
     ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
@@ -80,7 +81,7 @@
     CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG, 
     UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
     CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, LIMIT_WEIGHT, 
-    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME
+    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, is_auto_operation
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, 
@@ -95,7 +96,8 @@
     t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS, 
     t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
     t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO, 
-    t.RAILWAY_TYPE_NAME, t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME
+    t.RAILWAY_TYPE_NAME, t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, 
+    t.is_auto_operation
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_RAILWAY_RECEIVED
@@ -300,6 +302,9 @@
       <if test="railwayModelName != null and railwayModelName != ''">
         and RAILWAY_MODEL_NAME = #{railwayModelName}
       </if>
+      <if test="isAutoOperation != null and isAutoOperation != ''">
+        and is_auto_operation = #{isAutoOperation}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -499,6 +504,9 @@
       <if test="railwayModelName != null and railwayModelName != ''">
         and RAILWAY_MODEL_NAME LIKE '%${railwayModelName}%'
       </if>
+      <if test="isAutoOperation != null and isAutoOperation != ''">
+        and is_auto_operation LIKE '%${isAutoOperation}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -700,6 +708,9 @@
       <if test="railwayModelName != null and railwayModelName != ''">
         or RAILWAY_MODEL_NAME = #{railwayModelName}
       </if>
+      <if test="isAutoOperation != null and isAutoOperation != ''">
+        or is_auto_operation = #{isAutoOperation}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
     insert into METER_WORK_RAILWAY_RECEIVED (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, 
@@ -724,7 +735,7 @@
       CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, 
       METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, 
       IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME)
+      RAILWAY_MODEL_NAME, is_auto_operation)
     values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR}, 
       #{railwaySpeed,jdbcType=DECIMAL}, #{railwayModel,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
@@ -747,7 +758,7 @@
       #{checkManNo,jdbcType=VARCHAR}, #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, 
       #{meterMode,jdbcType=VARCHAR}, #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR}, 
       #{isChemical,jdbcType=VARCHAR}, #{limitWeight,jdbcType=DECIMAL}, #{railwayModelNo,jdbcType=VARCHAR}, 
-      #{railwayModelName,jdbcType=VARCHAR})
+      #{railwayModelName,jdbcType=VARCHAR}, #{isAutoOperation,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
     insert into METER_WORK_RAILWAY_RECEIVED
@@ -947,6 +958,9 @@
       <if test="railwayModelName != null">
         RAILWAY_MODEL_NAME,
       </if>
+      <if test="isAutoOperation != null">
+        is_auto_operation,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualFirstNo != null">
@@ -1144,6 +1158,9 @@
       <if test="railwayModelName != null">
         #{railwayModelName,jdbcType=VARCHAR},
       </if>
+      <if test="isAutoOperation != null">
+        #{isAutoOperation,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
@@ -1211,7 +1228,8 @@
       IS_CHEMICAL = #{isChemical,jdbcType=VARCHAR},
       LIMIT_WEIGHT = #{limitWeight,jdbcType=DECIMAL},
       RAILWAY_MODEL_NO = #{railwayModelNo,jdbcType=VARCHAR},
-      RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR}
+      RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR},
+      is_auto_operation = #{isAutoOperation,jdbcType=VARCHAR}
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
@@ -1409,6 +1427,9 @@
       <if test="railwayModelName != null">
         RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR},
       </if>
+      <if test="isAutoOperation != null">
+        is_auto_operation = #{isAutoOperation,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
@@ -1453,7 +1474,8 @@
       CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, 
       RAILWAY_TYPE_NAME, IS_CHEMICAL, 
       LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME)
+      RAILWAY_MODEL_NAME, is_auto_operation
+      )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualFirstNo,jdbcType=VARCHAR}, 
@@ -1483,7 +1505,8 @@
       #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR}, 
       #{item.railwayTypeName,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR}, 
       #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR}, 
-      #{item.railwayModelName,jdbcType=VARCHAR} from dual  
+      #{item.railwayModelName,jdbcType=VARCHAR}, #{item.isAutoOperation,jdbcType=VARCHAR}
+       from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -1749,6 +1772,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.railwayModelName,jdbcType=VARCHAR}
        </foreach>
+       ,is_auto_operation=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.isAutoOperation,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_FIRST_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualFirstNo,jdbcType=VARCHAR}
@@ -2006,4 +2033,5 @@
   <select id="getCount" parameterType="java.util.HashMap" resultType="HashMap">
     select count(1) as countNum from meter_work_railway_received A where railway_work_no = #{railwayWorkNo} and  value_flag = '1'
   </select>
+  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/model/MeterWorkRailwayReceived.java

@@ -3,6 +3,7 @@ package com.steerinfo.meterwork.meterworkrailwayreceived.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -33,7 +34,7 @@ public class MeterWorkRailwayReceived implements IBasePO<String> {
     private String railwayNo;
 
     /**
-     * 车厢序号(RAILWAY_CARRIAGE_NO,VARCHAR,2)
+     * 车厢序号(RAILWAY_CARRIAGE_NO,VARCHAR,3)
      */
     @ApiModelProperty(value="车厢序号",required=false)
     private String railwayCarriageNo;
@@ -403,6 +404,11 @@ public class MeterWorkRailwayReceived implements IBasePO<String> {
      */
     private String AiWeight;
 
+    /**
+     * 是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)(is_auto_operation,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)",required=false)
+    private String isAutoOperation;
 
     private static final long serialVersionUID = 1L;
 
@@ -944,6 +950,14 @@ public class MeterWorkRailwayReceived implements IBasePO<String> {
         this.AiWeight = AiWeight == null ? null : AiWeight.trim();
     }
 
+    public String getIsAutoOperation() {
+        return isAutoOperation;
+    }
+
+    public void setIsAutoOperation(String isAutoOperation) {
+        this.isAutoOperation = isAutoOperation == null ? null : isAutoOperation.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1016,6 +1030,7 @@ public class MeterWorkRailwayReceived implements IBasePO<String> {
         sb.append(", railwayModelNo=").append(railwayModelNo);
         sb.append(", railwayModelName=").append(railwayModelName);
         sb.append(", AiWeight=").append(AiWeight);
+        sb.append(", isAutoOperation=").append(isAutoOperation);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -156,7 +156,6 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                         AiModel.setRailwaySpeed(model.getRailwaySpeed());
                         meterBaseRailwayAiweightMapper.insertSelective(AiModel);
                     }
-
                 }
 //                meterWorkRailwayReceivedMapper.deleteByPrimaryKey(model.getActualFirstNo());
 //                rm.setData(model.getActualFirstNo());

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml

@@ -323,7 +323,7 @@
   </select>
 
   <select id="listBynoPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    select ACTUAL_NO, to_char(CREATE_TIME, 'YYYY-MM-dd HH:mi:ss') create_time, CARRIAGE_NUM, BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME,
+    select ACTUAL_NO, to_char(CREATE_TIME, 'YYYY-MM-dd HH24:mi:ss') create_time, CARRIAGE_NUM, BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME,
     SOUND_NAME, TRACK_WAY, IS_DISPOSE from METER_WORK_RAILWAY_REC_MAIN
     <where> 1 = 1
       <if test="actualNo != null and actualNo != ''">
@@ -359,5 +359,4 @@
     </where>
     order by create_time desc
   </select>
-  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/impl/MeterWorkZnlcService.java

@@ -80,7 +80,7 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
                 if(oldActuals.size() >= 1) {
                     param.put("DeviceNo", oldActuals.get(0).get("DEVICENO"));    //计量设备号
                     param.put("WeightVoucherNo", oldActuals.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
-                    param.put("ConveyanceNo", oldActuals.get(0).get("CONVEYANCENO"));   //车牌号
+                    param.put("ConveyanceNo", oldActuals.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
                     param.put("GrossWeight", oldActuals.get(0).get("GROSSWEIGHT"));    //过磅量
                     param.put("TareWeight", oldActuals.get(0).get("TAREWEIGHT"));     //空车重
                     param.put("NetWeight", oldActuals.get(0).get("NETWEIGHT"));      //过磅净重
@@ -91,12 +91,12 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
                     List<HashMap> oldFirsts = meterWorkZnlcMapper.doQueryFirstOld(map);
                     param.put("DeviceNo", oldFirsts.get(0).get("DEVICENO"));    //计量设备号
                     param.put("WeightVoucherNo", oldFirsts.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
-                    param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO"));   //车牌号
+                    param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO").toString().replaceAll("-", ""));   //车牌号
                     param.put("GrossWeight", oldFirsts.get(0).get("GROSSWEIGHT"));    //过磅量
                     param.put("TareWeight", null);     //空车重
                     param.put("NetWeight", null);      //过磅净重
                     param.put("MeteringTime", oldFirsts.get(0).get("METERINGTIME"));   //计量时刻
-                    param.put("MetringPerson", null);  //计量人
+                    param.put("MetringPerson", "老系统一次");  //计量人
 
                     rm.setData(param);
                     return rm;