送货统计修改

username@email.com

2025-11-06 556c6f8e225932462065eaee6c76e2dcff80ba40

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs

@@ -64,7 +64,7 @@

            //var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value);

            var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=>x.OrderState == 2);
            var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value);

            var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);

@@ -94,7 +94,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;

            }
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);

            var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
@@ -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;
            }