修正期末均价、期末额、现货损益、浮动损益的计算

models/ermcp3Report.go

@@ -925,7 +925,7 @@ func (r *Ermcp3AreaSpotPLReport) calc() {
 	r.ACCOUNTNAME = mtpcache.GetUserNameByUserId(r.AREAUSERID)
 	r.CURRENCYNAME = mtpcache.GetCurrencyName(r.CURRENCYID)
 
-	if r.ORIQTY > 0 && r.CURQTY > 0 {
+	if r.ORIQTY >= 0 && r.CURQTY >= 0 {
 		// 1.当期初量大于等于0时：期末量也大于等于0时：
 		// 期末均价 CurAveragePrice=（今采购额+期初额）/（今采购量+期初量）
 		// 期末额 CurAmoun =（今采购额 + 期初额）- 今销售量 * 期末均价
@@ -1018,11 +1018,8 @@ func (r *Ermcp3AreaSpotPLReport) buildSqlDay() string {
 		"               sum(t.CURSELLQTY) CURSELLQTY," +
 		"               sum(t.CURSELLAMOUNT) CURSELLAMOUNT," +
 		"               sum(t.CURQTY) CURQTY," +
-		"               sum(t.CURAMOUNT) CURAMOUNT," +
 		"               max(t.CURSPOTPRICE) CURSPOTPRICE," +
 		"               sum(t.CURMARKETVALUE) CURMARKETVALUE," +
-		"               sum(t.ACTUALPL) ACTUALPL," +
-		"               sum(t.FLOATPL) FLOATPL," +
 		"               sum(t.TODAYINQTY) TODAYINQTY," +
 		"               sum(t.TODAYOUTQTY) TODAYOUTQTY" +
 		"          FROM RECKON_ERMCP_AREASPOTPL t" +
@@ -1074,11 +1071,8 @@ func (r *Ermcp3AreaSpotPLReport) buildSqlDayDetail() string {
 		"               sum(t.CURSELLQTY) CURSELLQTY," +
 		"               sum(t.CURSELLAMOUNT) CURSELLAMOUNT," +
 		"               sum(t.CURQTY) CURQTY," +
-		"               sum(t.CURAMOUNT) CURAMOUNT," +
 		"               max(t.CURSPOTPRICE) CURSPOTPRICE," +
 		"               sum(t.CURMARKETVALUE) CURMARKETVALUE," +
-		"               sum(t.ACTUALPL) ACTUALPL," +
-		"               sum(t.FLOATPL) FLOATPL," +
 		"               sum(t.TODAYINQTY) TODAYINQTY," +
 		"               sum(t.TODAYOUTQTY) TODAYOUTQTY" +
 		"          FROM RECKON_ERMCP_AREASPOTPL t" +
@@ -1133,11 +1127,8 @@ func (r *Ermcp3AreaSpotPLReport) buildSqlCycle() string {
 		"               sum(t.CURSELLQTY) CURSELLQTY," +
 		"               sum(t.CURSELLAMOUNT) CURSELLAMOUNT," +
 		"               sum(t.CURQTY) CURQTY," +
-		"               sum(t.CURAMOUNT) CURAMOUNT," +
 		"               max(t.CURSPOTPRICE) CURSPOTPRICE," +
 		"               sum(t.CURMARKETVALUE) CURMARKETVALUE," +
-		"               sum(t.ACTUALPL) ACTUALPL," +
-		"               sum(t.FLOATPL) FLOATPL," +
 		"               sum(t.TODAYINQTY) TODAYINQTY," +
 		"               sum(t.TODAYOUTQTY) TODAYOUTQTY" +
 		"          FROM REPORT_ERMCP_AREASPOTPL t" +