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

username@email.com

7 小时以前 d3205f4627ceb7af1344ce77715def28fee5545b

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

“送货计划”和“送货情况”的“客户名称”都改为下拉选项，已受理、未完成送货的所有作业本订单的客户名称都显示在下拉选项中   ，默认最近一次操作的学校。完成  （1）送货计划的列表中，在“司机”和“操作”之间要显示这个学校所有没有送货的作业本的明细（明细同“作业本送货”中的“查看送货情况”一样，但是只显示没有送货的数量明细，不需要显示“已送”的明细），列表下面还要显示合计。
（2）“送货计划”中默认所有进行了“送货安排”操作的学校明细，按时间排序（明天在前面，后面的时间在后面）  这条完成
（1）“送货情况”默认当天及当天之前的送货学校，按时间排序（当天在前面，更早的时间在下面）
（2）“送货状态”和“操作”之间显示这个学校的已送和未送数量明细，同同“作业本送货”中的“查看送货情况”的明细显示完全一样。 这条完成
（1）“本次送货数量”改为历次送货数量，表格标题显示送货的日期
（2）”本次节约数量”改为显示历次送货节约的数量，表格标题改为“节约（X月X日 ）”。 完成

 CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs

@@ -99,7 +99,7 @@


        /// <summary>
        /// 获取全部合作客户
        ///  获取所有的送货明细，状态2
        /// </summary>
        /// <param name="orderkeyid">主键id</param>
        /// <returns></returns>
@@ -110,8 +110,11 @@
        }


       


        /// <summary>
        /// 获取全部合作客户
        /// 获取所有的送货明细，状态0，1
        /// </summary>
        /// <param name="orderkeyid">主键id</param>
        /// <returns></returns>
@@ -123,6 +126,18 @@


        /// <summary>
        /// 获取所有的送货明细，状态0，1，2
        /// </summary>
        /// <param name="orderkeyid">主键id</param>
        /// <returns></returns>
        public IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderids(int orderkeyid)
        {
            Query query = new Query();
            return _ICoreCmsPlanOrderItemDAL.GetDeliverModelsByplanOrderids(orderkeyid);
        }


        /// <summary>
        /// 获取全部合作客户
        /// </summary>
        /// <param name="Keyid">主键id</param>

 CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs

@@ -177,7 +177,7 @@
                Condition += " and  b.shipAddress = '" + shipAddress + "'";
           
            if (!string.IsNullOrEmpty(BuyerName))
                Condition += " and  c.BuyerName like '%" + BuyerName + "%'";
                Condition += " and  c.Keyid  = '" + BuyerName + "'";
            

            if (!string.IsNullOrEmpty(createTimeStart))
@@ -193,7 +193,7 @@
            {
                new Criterion("", Condition),

                new Criterion("orderBy"," MakeTime desc  ")
                new Criterion("orderBy"," MakeTime ")
            };
            query.Criteria = criterias;
            return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
@@ -213,7 +213,14 @@

            if (!string.IsNullOrEmpty(OrderState))
            {
                Condition += " and  a.OrderState = " + OrderState + " ";
                if (OrderState != "4")
                {
                    Condition += " and  a.OrderState = " + OrderState + " ";
                }
                else
                {
                    Condition += " and a.OrderState  in( 0,1 ) ";
                }
            }
            else
            {
@@ -238,7 +245,7 @@
                Condition += " and  b.shipAddress = '" + shipAddress + "'";

            if (!string.IsNullOrEmpty(BuyerName))
                Condition += " and  c.BuyerName like '%" + BuyerName + "%'";
                Condition += " and  c.Keyid  = '" + BuyerName + "'";


            if (!string.IsNullOrEmpty(createTimeStart))

 CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs

@@ -49,5 +49,13 @@
        /// <returns></returns>
        IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderid(int planorderkeyid);


        /// <summary>
        /// 根据总orderid获得信息
        /// </summary>
        /// <param name="orderkeyid">编号</param>
        /// <returns></returns>
        IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByplanOrderids(int orderkeyid);

    }
}

 CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs

@@ -203,7 +203,10 @@

        public System.Decimal keYongAmounts { get; set; }


        /// <summary>
        /// 建立时间
        /// </summary>		
        public string MakeTime { get; set; }
        /// <summary>
        /// 建立时间
        /// </summary>        

 CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrder.cs

@@ -54,6 +54,11 @@
        public System.String shipAddress { get; set; }
        public System.String DriverName { get; set; }

        /// <summary>
        /// 表格string 
        /// </summary>		
        public string biaoge { get; set; }

        public System.String BuyerName { get; set; }
        public int OrderState { get; set; }


 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs

@@ -1539,7 +1539,7 @@
        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
        {
            
            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and OrderState = 4 ", PrintTypeId));
            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and (OrderState = 4 or OrderState = 2 or OrderState = 3 )", PrintTypeId));
            return result;
        }


 CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs

@@ -208,6 +208,17 @@


        /// <summary>
        /// 全部查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByplanOrderids(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 + " and   b.[OrderState] in (0,1,2) ") as IList<Model.CoreDeliverOrderItem>;//执行查询
        }


        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>

 CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs

@@ -28,7 +28,7 @@
        /// <summary>
        /// 分页默认排序字段
        /// </summary>
        const string ORDERBY = " MakeTime desc ";
        const string ORDERBY = " MakeTime";
        #endregion
        public CoreDeliverOrderDAL()
        {

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

@@ -174,11 +174,10 @@
        </div>
        
        <div>
            <asp:Repeater ID="RepClientList" runat="server">
                <HeaderTemplate>
           
                    <table class="tableStyle">
                        <tr>
                            <th   style="text-align: center">
                           <th   style="text-align: center">
                                品种
                            </th>
                            <th style="text-align: center">
@@ -188,20 +187,21 @@
                              <th style="text-align: center">
                                未送数量
                            </th>
                            <%=biaotou %>
                            <%-- 
                              <th style="text-align: center">
                                本次送货数量
                            </th>
                              
                              <th style="text-align: center">
                               本次节约数量
                            </th>
                            </th>--%>
                              
                        </tr>
                </HeaderTemplate>
                <ItemTemplate>
             
                    <tr>
                        
                        <td style="text-align: center"  >
                         <%=biaowei %>
                       <%-- <td style="text-align: center"  >
                         <%#Eval("ZYBSpecification")%>    <%#Eval("ZYBName")%>   
                        </td>
                        <td   style="text-align: center"  >
@@ -215,15 +215,14 @@
                        </td>
                         <td  style="text-align: center" >
                           <%#Eval("LessNumber")%> 
                        </td>
                        </td>--%>
                       
                    </tr>
                </ItemTemplate>
                <FooterTemplate>
                
                
                 
                    </table>
                </FooterTemplate>
            </asp:Repeater>
                
            
        </div>
    </div>

 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,17 +66,17 @@


            //已经送货数量
            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);





            //送货数量统计
            var coreDeliverOrderItemsgroup = coreDeliverOrderItemssonghuo.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 多个字段作为匿名类型分组键
@@ -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,17 +158,33 @@
                    }
                }

               
                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>";

            }





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

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

@@ -103,14 +103,5 @@
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanZhuangtai;

        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;
    }
}

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

@@ -157,7 +157,7 @@
            if (SaveOrder())
            {
                //操作成功
                JavaScript.MessageBox("操作成功", this,true,true);
                JavaScript.MessageBoxsssss("操作成功", this,true,true);
            }
            else
            {
@@ -201,7 +201,7 @@
                var sss = _CoreDeliverOrderBLL.UpdateModel(coreDeliverOrder);

                //操作成功
                JavaScript.MessageBox("撤销成功", this, true, true);
                JavaScript.MessageBoxsssss("撤销成功", this, true, true);
                return;



 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx

@@ -30,7 +30,7 @@

        //查看明细
        function onViewCarInsurance(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "查看明细", Width: 900, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "查看明细", Width: 1500, Height: 900 });
        }
        //保险
        function onViewfahuo(keyid) {
@@ -105,10 +105,9 @@
                        客户名称：
                    </td>
                    <td>
                        <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
                         <datalist id="browsers">
                               <%=xiala %>
                                </datalist>
                       
                         <select keepdefaultstyle='true' id='selBuyerName' runat="server" >
                        </select>
                    </td>
                       <td class="ali03">
                        送货时间：
@@ -134,7 +133,7 @@
                 
                     
                    <td  >
                        <asp:Button ID="btn_Submit" Text="查询" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
                        <asp:Button ID="btn_Search" Text="查询" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
                    </td>
                </tr>
            </table>
@@ -151,9 +150,9 @@
                            <th style="text-align: center">
                                日期
                            </th>
                             <th style="text-align: center">
                           <%--  <th style="text-align: center">
                                客户名称
                            </th>
                            </th>--%>
                            <th style="text-align: center">
                                片区
                            </th>
@@ -163,27 +162,27 @@
                            <th style="text-align: center">
                                司机
                            </th>
                           
                             <%=biaotou %>
                             
                          
                            <th style="text-align: center">
                           <%-- <th style="text-align: center">
                                操作
                            </th>
                            </th>--%>
                        </tr>
                </HeaderTemplate>
                <ItemTemplate>
                    <tr>
                        
                        <td style="text-align: center">
                            <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
                            <%#Container.ItemIndex + 1 %>
                        </td>
                        <td style="text-align: center">
                        <td style="text-align: center;white-space: nowrap;">
                          <%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
                        </td>
                           
                        <td style="text-align: center">
                       <%-- <td style="text-align: center">
                           <%#Eval("BuyerName")%>
                        </td>
                        </td>--%>
                         <td style="text-align: center">
                            <%#Eval("pianqu")%>
                        </td>
@@ -194,7 +193,7 @@
                        <td style="text-align: center">
                         <%#Eval("DriverName")%>
                        </td>
                        
                         <%#Eval("biaoge")%>
                        <td class="Operate " style="text-align: center">
                            <span    onclick="onViewCarInsurance('<%#Eval("id")%>')">查看明细</span>
                            <span menu_member_case_id="case_onEdit" menu_member_case_name="修改"    onclick="onEdit('<%#Eval("id")%>')">修改</span>
@@ -206,12 +205,13 @@
                    </tr>
                </ItemTemplate>
                <FooterTemplate>
                     <tr>
                      <%=biaowei %>
                            </tr>
                    </table>
                </FooterTemplate>
            </asp:Repeater>
            <div id="page">
                <uc:UCPager ID="UCPager1" runat="server" />
            </div>
           
        </div>
    </div>
    </form>

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

@@ -11,6 +11,7 @@
using CY.Infrastructure.Common;
using CY.BLL.EC;
using CY.Model.Inquiry;
using CY.Infrastructure.Cache;

namespace CY.WebForm.Pages.business
{
@@ -22,6 +23,14 @@
        OA_StaffBLL bll_OA_StaffBLL = null;
        EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
        public string xiala = "";
        private static ICacheStrategy CACHE = null;//缓存接口对象 
        public string biaotou = "";
        public string biaowei = "";
        

        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;

        //初始化
        public DeliverWorkBookAnPaiList()
@@ -30,12 +39,18 @@
            bll_OA_StaffBLL = new OA_StaffBLL();
            _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
            bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//初始化缓存工厂
            CACHE = CacheFactory.GetCacher();//创建缓存
            CACHE.TimeOut = 6000;
        }

        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {
            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
            //UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
            if (!IsPostBack)
            {
                this.selDriver.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机"); ;
@@ -45,9 +60,17 @@
                this.selDriver.Items.Insert(0, new ListItem("全部", ""));



               

                this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderByDescending(x => x.CreateTime); ;
                this.selBuyerName.DataTextField = "BuyerName";
                this.selBuyerName.DataValueField = "Keyid";
                this.selBuyerName.DataBind();
                //this.selBuyerName.Items.Insert(0, new ListItem("全部", ""));
                this.txtBeginDate.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
                var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId + "BuyerName") as string;//从缓存中获取数据访问实现层程序集
                if (null != stringBuyerName)
                {
                    this.selBuyerName.Value = stringBuyerName;
                }
                BindList();
            }
             
@@ -56,18 +79,51 @@
        //绑定数据
        private void BindList()
        {
            var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
            foreach (var eC_OrderBasic in eC_OrderBasics)
            {
                xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";
            //var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
            //foreach (var eC_OrderBasic in eC_OrderBasics)
            //{
            //    xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";


            //}
            CACHE.AddObject(CurrentUser.TrueMemberId + "BuyerName", this.selBuyerName.Value.Trim());//将程序集写入缓存
            Pagination pa = new Pagination();
            pa.PageSize = 500;
            pa.PageIndex = 1;

            var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.selBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim()); ;
            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
            InquiryCommonModel _inquiryCommonModel = null;
            if (null == _eC_OrderPrintParameter)
            {
                _inquiryCommonModel = new InquiryCommonModel();
            }
            else
            {
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;

            }
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);

            var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.txtBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim()); ;
            if (string.IsNullOrEmpty(biaotou))
            {
                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\"  > " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
                    biaotou2 += "  <th style=\"text-align:center\" > 未送 </th> ";


                }
                biaotou += "<th style=\"text-align:center\" >  操作</th></tr><tr>" + biaotou2+ "<th style=\"text-align:center\" >  </th>";
            }
            var ids = coreDeliverOrders.Select(x => x.OrderId).ToArray();

            var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x=> ids.Contains(x.id));
            var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.orderId));
            var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.PlanOrderId));


            foreach (var coreDeliverOrder in coreDeliverOrders)
            {
                if (coreDeliverOrder.DriverId.HasValue)
@@ -90,12 +146,100 @@
                        coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
                    }
                }
                     


                var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreDeliverOrder.OrderId);
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    string biaoge = "";
                    var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
                    if (cmsPlanOrderItem != null)
                    {
                        var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreDeliverOrder.OrderId && x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);

                        var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                        var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);

                        if (cmsPlanOrderItem.nums > 0)
                        {
                            if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
                            {
                                if (LessNumber + Number > 0)
                                {
                                    biaoge += "   <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                }
                                else
                                {
                                    biaoge += "   <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                }

                            }
                            else
                            {
                                biaoge += "   <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                            }
                        }
                        else
                        {
                            biaoge += "   <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                        }



                    }
                    else
                    {
                        biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                    }



                    coreDeliverOrder.biaoge += biaoge;




                }



            }


            biaowei = " <td></td>  <td></td> <td style=\"text-align:center\">  </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </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 && ids.Contains(x.orderId)).Sum(x => x.nums);

                var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.PlanOrderId));

                var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
                if ((nums - LessNumber - Number) > 0)
                {
                    if (LessNumber + Number > 0)
                    {
                        biaowei += "   <td style=\"text-align:center\">  <span style=\"color:#ff69b4;\" >" + (nums - LessNumber - Number) + " </span></td>";
                    }
                    else
                    {
                        biaowei += "   <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
                    }

                }
                else
                {
                    biaowei += "   <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                }



            }
            biaowei += "  <td></td>";

            this.RepClientList.DataSource = coreDeliverOrders;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
            //UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }

        //分页事件

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.designer.cs

@@ -42,13 +42,13 @@
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;

        /// <summary>
        /// txtBuyerName 控件。
        /// selBuyerName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
        protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerName;

        /// <summary>
        /// txtBeginDate 控件。
@@ -87,13 +87,13 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtXuexiao;

        /// <summary>
        /// btn_Submit 控件。
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_Submit;
        protected global::System.Web.UI.WebControls.Button btn_Search;

        /// <summary>
        /// RepClientList 控件。
@@ -103,14 +103,5 @@
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;

        /// <summary>
        /// UCPager1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx

@@ -30,7 +30,7 @@

        //查看明细
        function onViewCarInsurance(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "查看明细", Width: 900, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookAnPaiDetail.aspx?orderId=" + keyid, Title: "查看明细", Width: 1500, Height: 900 });
        }
        //保险
        function onViewfahuo(keyid) {
@@ -107,10 +107,8 @@
                    </td>
                    <td>
                        
                        <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
                           <datalist id="browsers">
                               <%=xiala %>
                                </datalist>
                        <select keepdefaultstyle='true' id='selBuyerName' runat="server" >
                        </select>
       
        
         
@@ -143,6 +141,7 @@
                    <td>
                        <select keepdefaultstyle='true' id='selOrderState' runat="server" >
                            <option value="">请选择</option>
                             <option value="4" selected="selected" >未完成</option>
                            <option value="0">未送</option>
                            <option value="1">配送中</option>
                            <option value="2">已送</option>
@@ -164,12 +163,12 @@
                            <th width="30" style="text-align: center">
                                编号
                            </th>
                            <th style="text-align: center">
                            <th style="text-align: center;">
                                日期
                            </th>
                             <th style="text-align: center">
                          <%--   <th style="text-align: center">
                                客户名称
                            </th>
                            </th>--%>
                            <th style="text-align: center">
                                片区
                            </th>
@@ -182,26 +181,26 @@
                           <th style="text-align: center">
                                送货状态
                            </th>
                             
                              <%=biaotou %>
                          
                            <th style="text-align: center">
                           <%-- <th style="text-align: center">
                                操作
                            </th>
                            </th>--%>
                        </tr>
                </HeaderTemplate>
                <ItemTemplate>
                    <tr>
                        
                        <td style="text-align: center">
                            <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
                            <%#Container.ItemIndex + 1 %>
                        </td>
                        <td style="text-align: center">
                        <td style="text-align: center;white-space: nowrap;">
                          <%#Eval("MakeTime", "{0:yyyy-MM-dd HH:mm}")%>
                        </td>
                           
                        <td style="text-align: center">
                       <%-- <td style="text-align: center">
                           <%#Eval("BuyerName")%>
                        </td>
                        </td>--%>
                         <td style="text-align: center">
                            <%#Eval("pianqu")%>
                        </td>
@@ -215,7 +214,7 @@
                          <td style="text-align: center">
                         <%#Eval("OrderStateName")%>
                        </td>
                        
                         <%#Eval("biaoge")%>
                        <td class="Operate " style="text-align: center">
                            <span    onclick="onViewCarInsurance('<%#Eval("id")%>')">查看明细</span>
                            
@@ -226,12 +225,13 @@
                    </tr>
                </ItemTemplate>
                <FooterTemplate>
                    <tr>
                      <%=biaowei %>
                            </tr>
                    </table>
                </FooterTemplate>
            </asp:Repeater>
            <div id="page">
                <uc:UCPager ID="UCPager1" runat="server" />
            </div>
            
        </div>
    </div>
    </form>

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

@@ -11,6 +11,7 @@
using CY.Infrastructure.Common;
using CY.BLL.EC;
using CY.Model.Inquiry;
using CY.Infrastructure.Cache;

namespace CY.WebForm.Pages.business
{
@@ -22,6 +23,14 @@
        OA_StaffBLL bll_OA_StaffBLL = null;
        EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
        public string xiala = "";
        private static ICacheStrategy CACHE = null;//缓存接口对象 
        public string biaotou = "";
        public string biaowei = "";


        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;

        //初始化
        public DeliverWorkBookLiShiAnPaiList()
@@ -30,12 +39,18 @@
            bll_OA_StaffBLL = new OA_StaffBLL();
            _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
            bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//初始化缓存工厂
            CACHE = CacheFactory.GetCacher();//创建缓存
            CACHE.TimeOut = 6000;
        }

        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {
            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
           // UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
            if (!IsPostBack)
            {
                this.selDriver.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机"); ;
@@ -45,10 +60,18 @@
                this.selDriver.Items.Insert(0, new ListItem("全部", ""));


               


                BindList("shifou");
                this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderByDescending(x=>x.CreateTime);
                this.selBuyerName.DataTextField = "BuyerName";
                this.selBuyerName.DataValueField = "Keyid";
                this.selBuyerName.DataBind();
                //this.selBuyerName.Items.Insert(0, new ListItem("全部", ""));
                this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
                var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId+ "BuyerName") as string;//从缓存中获取数据访问实现层程序集
                if (null != stringBuyerName)
                {
                    this.selBuyerName.Value = stringBuyerName;
                }
                BindList();
            }
             
        }
@@ -57,19 +80,53 @@
        private void BindList(string shifou="")
        {

            var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
            foreach (var eC_OrderBasic in eC_OrderBasics)
            {
                xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";
            //var eC_OrderBasics = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4);
            //foreach (var eC_OrderBasic in eC_OrderBasics)
            //{
            //    xiala += "<option value=\"" + eC_OrderBasic.BuyerName + "\">";


            }
            //}
            CACHE.AddObject(CurrentUser.TrueMemberId + "BuyerName", this.selBuyerName.Value.Trim());//将程序集写入缓存

            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            pa.PageSize = 500;
            pa.PageIndex = 1;

            var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPageLishi(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.txtBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(),this.selOrderState.Value, shifou); 
            var coreDeliverOrders = _CoreDeliverOrderBLL.SelectModelPageLishi(pa, CurrentUser.MemberId, this.selDriver.Value.ToInt32(),this.txtXuexiao.Value.Trim(),this.selBuyerName.Value.Trim(), this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(),this.selOrderState.Value, shifou);

            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
            InquiryCommonModel _inquiryCommonModel = null;
            if (null == _eC_OrderPrintParameter)
            {
                _inquiryCommonModel = new InquiryCommonModel();
            }
            else
            {
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;

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

            if (string.IsNullOrEmpty(biaotou))
            {
                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> <th style=\"text-align:center\" >  </th>";
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
                    biaotou2 += " <th style=\"text-align:center\" > 已送 </th> <th style=\"text-align:center\" > 未送 </th> ";


                }
                biaotou += "<th style=\"text-align:center\" >  操作</th></tr><tr>" + biaotou2 + "<th style=\"text-align:center\" >  </th>";
            }
            var ids = coreDeliverOrders.Select(x => x.OrderId).ToArray();

            var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.id));
            var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.orderId));
            var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.PlanOrderId));


            foreach (var coreDeliverOrder in coreDeliverOrders)
            {
                if (coreDeliverOrder.DriverId.HasValue)
@@ -92,12 +149,99 @@
                        coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
                    }
                }
                     

                var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreDeliverOrder.OrderId);
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    string biaoge = "";
                    var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
                    if (cmsPlanOrderItem != null)
                    {
                        var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreDeliverOrder.OrderId && x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);

                        var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                        var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);

                        if (cmsPlanOrderItem.nums > 0)
                        {
                            if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
                            {
                                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
                            {
                                biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                            }
                        }
                        else
                        {
                            biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                        }



                    }
                    else
                    {
                        biaoge += " <td style=\"text-align:center\">  </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
                    }



                    coreDeliverOrder.biaoge += biaoge;




                }



            }


            biaowei = "<td></td> <td></td>  <td></td> <td style=\"text-align:center\">  </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </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 && ids.Contains(x.orderId)).Sum(x => x.nums);

                var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.PlanOrderId));

                var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
                if ((nums - LessNumber - Number) > 0)
                {
                    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
                {
                    biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                }



            }
            biaowei += "  <td></td>";

            this.RepClientList.DataSource = coreDeliverOrders;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
           // UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }

        //分页事件

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.designer.cs

@@ -42,13 +42,13 @@
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;

        /// <summary>
        /// txtBuyerName 控件。
        /// selBuyerName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
        protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerName;

        /// <summary>
        /// txtBeginDate 控件。
@@ -112,14 +112,5 @@
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;

        /// <summary>
        /// UCPager1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
    }
}

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

@@ -135,10 +135,13 @@
                            <th width="30" style="text-align: center" >
                                编号
                            </th>
                            <th style="text-align: center" >
                             <th   style="text-align: center;width:120px;" >
                                &nbsp;&nbsp;&nbsp;送货时间&nbsp;&nbsp;&nbsp;
                            </th>
                            <th  width="100" style="text-align: center" >
                                片区
                            </th>
                            <th style="text-align: center" >
                            <th  width="120" style="text-align: center" >
                                学校
                            </th>
                             <%=biaotou %>
@@ -152,7 +155,10 @@
                        <td style="text-align: center">
                          <%#Eval("Bianhao")%>  <%--<%#Container.ItemIndex + 1%>--%>
                        </td>
                        <td style="text-align: center">
                        <td style="text-align: center;white-space: nowrap;">
                         <%#Eval("MakeTime")%>
                        </td>
                         <td style="text-align: center">
                         <%#Eval("pianqu")%>
                        </td>
                        <td style="text-align: center">

 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();
        }

        //页面加载
@@ -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> <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)
                {
@@ -138,7 +148,7 @@
                            {
                                if (LessNumber + Number > 0)
                                {
                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:pink;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                                    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
                                {
@@ -280,7 +290,7 @@



            biaowei = "  <td></td>  <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);
@@ -293,7 +303,7 @@
                {
                    if(LessNumber + Number > 0)
                    {
                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:pink;\" >" + (nums - LessNumber - Number) + " </span></td>";
                        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
                    {