| 
														
															@@ -2361,6 +2361,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         LEFT JOIN t_address td ON td.f_id = tw.f_destportid 
														 | 
														
														 | 
														
															         LEFT JOIN t_address td ON td.f_id = tw.f_destportid 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         <where> 
														 | 
														
														 | 
														
															         <where> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tf.f_dc = #{fDc} 
														 | 
														
														 | 
														
															             tf.f_dc = #{fDc} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            and tw.f_typeid = 1 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <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> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -2405,7 +2406,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         LEFT JOIN t_vessel tv ON tw.f_vslid = tv.f_id 
														 | 
														
														 | 
														
															         LEFT JOIN t_vessel tv ON tw.f_vslid = tv.f_id 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         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> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            1=1 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            tw.f_typeid = 1 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <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> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -2456,6 +2457,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         LEFT JOIN t_address td ON td.f_id = tw.f_destportid 
														 | 
														
														 | 
														
															         LEFT JOIN t_address td ON td.f_id = tw.f_destportid 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         <where> 
														 | 
														
														 | 
														
															         <where> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tf.f_dc = #{fDc} 
														 | 
														
														 | 
														
															             tf.f_dc = #{fDc} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            and tw.f_typeid = 1 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <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> 
														 |