| 
														
															@@ -529,6 +529,14 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <=    BF.MAKE_TIME 
														 | 
														
														 | 
														
															             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <=    BF.MAKE_TIME 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  BF.MAKE_TIME 
														 | 
														
														 | 
														
															             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  BF.MAKE_TIME 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         </if> 
														 | 
														
														 | 
														
															         </if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        <if test="con!=null and con!=''.toString()"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            and ( 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                APO.PURCHASE_ORDER_NO like concat('%',concat(#{con},'%')) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            or BCP.CONTRACT_NO like concat('%',concat(#{con},'%')) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            or DB.RESULT_FOREIGN_SHIP_NAME like concat('%',concat(#{con},'%')) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            or RM.MATERIAL_NAME  like concat('%',concat(#{con},'%')) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            ) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        </if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </select> 
														 | 
														
														 | 
														
															     </select> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 <!--    --> 
														 | 
														
														 | 
														
															 <!--    --> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     <select id="downloadBmsshipOrder" resultType="java.lang.String" parameterType="java.lang.Integer"> 
														 | 
														
														 | 
														
															     <select id="downloadBmsshipOrder" resultType="java.lang.String" parameterType="java.lang.Integer"> 
														 |