11

Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs

@@ -44,6 +44,18 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
         /// 出库比例
         /// </summary>
         public decimal OutboundPercentage { get; set; }
+
+        /// <summary>
+        /// 总收款金额
+        /// </summary>
+
+        public decimal FRceiveAmount { get; set; }
+
+        /// <summary>
+        /// 发票金额
+        /// </summary>
+
+        public decimal FInvoiceAmount { get; set; }
     }
 
     public class SalOrderDetailResp
@@ -89,4 +101,51 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
         public decimal OutboundPercentage { get; set; }
 
     }
+
+    //public class SalesOfQuarterReport
+    //{
+    //    /// <summary>
+    //    /// 第一季度
+    //    /// </summary>
+    //    public SalesOfQuarterItem First { get; set; }
+
+    //    /// <summary>
+    //    /// 第二季度
+    //    /// </summary>
+    //    public SalesOfQuarterItem Second { get; set; }
+
+    //    /// <summary>
+    //    /// 第三季度
+    //    /// </summary>
+    //    public SalesOfQuarterItem Third { get; set; }
+
+    //    /// <summary>
+    //    /// 第四季度
+    //    /// </summary>
+    //    public SalesOfQuarterItem Fourth { get; set; }
+    //}
+
+
+    ///// <summary>
+    ///// 销售季度报表
+    ///// </summary>
+    //public class SalesOfQuarterItem
+    //{
+    //    /// <summary>
+    //    /// 销售金额本位币
+    //    /// </summary>
+    //    public decimal FBillAllAmount_LC { get; set; }
+
+
+    //    /// <summary>
+    //    /// 收款金额
+    //    /// </summary>
+    //    public decimal FRECAMOUNT { get; set; }
+    //    /// <summary>
+    //    /// 销售同比百分比,前端加 %
+    //    /// </summary>
+    //    public decimal Percentage { get; set; }
+
+
+    //}
 }

Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs

@@ -30,7 +30,7 @@ namespace MyCode.Project.Repositories
             string sql = $@" 
  SELECT * ,(QTY-FStockOutQty) AS FRemainOutQty,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN QTY !=0 THEN FStockOutQty/QTY*1.00 ELSE 0 END)) 
  FROM (
- SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID
+ SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID,FRceiveAmount,FInvoiceAmount2 AS FInvoiceAmount
  ,(SELECT SUM(FStockOutQty) FROM T_SAL_ORDERENTRY_R g WHERE g.FID=a.FID) AS FStockOutQty
   ,(SELECT SUM(g.FQTY) FROM T_SAL_ORDERENTRY g WHERE g.FID=a.FID) AS QTY
  FROM T_SAL_ORDER  A WITH(NOLOCK)