Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'YanShi' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into YanShi

Browse Source
This commit is contained in:
朱斌
2025-09-02 23:03:44 +08:00
parent b6bb5d8766 1919896d17
commit 5f62962ac9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs
View File

@@ -36,7 +36,7 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
public decimal FStockOutQty { get; set; } public decimal FStockOutQty { get; set; }
/// <summary> /// <summary>
/// 出库数量 /// 未出库数量
/// </summary> /// </summary>
public decimal FRemainOutQty { get; set; } public decimal FRemainOutQty { get; set; }

12
Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
View File

@@ -25,9 +25,9 @@ namespace MyCode.Project.Repositories
SearchCondition where = new SearchCondition(); SearchCondition where = new SearchCondition();
where.AddSqlCondition(" 1=1 ", true); where.AddSqlCondition(" 1=1 and a.FStockOutQty<>0 ", true);
string sql = $@" 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)) SELECT * ,(QTY-FStockOutQty) AS FRemainOutQty,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN QTY !=0 THEN FStockOutQty/QTY*1.00 ELSE 0 END))
FROM ( FROM (
SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID,FRceiveAmount,FInvoiceAmount2 AS FInvoiceAmount 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 ,(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 ,fin.FBILLALLAMOUNT_LC, CONVERT(NVARCHAR(23),A.FCreateDate,23) AS FCreateDate
FROM T_SAL_ORDER A WITH(NOLOCK) 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 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 LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052
WHERE a.FDOCUMENTSTATUS='C' WHERE a.FDOCUMENTSTATUS='C'
) a "; ) a ) a ";
var list = this.SelectListPage<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc "); var list = this.SelectListPage<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");
return list; return list;
} }