| 
														
															@@ -1656,7 +1656,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID 
														 | 
														
														 | 
														
															                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                  LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR 
														 | 
														
														 | 
														
															                  LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                            ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID 
														 | 
														
														 | 
														
															                            ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        WHERE ASO.SALE_TYPE = 1 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        WHERE ASO.SALE_TYPE in (1,50) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId} 
														 | 
														
														 | 
														
															           AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </select> 
														 | 
														
														 | 
														
															     </select> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     <select id="getColumnShowData" resultType="java.util.Map" parameterType="map"> 
														 | 
														
														 | 
														
															     <select id="getColumnShowData" resultType="java.util.Map" parameterType="map"> 
														 |