|  | @@ -2362,6 +2362,7 @@
 | 
											
												
													
														|  |          <where>
 |  |          <where>
 | 
											
												
													
														|  |              tf.f_dc = #{fDc}
 |  |              tf.f_dc = #{fDc}
 | 
											
												
													
														|  |              and tw.f_typeid = 1
 |  |              and tw.f_typeid = 1
 | 
											
												
													
														|  | 
 |  | +            and tw.del_flag = '0'
 | 
											
												
													
														|  |              <if test="fMblno != null  and fMblno != ''">and tw.f_mblno like concat('%', #{fMblno}, '%')</if>
 |  |              <if test="fMblno != null  and fMblno != ''">and tw.f_mblno like concat('%', #{fMblno}, '%')</if>
 | 
											
												
													
														|  |              <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
 |  |              <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
 | 
											
												
													
														|  |              <if test="fCorpid != null">and tf.f_corpid = #{fCorpid}</if>
 |  |              <if test="fCorpid != null">and tf.f_corpid = #{fCorpid}</if>
 | 
											
										
											
												
													
														|  | @@ -2407,6 +2408,7 @@
 | 
											
												
													
														|  |          LEFT JOIN t_voyage ty ON tw.f_voyid = ty.f_id
 |  |          LEFT JOIN t_voyage ty ON tw.f_voyid = ty.f_id
 | 
											
												
													
														|  |          <where>
 |  |          <where>
 | 
											
												
													
														|  |              tw.f_typeid = 1
 |  |              tw.f_typeid = 1
 | 
											
												
													
														|  | 
 |  | +            and tw.del_flag = '0'
 | 
											
												
													
														|  |              <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
 |  |              <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
 | 
											
												
													
														|  |              <if test="fVoyid != null">and tw.f_voyid = #{fVoyid}</if>
 |  |              <if test="fVoyid != null">and tw.f_voyid = #{fVoyid}</if>
 | 
											
												
													
														|  |              <if test="fLoadportid != null">and tw.f_loadportid = #{fLoadportid}</if>
 |  |              <if test="fLoadportid != null">and tw.f_loadportid = #{fLoadportid}</if>
 | 
											
										
											
												
													
														|  | @@ -2458,6 +2460,7 @@
 | 
											
												
													
														|  |          <where>
 |  |          <where>
 | 
											
												
													
														|  |              tf.f_dc = #{fDc}
 |  |              tf.f_dc = #{fDc}
 | 
											
												
													
														|  |              and tw.f_typeid = 1
 |  |              and tw.f_typeid = 1
 | 
											
												
													
														|  | 
 |  | +            and tw.del_flag = '0'
 | 
											
												
													
														|  |              <if test="fMblno != null  and fMblno != ''">and tw.f_mblno like concat('%', #{fMblno}, '%')</if>
 |  |              <if test="fMblno != null  and fMblno != ''">and tw.f_mblno like concat('%', #{fMblno}, '%')</if>
 | 
											
												
													
														|  |              <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
 |  |              <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
 | 
											
												
													
														|  |              <if test="fCorpid != null">and tf.f_corpid = #{fCorpid}</if>
 |  |              <if test="fCorpid != null">and tf.f_corpid = #{fCorpid}</if>
 |