后面还是没有司机的名字呢 完成 所有地方都要同步修改 完成

username@email.com

2025-03-17 ed362a4ba76884eb0a356fe29f490139e8de6f6d

后面还是没有司机的名字呢   完成
所有地方都要同步修改   完成

周一上班把“送货安排”中的“逾期”数据全部删掉   完成

车辆安排中没有填写联系人和联系电话信息的就不显示，空白  完成

列表按照这个顺序调整表格的顺序 完成

 CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs

@@ -94,7 +94,23 @@
        /// <returns></returns>
        public IEnumerable<Model.OA_CarManage> SelectListByFirmId(Guid FirmId)
        {
            return iOA_CarManageDAL.SelectListByFirmId(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.WebForm/Pages/business/DeliverPlanList.aspx.cs

@@ -310,7 +310,20 @@
                  this.txtCustormerName.Value.Trim(),
                    this.selBusinessManager.Value,this.selPaiche.Value
              );
          

            foreach (var oA_DeliverPlan  in oA_DeliverPlans)
            {
                oA_DeliverPlan.DizhiLianxirenDianhua = oA_DeliverPlan.Dizhi;
                if (!string.IsNullOrEmpty(oA_DeliverPlan.Lianxiren))
                {
                    oA_DeliverPlan.DizhiLianxirenDianhua += " 联系人：" + oA_DeliverPlan.Lianxiren;
                }

                if (!string.IsNullOrEmpty(oA_DeliverPlan.Dianhua))
                {
                    oA_DeliverPlan.DizhiLianxirenDianhua += " 电话：" + oA_DeliverPlan.Dianhua;
                }
            }




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

@@ -110,19 +110,7 @@
                this.selBuyerId.DataBind();
                this.selBuyerId.Items.Insert(0, new ListItem("请选择", ""));
                var  oA_CarManages = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
                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 + ")";
                        }
                    }
                    

                }
               

                this.selCarId.DataSource = oA_CarManages;
                this.selCarId.DataTextField = "CarNumber";

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

@@ -531,15 +531,15 @@
                           送货单号

                        </th>--%>

                        <th style="text-align: center;" width="70">

                            要求到达时间

                            要求时间

                        </th>

                        <th style="text-align: center;"width="100">

                            实际到达时间

                         <th width="60">

                            车辆

                        </th>

                        <th width="70">

                           业务经理

                        </th>

                        <th width="100">

                           <th width="60">

                            驾驶员

                        </th> 
                          <th width="100">

                            客户单位

                        </th>

                        <th style="text-align: center;"width="200">

@@ -550,23 +550,28 @@
                        <th width="60">

                            送货单单数

                        </th>

                       <th width="60">

                            车辆

                          <th width="70">

                           业务经理

                        </th>

                        <%--   <th width="60">

                            驾驶员

                        </th>--%>

                         <th width="200">

                            注意事项

                        </th>

                        <th style="text-align: center;"width="100">

                            到达时间

                        </th>

                       <th width="200">

                            工作考评

                        </th>

                      
                        
                      
                       <%-- <th width="200">

                           问题反馈 </th> 

                           --%>

                          

                       

                        <th width="200">

                            注意事项

                        </th>

                       <th width="200">

                            工作考评

                        </th>

                       
                      
                       

                         

                       <th width="60">

@@ -604,12 +609,13 @@
                                <td>

                                    <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>

                                </td>

                                <td>

                                      <%#Eval("DeliveredTime", "{0:yyyy-MM-dd HH:mm}")%>

                                 <td>

                                    <%#Eval("CarName")%>

                                </td>

                                 <td>

                                    <%#Eval("BusinessManager")%>

                                </td>

                                    <%#Eval("DriverName")%>

                                </td> 
                                
                                <td>

                                    <%#Eval("CompanyName")%>

                                </td>

@@ -620,18 +626,20 @@
                                <td>

                                   <%#Eval("shuliang")%>  

                                </td>

                               <td>

                                    <%#Eval("CarName")%>

                                
                                 <td>

                                    <%#Eval("BusinessManager")%>

                                </td>

                                 <%--<td>

                                    <%#Eval("DriverName")%>

                                </td>--%>

                                <%-- <td>

                                    <%#Eval("wentifankui")%>

                                </td>--%>

                                 <td>

                                 <a href='javascript:void(0)' title='点击修改注意事项' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Remark").ToString()==""?"修改注意事项":Eval("Remark")%>    </a>    

                                </td>

                              <td>

                                      <%#Eval("DeliveredTime", "{0:yyyy-MM-dd HH:mm}")%>

                                </td>

                                <%-- <td>

                                    <%#Eval("wentifankui")%>

                                </td>--%>

                                
                                  <td>

                                   <a href='javascript:void(0)' title='点击修改工作考评' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"修改工作考评":Eval("Gongzuokaoping")%>    </a>    

                                </td>


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

@@ -328,6 +328,17 @@
                List<OA_CorporateClientsContract> fileDataList = null;
                foreach (var oA_DeliverPlan in oA_DeliverPlans)
                {
                    oA_DeliverPlan.DizhiLianxirenDianhua = oA_DeliverPlan.Dizhi;
                    if (!string.IsNullOrEmpty(oA_DeliverPlan.Lianxiren))
                    {
                        oA_DeliverPlan.DizhiLianxirenDianhua += " 联系人：" + oA_DeliverPlan.Lianxiren;
                    }

                    if (!string.IsNullOrEmpty(oA_DeliverPlan.Dianhua))
                    {
                        oA_DeliverPlan.DizhiLianxirenDianhua += " 电话：" + oA_DeliverPlan.Dianhua;
                    }

                    oA_DeliverPlan.SonghuodanTupian = "暂无";

                    string sqlStr = string.Format(@"     select * from  [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=3 order by [CreateTime]   ", oA_DeliverPlan.Keyid);