联合查询条件修改

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.xml

@@ -462,7 +462,7 @@ FS_RECEIVERREMARK RECEIVER_REMARK,
 FS_MATERIALNAME MATTER_NAME,
 '老系统' as remark
 from JGWEIGHT.VIEW_TRAIN_NET
-where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and FS_BALANCETYPE='静态'
+where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or FS_BALANCETYPE='铁水轨道衡')
         <if test="remark != null and remark != ''">
             and '老系统' LIKE '%${remark}%'
         </if>
@@ -703,7 +703,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and FS_BALANCETYPE='静态'
         from JGWEIGHT.VIEW_TRAIN_NET
         where 1 = 1
         and FS_TRAINNO is not null
-        and FS_DELETEDTAG='N' and FS_BALANCETYPE='静态'
+        and FS_DELETEDTAG='N'
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
             and Fd_NETWEIGHTTIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and Fd_NETWEIGHTTIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>

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

@@ -4339,6 +4339,8 @@
     A.railway_no railway_no,
     A.prediction_no prediction_no,
     A.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,