Explorar o código

销售利润表修改

dingyl %!s(int64=6) %!d(string=hai) anos
pai
achega
e3dfe5e218

+ 2 - 2
applications/money/money-server/src/main/resources/mapper/ProfitdetailMapper.xml

@@ -26,9 +26,9 @@
 		  pi_custcode,
 		  pi_custname,
 		  sum(pd_sendprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as saamount,
-		  sum(pd_total) as costamount,
+		  sum(ifnull(pd_price,0)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as costamount,
 	  	  sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) as profit,
-		  (sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) )/sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as profitpresent
+		  (sum((pd_netprice*pi_rate-pd_price)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))))/sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as profitpresent
 	  from prodiodetail
 	  left join prodinout on pd_piid=pi_Id
 	  left join customer on cu_id = pi_custid