From 556c6f8e225932462065eaee6c76e2dcff80ba40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 06 十一月 2025 12:28:20 +0800
Subject: [PATCH] 送货统计修改
---
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs | 5 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs | 6 ++++--
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs | 6 ++++--
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
index a112db5..8040f18 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
@@ -115,6 +115,11 @@
public System.Int32 songhuonums { get; set; }
/// <summary>
+ /// 鑺傜害鏁伴噺
+ /// </summary>
+ public System.Int32 LessNumber { get; set; }
+
+ /// <summary>
/// 搴撳瓨鏁伴噺
/// </summary>
public System.Int32 kucunnums { get; set; }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
index eaad58e..92a993a 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
@@ -192,7 +192,7 @@
/// <returns></returns>
public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid)
{
- return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as PlanOrderId,b.[MakeTime],b.[OrderState] ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] ) ", " c.[orderkeyid] = " + orderkeyid + "") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+ return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as PlanOrderId,b.[MakeTime],b.[OrderState] ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] ) ", " c.[orderkeyid] = " + orderkeyid + " and ( b.[OrderState] = 1 or b.[OrderState] = 2)") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
index 1c9e275..f333103 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
@@ -134,7 +134,8 @@
// 缁熻缁撴灉
//Count = g.Count(), // 姣忕粍浜烘暟
//AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
- Number = g.Sum(p => p.Number) // 宸ヨ祫鎬诲拰
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
}).ToList();
@@ -153,13 +154,14 @@
if (coreDeliverOrderItem != null)
{
cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
+ cmsPlanOrderItem.LessNumber = coreDeliverOrderItem.LessNumber;
}
cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;
- cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
+ cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums - cmsPlanOrderItem.LessNumber;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
index 286130f..b7bc5e1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
@@ -136,7 +136,8 @@
// 缁熻缁撴灉
//Count = g.Count(), // 姣忕粍浜烘暟
//AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
- Number = g.Sum(p => p.Number) // 宸ヨ祫鎬诲拰
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
}).ToList();
@@ -155,13 +156,14 @@
if (coreDeliverOrderItem != null)
{
cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
+ cmsPlanOrderItem.LessNumber = coreDeliverOrderItem.LessNumber;
}
cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;
- cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
+ cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums - cmsPlanOrderItem.LessNumber;
}
--
Gitblit v1.9.1