提交

username@email.com

2 天以前 e4ee60ed94d24e394a7895daa9fb98df813e5953

提交

 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs

@@ -292,6 +292,17 @@
            return _eC_OrderBasicDAL.GetOrderByIds(orderIds);
        }


        /// <summary>
        /// 根据订单编号获取订单 
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
        {
            return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId);
        }

        /// <summary>
        /// 根据订单编号获取自动外协订单
        /// </summary>

 CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs

@@ -207,7 +207,7 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
            string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
            string BuyerName, string createTimeStart, string createTimeEnd,string OrderState,string shifou)
        {
            string Condition = " and b.FirmId ='" + FirmId + "'  ";

@@ -217,7 +217,16 @@
            }
            else
            {
                Condition += " and a.OrderState  in( 0,1,2 ) ";
                if (!string.IsNullOrEmpty(shifou))
                {
                    Condition += " and a.OrderState  in( 0,1 ) ";
                }
                else
                {
                    Condition += " and a.OrderState  in( 0,1,2 ) ";
                }

                
            }
            if (DriverId.HasValue)
            {

 CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs

@@ -166,6 +166,16 @@
        /// <returns></returns>
        IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds);



        /// <summary>
        /// 根据订单编号获取订单 
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId);


        /// <summary>
        /// 发起订单属性改变请求
        /// </summary>

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs

@@ -1530,6 +1530,20 @@
        }



        /// <summary>
        /// 根据类型查询 订单
        /// </summary>
        /// <param name="orderId">订单编号</param>
        /// <returns></returns>
        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));
            return result;
        }


        /// <summary>
        /// 根据客户ID和订单支付状态获取订单列表 
        /// </summary>

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

@@ -105,7 +105,10 @@
                        客户名称：
                    </td>
                    <td>
                        <input id='txtBuyerName' runat="server" maxlength='100' />
                        <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
                         <datalist id="browsers">
                               <%=xiala %>
                                </datalist>
                    </td>
                       <td class="ali03">
                        送货时间：

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

@@ -20,6 +20,8 @@
    {
        CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
        public string xiala = "";

        //初始化
        public DeliverWorkBookAnPaiList()
@@ -27,6 +29,7 @@
            
            bll_OA_StaffBLL = new OA_StaffBLL();
            _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
            bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
        }

        //页面加载
@@ -41,9 +44,9 @@
                this.selDriver.DataBind();
                this.selDriver.Items.Insert(0, new ListItem("全部", ""));

                

                 

               

                BindList();
            }
@@ -53,6 +56,13 @@
        //绑定数据
        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 + "\">";


            }
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
@@ -75,6 +85,10 @@
                    {
                        coreDeliverOrder.DriverName = oA_Staff1.Name;
                    }
                    else
                    {
                        coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
                    }
                }
                     
            }

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

@@ -89,6 +89,7 @@
        }
        $(function () {
            $(".AlreadyReply").remove();

        });
    </script>
    <style type="text/css">
@@ -105,7 +106,15 @@
                        客户名称：
                    </td>
                    <td>
                        <input id='txtBuyerName' runat="server" maxlength='100' />
                        
                        <input id='txtBuyerName' runat="server" maxlength='100' list="browsers" />
                           <datalist id="browsers">
                               <%=xiala %>
                                </datalist>
       
        
         
   
                    </td>
                       <td class="ali03">
                        送货时间：

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

@@ -20,6 +20,8 @@
    {
        CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
        public string xiala = "";

        //初始化
        public DeliverWorkBookLiShiAnPaiList()
@@ -27,6 +29,7 @@
            
            bll_OA_StaffBLL = new OA_StaffBLL();
            _CoreDeliverOrderBLL = new CoreDeliverOrderBLL();
            bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
        }

        //页面加载
@@ -41,23 +44,32 @@
                this.selDriver.DataBind();
                this.selDriver.Items.Insert(0, new ListItem("全部", ""));

                

                 
               

                BindList();

                BindList("shifou");
            }
             
        }

        //绑定数据
        private void BindList()
        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 + "\">";


            }

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

            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); 
            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); 
            foreach (var coreDeliverOrder in coreDeliverOrders)
            {
                if (coreDeliverOrder.DriverId.HasValue)
@@ -75,6 +87,10 @@
                    {
                        coreDeliverOrder.DriverName = oA_Staff1.Name;
                    }
                    else
                    {
                        coreDeliverOrder.DriverName = coreDeliverOrder.DeliveryMoble;
                    }
                }
                     
            }