20260318 在司机后面把车牌号加上，如：“龚小虎（川G51020）” 送货计划的客户名称： 下单状态也查询

username@email.com

2026-03-19 006dca9a42fba209410906ef39e96912266f3561

20260318  在司机后面把车牌号加上，如：“龚小虎（川G51020）”   送货计划的客户名称： 下单状态也查询

 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs

@@ -298,9 +298,9 @@
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId)
        {
            return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId);
            return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId, MemberId);
        }

        /// <summary>

 CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs

@@ -112,5 +112,36 @@

            return oA_CarManages;
        }



        /// <summary>
        /// 根据厂商编号获取员工列表
        /// </summary>
        /// <param name="FirmId"></param>
        /// <param name="IsBusinessManager"></param>
        /// <param name="IsAccountManager"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_CarManage> SelectListByFirmIdnotstaff(Guid FirmId)
        {
            var oA_CarManages = iOA_CarManageDAL.SelectListByFirmId(FirmId);
            //OA_StaffBLL _OA_StaffBLL = new OA_StaffBLL();
            //foreach (var oA_CarManage in oA_CarManages)
            //{
            //    if (oA_CarManage.StaffID.HasValue)
            //    {
            //        var oA_Staff = _OA_StaffBLL.GetModelByKeyid(oA_CarManage.StaffID);
            //        if (oA_Staff != null)
            //        {
            //            oA_CarManage.CarNumber = oA_CarManage.CarNumber + "(" + oA_Staff.Name + ")";
            //        }
            //    }


            //}

            return oA_CarManages;
        }

    }
}

 CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs

@@ -173,7 +173,7 @@
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId);
        IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId);


        /// <summary>

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs

@@ -1536,10 +1536,10 @@
        /// </summary>
        /// <param name="orderId">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId)
        {
            
            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and (OrderState = 4 or OrderState = 2 or OrderState = 3 )", PrintTypeId));
            //string sss = "EC_OrderBasic" + string.Format(" PrintTypeId = {0} and SellerId = '{1}' and OrderTypeId=1 and (OrderState = 4 or OrderState = 2 or OrderState = 3 or OrderState = 1)", PrintTypeId, MemberId.ToString());
            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and SellerId = '{1}' and OrderTypeId=1 and (OrderState = 4 or OrderState = 2 or OrderState = 3 or OrderState = 1)", PrintTypeId, MemberId.ToString()));
            return result;
        }


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

@@ -99,9 +99,19 @@


                


                this.selCarId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机");
                var staffs  = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机");
                var  oA_CarManages =_OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
                foreach(var staff in staffs)
                {
                   var oA_CarManage = oA_CarManages.Where(x => x.StaffID == staff.Keyid).FirstOrDefault();
                    {
                        if(oA_CarManage != null)
                        {
                            staff.Name = staff.Name + "(" + oA_CarManage.CarNumber + ")";
                        }
                    }
                }
                this.selCarId.DataSource = staffs;
                this.selCarId.DataTextField = "Name";
                this.selCarId.DataValueField = "Keyid";
                this.selCarId.DataBind();

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

@@ -98,10 +98,21 @@



                
                var staffs = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机");
                var oA_CarManages = _OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
                foreach (var staff in staffs)
                {
                    var oA_CarManage = oA_CarManages.Where(x => x.StaffID == staff.Keyid).FirstOrDefault();
                    {
                        if (oA_CarManage != null)
                        {
                            staff.Name = staff.Name + "(" + oA_CarManage.CarNumber + ")";
                        }
                    }
                }


                this.selCarId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机");
                this.selCarId.DataSource = staffs;
                this.selCarId.DataTextField = "Name";
                this.selCarId.DataValueField = "Keyid";
                this.selCarId.DataBind();

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

@@ -60,7 +60,7 @@
                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).OrderBy(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();

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

@@ -60,7 +60,7 @@
                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).OrderBy(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();