|
|
@@ -40,7 +40,7 @@
|
|
|
and de.cDepName = #{map.department}
|
|
|
</if>
|
|
|
<if test="map.customer!=null and map.customer!='' ">
|
|
|
- and cc.cCusName = #{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
|
|
|
--ORDER BY
|
|
|
@@ -49,7 +49,7 @@
|
|
|
|
|
|
<select id="QuerySO_SOMainReportBydepartment" resultType="org.jeecg.modules.report.entity.SoSoDetails">
|
|
|
SELECT
|
|
|
- cc.cCusName,
|
|
|
+ cc.cCusAbbName as cCusName,
|
|
|
case when max(ssd.cSCloser) is null then sum(ssd.iQuantity)
|
|
|
else sum(ssd.foutquantity) end as iQuantity,
|
|
|
sum(ssd.iNatMoney) as iNatMoney
|
|
|
@@ -101,7 +101,7 @@
|
|
|
and (v.cVenAbbName <![CDATA[ <> ]]> '宁波森语' and v.cVenAbbName <![CDATA[ <> ]]> '马菲羊' and v.cVenAbbName <![CDATA[ <> ]]> '森语集团')
|
|
|
</if>
|
|
|
<if test="customer!=null and customer!='' ">
|
|
|
- and cc.cCusName = #{customer}
|
|
|
+ and cc.cCusAbbName = #{customer}
|
|
|
</if>
|
|
|
GROUP BY de.cDepName
|
|
|
</select>
|
liuchaohui