|
|
@@ -4,8 +4,7 @@
|
|
|
<select id="getSO_SOMainReport" parameterType="java.util.HashMap" resultType="org.jeecg.modules.report.entity.SoSoDetails">
|
|
|
SELECT
|
|
|
de.cDepName,
|
|
|
- v.cVCName as cCusCode,
|
|
|
- v.cVenAbbName,
|
|
|
+ cc.cCusAbbName as cVenAbbName,
|
|
|
convert(char(7),ss.dPreDateBT,120) yearMonth,
|
|
|
ssd.iNatUnitPrice,
|
|
|
case when max(ssd.cSCloser) is null then sum(ssd.iQuantity)
|
|
|
@@ -14,15 +13,7 @@
|
|
|
FROM
|
|
|
SO_SOMain ss
|
|
|
LEFT JOIN SO_SODetails ssd ON ss.ID= ssd.ID
|
|
|
- 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 Vendor 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 1=1
|
|
|
@@ -42,7 +33,7 @@
|
|
|
<if test="map.customer!=null and map.customer!='' ">
|
|
|
and cc.cCusAbbName = #{map.customer}
|
|
|
</if>
|
|
|
- GROUP BY de.cDepName,ss.cCusCode,v.cVenAbbName,convert(char(7),ss.dPreDateBT,120),ssd.iNatUnitPrice,v.cVCName
|
|
|
+ GROUP BY de.cDepName,ss.cCusCode,convert(char(7),ss.dPreDateBT,120),ssd.iNatUnitPrice,cc.cCusAbbName
|
|
|
--ORDER BY
|
|
|
--de.cDepName,ss.cCusCode,CONVERT ( CHAR ( 7 ), ss.dPreDateBT, 120 ),ssd.iNatUnitPrice
|
|
|
</select>
|
|
|
@@ -73,7 +64,7 @@
|
|
|
<if test="department!=null and department!='' ">
|
|
|
and de.cDepName = #{department}
|
|
|
</if>
|
|
|
- GROUP BY cc.cCusName
|
|
|
+ GROUP BY cc.cCusAbbName
|
|
|
</select>
|
|
|
|
|
|
|
liuchaohui