Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -25,10 +25,10 @@
 		  pi_custid,
 		  pi_custcode,
 		  pi_custname,
-		  sum(pd_sendprice*pi_rate*pd_outqty) as saamount,
+		  sum(pd_sendprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as saamount,
 		  sum(pd_total) as costamount,
-	  	  sum(pd_sendprice*pi_rate*pd_outqty)-sum(pd_total) as profit,
-		  (sum(pd_sendprice*pi_rate*pd_outqty)-sum(pd_total) )/sum(pd_sendprice*pi_rate*pd_outqty) as profitpresent
+	  	  sum(pd_sendprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) as profit,
+		  (sum(pd_sendprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) )/sum(pd_sendprice*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