CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -26,11 +26,12 @@
        private static ICacheStrategy CACHE = null;//缓存接口对象 
        public string biaotou = "";
        public string biaowei = "";
        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
        OA_CarManageBll _OA_CarManageBll = null;
        //初始化
        public DeliverWorkBookAnPaiList()
@@ -45,6 +46,7 @@
            CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//初始化缓存工厂
            CACHE = CacheFactory.GetCacher();//创建缓存
            CACHE.TimeOut = 6000;
            _OA_CarManageBll = new OA_CarManageBll();
        }
        //页面加载
@@ -60,12 +62,12 @@
                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.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37, CurrentUser.MemberId).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3 || x.OrderState == 1).OrderBy(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");
                //this.txtBeginDate.Value = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd");
                var stringBuyerName = CACHE.RetrieveObject(CurrentUser.TrueMemberId + "BuyerName") as string;//从缓存中获取数据访问实现层程序集
                if (null != stringBuyerName)
                {
@@ -91,7 +93,7 @@
            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()); ;
            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(), this.selOrderState.Value); ;
            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(this.selBuyerName.Value.Trim().ToInt32().Value);
            InquiryCommonModel _inquiryCommonModel = null;
            if (null == _eC_OrderPrintParameter)
@@ -107,7 +109,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> <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> <th style=\"text-align:center\" >  </th>";
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    biaotou += " <th style=\"text-align:center\"  > " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -123,7 +125,7 @@
            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));
            var oA_CarManages = _OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
            foreach (var coreDeliverOrder in coreDeliverOrders)
            {
                if (coreDeliverOrder.DriverId.HasValue)
@@ -132,6 +134,11 @@
                    if (oA_Staff != null)
                    {
                        coreDeliverOrder.DriverName = oA_Staff.Name;
                        var carManage = oA_CarManages.Where(x => x.StaffID == oA_Staff.Keyid).FirstOrDefault();
                        if (carManage != null)
                        {
                            coreDeliverOrder.DriverName +=  "(" + carManage.CarNumber + ")";
                        }
                    }
                }
                else
@@ -140,6 +147,11 @@
                    if (oA_Staff1 != null)
                    {
                        coreDeliverOrder.DriverName = oA_Staff1.Name;
                        var carManage = oA_CarManages.Where(x => x.StaffID == oA_Staff1.Keyid).FirstOrDefault();
                        if (carManage != null)
                        {
                            coreDeliverOrder.DriverName += "(" + carManage.CarNumber + ")";
                        }
                    }
                    else
                    {
@@ -206,7 +218,7 @@
            }
            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> ";
            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);