From 5ceed55aadef3acc0d792926accdb6b42d50dce6 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Tue, 2 Sep 2025 20:49:04 +0800 Subject: [PATCH] 1 --- .../JackOrdersRepository.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs index d6396bd..d4a7ab5 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.FRemainOutQty<>0 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 @@ -39,10 +39,10 @@ LEFT JOIN dbo.T_SAL_ORDERFIN fin ON a.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; }