diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs index 80816c4..aca8182 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs @@ -36,7 +36,7 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport public decimal FStockOutQty { get; set; } /// - /// 出库数量 + /// 未出库数量 /// public decimal FRemainOutQty { get; set; } diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs index d6396bd..d2c75b9 100644 --- a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs @@ -25,9 +25,9 @@ namespace MyCode.Project.Repositories SearchCondition where = new SearchCondition(); - where.AddSqlCondition(" 1=1 ", true); - - string sql = $@" + where.AddSqlCondition(" 1=1 and a.FStockOutQty<>0 ", true); + + string sql = $@" select * from ( 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,FRceiveAmount,FInvoiceAmount2 AS FInvoiceAmount @@ -35,14 +35,14 @@ SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID,FRceiveAmount,FInvoiceAmo ,(SELECT SUM(g.FQTY) FROM T_SAL_ORDERENTRY g WHERE g.FID=a.FID) AS QTY ,fin.FBILLALLAMOUNT_LC, CONVERT(NVARCHAR(23),A.FCreateDate,23) AS FCreateDate FROM T_SAL_ORDER A WITH(NOLOCK) -LEFT JOIN dbo.T_SAL_ORDERFIN fin ON a.fid=a.FID +LEFT JOIN dbo.T_SAL_ORDERFIN fin ON fin.fid=a.FID LEFT JOIN T_BD_CUSTOMER Cccc WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 WHERE a.FDOCUMENTSTATUS='C' -) a "; +) a ) a "; - var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"FDATE desc "); + var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"FDATE desc "); return list; }