在“编号”和“片区”直接增加一列“送货时间”，该送货时间显示进行了“送货安排”操作的学校的时间，没有安排送货的学校就是空白 完成

username@email.com

9 小时以前 d3205f4627ceb7af1344ce77715def28fee5545b

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

@@ -24,7 +24,8 @@
        OA_CarManageBll _OA_CarManageBll = null;
        CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
        CoreDeliverOrderItemBLL _CoreDeliverOrderItemBLL = null;

        public string biaotou = "";
        public string biaowei = "";


        //初始化
@@ -65,13 +66,13 @@


            //已经送货数量
            var coreDeliverOrderItemssonghuo = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id );
            var coreDeliverOrderItemssssss = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByplanOrderids(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id ).OrderByDescending(x=>x.MakeTime);

            


            

            var coreDeliverOrderItemssonghuo = coreDeliverOrderItemssssss.Where(x => x.OrderState == 2);
 


@@ -103,6 +104,41 @@




            //送货数量统计
            var coreDeliverOrderItemssssssgroup = coreDeliverOrderItemssssss.GroupBy(p => new {p.MakeTime }) // 多个字段作为匿名类型分组键
            .Select(g => new CoreDeliverOrderItem
            {
                // 分组字段
                MakeTime = g.Key.MakeTime
            }).OrderByDescending(x=>x.MakeTime).ToList();
            string biaotou2 = "";
            foreach (var coreDeliverOrderItem1  in coreDeliverOrderItemssssssgroup)
            {
                biaotou += "<th style=\"text-align:center\" > "+ coreDeliverOrderItem1.MakeTime.Value.ToString("yyyy-MM-dd") + " </th>";
                biaotou2 += "<th style=\"text-align:center\" > 节约（" + coreDeliverOrderItem1.MakeTime.Value.ToString("MM月dd日") + " ）</th>";
            }

            biaotou += biaotou2;


            //送货数量统计
            var coreDeliverOrderItemssssssgroupxiangxi = coreDeliverOrderItemssssss.GroupBy(p => new { p.MakeTime, p.ZYBName, p.ZYBSpecification }) // 多个字段作为匿名类型分组键
            .Select(g => new CoreDeliverOrderItem
            {
                // 分组字段
                MakeTime = g.Key.MakeTime,
                // 分组字段
                ZYBName = g.Key.ZYBName,
                ZYBSpecification = g.Key.ZYBSpecification,
                // 统计结果
                //Count = g.Count(), // 每组人数
                //AverageSalary = g.Average(p => p.Salary), // 平均工资
                Number = g.Sum(p => p.Number), // 工资总和
                LessNumber = g.Sum(p => p.LessNumber)
            }).OrderByDescending(x => x.MakeTime).ToList();


            foreach (var coreDeliverOrderItem in coreDeliverOrderItems)
            {
             var deliverOrderItem  =  coreDeliverOrderItemsgroup.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification).FirstOrDefault();
@@ -122,8 +158,25 @@
                    }
                }

                biaowei += "<tr>";
               
                biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.ZYBSpecification + coreDeliverOrderItem.ZYBName + " </td> ";
                biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.DingdanNumber + " </td> ";
                biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.WeisongNumber + " </td> ";

                string biaowei2 = "";
                foreach (var coreDeliverOrderItem1 in coreDeliverOrderItemssssssgroup)
                {

                    var deliverOrderItemaaaaaaaa = coreDeliverOrderItemssssssgroupxiangxi.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification && x.MakeTime == coreDeliverOrderItem1.MakeTime).FirstOrDefault();

                    biaowei += " <td style=\"text-align: center;\" > " + deliverOrderItemaaaaaaaa.Number + " </td> ";
                    biaowei2 += " <td style=\"text-align: center;\" > " + deliverOrderItemaaaaaaaa.LessNumber + " </td> ";
                }

                biaowei += biaowei2;

                biaowei += "</tr>";
                   
            }

@@ -131,8 +184,7 @@



            this.RepClientList.DataSource = coreDeliverOrderItems;
            this.RepClientList.DataBind();
            
            
        }