|  | @@ -4,7 +4,7 @@
 | 
	
		
			
				|  |  |      <select id="getSO_SOMainReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
 | 
	
		
			
				|  |  |          SELECT
 | 
	
		
			
				|  |  |          de.cDepName,
 | 
	
		
			
				|  |  | -        ss.cCusCode,
 | 
	
		
			
				|  |  | +        v.cVCName as cCusCode,
 | 
	
		
			
				|  |  |          v.cVenAbbName,
 | 
	
		
			
				|  |  |          convert(char(7),ss.dPreDateBT,120) yearMonth,
 | 
	
		
			
				|  |  |          ssd.iNatUnitPrice,
 | 
	
	
		
			
				|  | @@ -14,7 +14,15 @@
 | 
	
		
			
				|  |  |          FROM
 | 
	
		
			
				|  |  |          SO_SOMain ss
 | 
	
		
			
				|  |  |          LEFT JOIN SO_SODetails ssd ON ss.ID= ssd.ID
 | 
	
		
			
				|  |  | -        left join Vendor v on ss.cCusCode=v.cVenCode
 | 
	
		
			
				|  |  | +        left join (
 | 
	
		
			
				|  |  | +            SELECT
 | 
	
		
			
				|  |  | +            vc.cVenCode,
 | 
	
		
			
				|  |  | +            c.cVCName,
 | 
	
		
			
				|  |  | +            vc.cVenAbbName
 | 
	
		
			
				|  |  | +            FROM
 | 
	
		
			
				|  |  | +            Vendor vc
 | 
	
		
			
				|  |  | +            LEFT JOIN VendorClass c on vc.cVCCode=c.cVCCode
 | 
	
		
			
				|  |  | +        ) v on ss.cCusCode=v.cVenCode
 | 
	
		
			
				|  |  |          left join Department de on ss.cDepCode=de.cDepCode
 | 
	
		
			
				|  |  |          left join Customer cc on ss.cCusCode = cc.cCusCode
 | 
	
		
			
				|  |  |          WHERE
 | 
	
	
		
			
				|  | @@ -32,7 +40,7 @@
 | 
	
		
			
				|  |  |          <if test="map.customer!=null and map.customer!='' ">
 | 
	
		
			
				|  |  |              and cc.cCusName = #{map.customer}
 | 
	
		
			
				|  |  |          </if>
 | 
	
		
			
				|  |  | -        GROUP BY de.cDepName,ss.cCusCode,v.cVenAbbName,convert(char(7),ss.dPreDateBT,120),ssd.iNatUnitPrice
 | 
	
		
			
				|  |  | +        GROUP BY de.cDepName,ss.cCusCode,v.cVenAbbName,convert(char(7),ss.dPreDateBT,120),ssd.iNatUnitPrice,v.cVCName
 | 
	
		
			
				|  |  |          ORDER BY
 | 
	
		
			
				|  |  |          de.cDepName,ss.cCusCode,CONVERT ( CHAR ( 7 ), ss.dPreDateBT, 120 ),ssd.iNatUnitPrice
 | 
	
		
			
				|  |  |      </select>
 |