username@email.com
2025-11-06 556c6f8e225932462065eaee6c76e2dcff80ba40
送货统计修改
4个文件已修改
19 ■■■■ 已修改文件
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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; }
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>;//执行查询
        }
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;
            }
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;
            }