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

username@email.com

17 小时以前 d3205f4627ceb7af1344ce77715def28fee5545b

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

@@ -21,6 +21,7 @@
        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
        CoreDeliverOrderBLL bll_CoreDeliverOrderBLL = null;
        public string biaotou = "";
        public string biaowei = "";

@@ -31,6 +32,7 @@
            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            bll_CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
        }

        //页面加载
@@ -41,7 +43,7 @@
            {
                 

                BindList("diyici");
                BindList();
            }
             
        }
@@ -102,7 +104,7 @@
          
            if (string.IsNullOrEmpty(biaotou))
            {
                string biaotou2 = " <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
                string biaotou2 = "<th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th><th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
                foreach (var inquiryWorkBookModel  in inquiryWorkBookModels)
                {
                    biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -120,6 +122,14 @@

            foreach (var coreCmsPlanOrder  in coreCmsPlanOrders)
            {
                //查询送货时间
                var coreDeliverOrder = bll_CoreDeliverOrderBLL.GetModelByorderid(coreCmsPlanOrder.id).Where(x => x.OrderState == 0 || x.OrderState == 1 || x.OrderState == 2).OrderByDescending(x => x.MakeTime).FirstOrDefault();
                if (coreDeliverOrder != null)
                {
                    coreCmsPlanOrder.MakeTime = coreDeliverOrder.MakeTime.Value.ToString("yyyy-MM-dd HH:mm");
                }


                var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
@@ -136,7 +146,15 @@
                        {
                            if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
                            {
                                biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                if (LessNumber + Number > 0)
                                {
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                }
                                else
                                {
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                }

                            }
                            else
                            {
@@ -241,6 +259,29 @@
                            }
                        }
                    }
                    else if (OrderState == "4")
                    {
                        var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
                        var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
                        var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
                        var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
                        if (songhuoshuliang <= 0 && jieyueshuliang <= 0)
                        {
                            coreCmsPlanOrder.biaoge += biaoge;
                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
                            {
                                PlanOrderid.Add(coreCmsPlanOrder.id);
                            }
                        }
                        else if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
                        {
                            coreCmsPlanOrder.biaoge += biaoge;
                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
                            {
                                PlanOrderid.Add(coreCmsPlanOrder.id);
                            }
                        }
                    }


                }
@@ -249,7 +290,7 @@



            biaowei = "   <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
            biaowei = "  <td></td>  <td></td> <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
            {
                var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
@@ -260,7 +301,15 @@
                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
                if ((nums - LessNumber - Number) > 0)
                {
                    biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
                    if(LessNumber + Number > 0)
                    {
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td>";
                    }
                    else
                    {
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
                    }
                    
                }
                else
                {