错误 #4066

models/ermcp3Report.go

@@ -1022,7 +1022,8 @@ func (r *Ermcp3AreaSpotPLReport) buildSqlDay() string {
 		"                  t.CURRENCYID," +
 		"                  t.DELIVERYGOODSID) a" +
 		"  LEFT JOIN DELIVERYGOODS g" +
-		"    on a.deliverygoodsid = g.deliverygoodsid"
+		"    on a.deliverygoodsid = g.deliverygoodsid" +
+		"  ORDER BY RECKONDATE DESC"
 	var sqlParam utils.SQLVal
 	sqlParam.And("t.AREAUSERID", r.AREAUSERID)
 	if r.QueryType == 1 {
@@ -1082,6 +1083,7 @@ select a.*,
     on a.deliverygoodsid = g.deliverygoodsid
   LEFT JOIN WRSTANDARD w
     on a.wrstandardid = w.wrstandardid
+  ORDER BY RECKONDATE DESC
 `
 	var sqlParam utils.SQLVal
 	sqlParam.And("t.AREAUSERID", r.AREAUSERID)
@@ -1144,7 +1146,8 @@ func (r *Ermcp3AreaSpotPLReport) buildSqlDayDetail() string {
 		"  LEFT JOIN WRSTANDARD w" +
 		"    on a.wrstandardid = w.wrstandardid" +
 		"  LEFT JOIN DGFACTORYITEM dg" +
-		"    on a.spotgoodsbrandid = dg.dgfactoryitemid"
+		"    on a.spotgoodsbrandid = dg.dgfactoryitemid" +
+		"  ORDER BY RECKONDATE DESC"
 	var sqlParam utils.SQLVal
 	sqlParam.And("t.AREAUSERID", r.AREAUSERID)
 	sqlParam.AndEx("t.RECKONDATE", r.RECKONDATE, len(r.RECKONDATE) > 0)
@@ -1396,7 +1399,8 @@ func (r *Ermcp3FinanceReport) buildSqlReckon(fields []string) string {
 			"               sum(t.TODAYPAYSUM) TODAYPAYSUM" +
 			"          FROM RECKON_ERMCP_AFINANCESUB t" +
 			"         WHERE 1 = 1 %v" +
-			"         GROUP BY %v) a %v"
+			"         GROUP BY %v) a %v" +
+			"		  ORDER BY reckondate DESC"
 		sqlId.FormatParam(exFileds, strFileds, sqlParam.String(), strFileds, strleftJoin)
 	} else {
 		sqlId = "SELECT %v," +
@@ -1738,7 +1742,7 @@ func (r *Ermcp3AreaStockReportEx) buildSqlReckon() string {
 	sqlId.AndEx("t.SPOTGOODSBRANDID", r.SPOTGOODSBRANDID, r.SPOTGOODSBRANDID > 0)
 	// 仓库id
 	sqlId.AndEx("t.WAREHOUSEINFOID", r.WAREHOUSEINFOID, len(r.WAREHOUSEINFOID) > 0)
-	sqlId.Join(" order by t.reckondate")
+	sqlId.Join(" order by t.reckondate DESC")
 	return sqlId.String()
 }
 
@@ -1779,7 +1783,7 @@ func (r *Ermcp3AreaStockReportEx) buildSqlReckonSum(fields []string) string {
 	}
 	exFields, exLeftJoinTable := r.getExFieldInfo()
 	sqlId.FormatParam(exFields, strFileds, sqlParam.String(), strFileds, exLeftJoinTable)
-	sqlId.Join(" order by a.reckondate")
+	sqlId.Join(" order by a.reckondate DESC")
 	return sqlId.String()
 }
 
@@ -1952,7 +1956,7 @@ SELECT t.RECKONDATE,
 	if r.QueryType == 1 {
 		sqlId.And("t.RECKONDATE", r.RECKONDATE)
 	} else if r.QueryType == 2 {
-		sqlId.Join(fmt.Sprintf(" and t.RECKONDATE >= '%v' and t.RECKONDATE <= '%v' ", r.BeginDate, r.EndDate))
+		sqlId.Join(fmt.Sprintf(" and t.RECKONDATE >= '%v' and t.RECKONDATE <= '%v' ORDER BY t.RECKONDATE DESC ", r.BeginDate, r.EndDate))
 	}
 	return sqlId.String()
 }
@@ -1990,6 +1994,7 @@ SELECT t.RECKONDATE,
 	}
 	sqlId.And("t.CURRENCYID", r.CURRENCYID)
 	sqlId.AndEx("t.middlegoodsid", r.MIDDLEGOODSID, r.MIDDLEGOODSID > 0)
+	sqlId.Join(" ORDER BY t.RECKONDATE DESC")
 
 	return sqlId.String()
 }
@@ -2199,7 +2204,8 @@ func (r *Ermcp3TaFutuReDataReport) buildSqlReckon(userType int32) string {
 		"    on a.goodsgroupid = gp.goodsgroupid" +
 		"  left join goods g" +
 		"    on a.goodsid = g.goodsid" +
-		"  left join erms_middlegoods mg on a.middlegoodsid=mg.middlegoodsid"
+		"  left join erms_middlegoods mg on a.middlegoodsid=mg.middlegoodsid" +
+		"  ORDER BY RECKONDATE DESC"
 
 	userId := "USERID"
 	var sqlParam utils.SQLVal
@@ -2278,7 +2284,8 @@ func (r *Ermcp3TaFutuReDataReport) buildSqlReckonDetail(userType int32) string {
 		"  left join goods g" +
 		"    on a.goodsid = g.goodsid" +
 		"  left join taaccount ta on a.accountid = ta.accountid" +
-		"  left join erms_middlegoods mg on a.middlegoodsid=mg.middlegoodsid"
+		"  left join erms_middlegoods mg on a.middlegoodsid=mg.middlegoodsid" +
+		"  ORDER BY reckondate DESC"
 
 	userId := "USERID"
 	var sqlParam utils.SQLVal