| 
					
				 | 
			
			
				@@ -120,13 +120,34 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         where f_pid = #{fId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectReconciliation" resultType="java.lang.Integer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        SELECT count(f_id) FROM   t_warehousebillsfees  WHERE f_pid = #{fId} AND f_accamount_date IS NOT NULL; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            COUNT(d.f_id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            t_fee_do  d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                LEFT JOIN t_fee f ON  d.f_pid = f.f_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WHERE 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            d.f_srcpid = #{fId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          AND f.f_billtype = 'DZ' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectCharge" resultType="java.lang.Integer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        SELECT count(f_id) FROM   t_warehousebillsfees  WHERE f_pid = #{fId} AND  f_dc = 'D'  AND f_stlamount_date IS NOT NULL; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            COUNT(d.f_id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            t_fee_do  d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            LEFT JOIN t_fee f ON  d.f_pid = f.f_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WHERE 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            d.f_srcpid = #{fId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          AND f.f_billtype = 'SF' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectPay" resultType="java.lang.Integer"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        SELECT count(f_id) FROM   t_warehousebillsfees  WHERE f_pid = #{fId} AND  f_dc = 'C'  AND f_stlamount_date IS NOT NULL; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        SELECT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            COUNT(d.f_id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            t_fee_do  d 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                LEFT JOIN t_fee f ON  d.f_pid = f.f_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WHERE 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            d.f_srcpid = #{fId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          AND f.f_billtype = 'FF' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |