diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs index 2d3ab6e..e91baa6 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs @@ -44,6 +44,18 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport /// 出库比例 /// public decimal OutboundPercentage { get; set; } + + /// + /// 总收款金额 + /// + + public decimal FRceiveAmount { get; set; } + + /// + /// 发票金额 + /// + + 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 + //{ + // /// + // /// 第一季度 + // /// + // public SalesOfQuarterItem First { get; set; } + + // /// + // /// 第二季度 + // /// + // public SalesOfQuarterItem Second { get; set; } + + // /// + // /// 第三季度 + // /// + // public SalesOfQuarterItem Third { get; set; } + + // /// + // /// 第四季度 + // /// + // public SalesOfQuarterItem Fourth { get; set; } + //} + + + ///// + ///// 销售季度报表 + ///// + //public class SalesOfQuarterItem + //{ + // /// + // /// 销售金额本位币 + // /// + // public decimal FBillAllAmount_LC { get; set; } + + + // /// + // /// 收款金额 + // /// + // public decimal FRECAMOUNT { get; set; } + // /// + // /// 销售同比百分比,前端加 % + // /// + // public decimal Percentage { get; set; } + + + //} } diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs index 2585e11..db3fb42 100644 --- a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs +++ b/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)