反馈类型明细表修改，通话记录增加筛选

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -106,10 +106,8 @@ namespace CallCenterApi.Interface.Controllers.report
             dt.Columns.Add("东北");
             dt.Columns.Add("合计");
             dt.Columns.Add("即时办结率");
-            dt.Columns.Add("超期数量");
-            dt.Columns.Add("满意数量");
-            dt.Columns.Add("不满意数量");
-            for (int i = 0; i < 5; i++)
+           
+            for (int i = 0; i < 8; i++)
             {
                 DataRow drNew = dt.NewRow();
                 switch (i)
@@ -129,12 +127,36 @@ namespace CallCenterApi.Interface.Controllers.report
                     case 4:
                         drNew["反馈类型"] = "建议";
                         break;
+                    case 5:
+                        drNew["反馈类型"] = "超期数量";
+                        break;
+                    case 6:
+                        drNew["反馈类型"] = "满意数量";
+                        break;
+                    case 7:
+                        drNew["反馈类型"] = "不满意数量";
+                        break;
                 }
                 string nsg = "";
-                if (i > 0)
+                if (i > 0&& i<5)
                 {
                     nsg = "and F_Type=" + i;
                 }
+              else   if (i > 4)
+                {
+                    if (i ==5)
+                    {
+                        nsg = "and F_IsOver=" + 1;
+                    }
+                   else  if (i == 6)
+                    {
+                        nsg = "and F_VisitResult in('非常满意','满意')";
+                    }
+                    else if (i == 7)
+                    {
+                        nsg = "and F_VisitResult='不满意'";
+                    }
+                }
                 drNew["新乡"] = woBLL.GetModelList(sql + "and F_SalesBase='新乡'" + nsg).Count.ToString();
                 drNew["九江"] = woBLL.GetModelList(sql + "and F_SalesBase='九江'" + nsg).Count.ToString(); ;
                 drNew["新疆"] = woBLL.GetModelList(sql + "and F_SalesBase='新疆' " + nsg).Count.ToString();
@@ -150,9 +172,6 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     drNew["即时办结率"] = string.Format("0.00%");
                 }
-                drNew["超期数量"] = woBLL.GetModelList(sql + "and F_IsOver=1" + nsg).Count.ToString();
-                drNew["满意数量"] = woBLL.GetModelList(sql + "and F_VisitResult in('非常满意','满意')" + nsg).Count.ToString();
-                drNew["不满意数量"] = woBLL.GetModelList(sql + "and F_VisitResult='不满意'" + nsg).Count.ToString();
                 dt.Rows.Add(drNew);
             }
 
@@ -189,7 +208,7 @@ namespace CallCenterApi.Interface.Controllers.report
             List<marketList> markets = new List<marketList>();
 
 
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 8; i++)
             {
                 marketList brand = new marketList();
                 switch (i)
@@ -209,12 +228,36 @@ namespace CallCenterApi.Interface.Controllers.report
                     case 4:
                         brand.typename = "建议";
                         break;
+                    case 5:
+                        brand.typename = "超期数量";
+                        break;
+                    case 6:
+                        brand.typename = "满意数量";
+                        break;
+                    case 7:
+                        brand.typename = "不满意数量";
+                        break;
                 }
                 string nsg = "";
-                if (i > 0)
+                if (i > 0 && i < 5)
                 {
                     nsg = "and F_Type=" + i;
                 }
+                else if (i > 4)
+                {
+                    if (i == 5)
+                    {
+                        nsg = "and F_IsOver=" + 1;
+                    }
+                    else if (i == 6)
+                    {
+                        nsg = "and F_VisitResult in('非常满意','满意')";
+                    }
+                    else if (i == 7)
+                    {
+                        nsg = "and F_VisitResult='不满意'";
+                    }
+                }
 
                 brand.salexinxinag = woBLL.GetModelList(sql + "and F_SalesBase='新乡'" + nsg).Count;
                 brand.salejiujiang = woBLL.GetModelList(sql + "and F_SalesBase='九江'" + nsg).Count;
@@ -231,11 +274,6 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     brand.immediate = string.Format("0.00%");
                 }
-
-                brand.overdue = woBLL.GetModelList(sql + "and F_IsOver=1" + nsg).Count;
-
-                brand.satisfied = woBLL.GetModelList(sql + "and F_VisitResult in('非常满意','满意')" + nsg).Count;
-                brand.dissatisfied = woBLL.GetModelList(sql + "and F_VisitResult='不满意'" + nsg).Count;
                 markets.Add(brand);
             }
 
@@ -2982,7 +3020,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 model.efficiency = string.Format("-{0:f2}% ", Percentile);
                 modelList.Add(model);
             }
-            modelList.Sort((a, b) => a.number .CompareTo(b.number ));
+            modelList.Sort((a, b) => b .number .CompareTo(a .number ));
             var obj = new
             {
                 state = "success",

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -256,7 +256,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                         string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
                         string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
 
-                        string strpageindex = RequestString.GetQueryString("page");
+                        string strpageindex = RequestString.GetQueryString("pageindex");
                         int pageindex = 1;
                         string strpagesize = RequestString.GetQueryString("pagesize");
                         int pagesize = 10;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -39,7 +39,8 @@ namespace CallCenterApi.Interface.Controllers.tel
             string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
             string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
             string dept = HttpUtility.UrlDecode(RequestString.GetQueryString("dept"));
-
+            string depttype = HttpUtility.UrlDecode(RequestString.GetQueryString("depttype"));
+            
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
@@ -131,6 +132,10 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 sql += " and CallState='" + callstate + "'";
             }
+            if (depttype .Trim() != "")
+            {
+                sql += " and DealType='" + depttype + "'";
+            }
             if (calltype.Trim() != "")
             {
                 sql += " and CallType='" + calltype + "'";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1646,51 +1646,54 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 for (int i = 0; i < model1.Count; i++)
                 {
                     WorkOrderNewInput model = new WorkOrderNewInput();
+                    Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
                     if (!string.IsNullOrEmpty(model1[i].F_CustomerID))
                     {
-                       // var sql = "and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'";
-                        //var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
-                        Model.T_Cus_CustomerBaseNew cuModel = customerBaseBLL .GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                        if (cuModel != null)
+                        cuModel = customerBaseBLL .GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
+                    }
+                    else
+                    {
+                        var sql = $" and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'";
+                        cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql).FirstOrDefault(); 
+                    }
+                    if (cuModel != null)
+                    {
+                        if (!string.IsNullOrEmpty(cuModel.F_AreaID))
                         {
-                            if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                            if (pdModel != null)
                             {
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
-                                if (pdModel != null)
-                                {
-                                    model.F_AreaName = pdModel.F_DeptName;
-                                }
+                                model.F_AreaName = pdModel.F_DeptName;
                             }
-                            if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                        }
+                        if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                        {
+                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
+                            if (pdModel1 != null)
                             {
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
-                                if (pdModel1 != null)
-                                {
-                                    model.F_BranchName = pdModel1.F_DeptName;
-                                }
+                                model.F_BranchName = pdModel1.F_DeptName;
                             }
-                            model.F_CompanyName = cuModel.F_CompanyName;//公司名称
-                            model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
-                            model.F_Salesman = cuModel.F_Salesman;
-                            model.F_SalesPhone = cuModel.F_SalesPhone;
-                            model.F_Legal = cuModel.F_Legal;
-                            model.F_LegalPhone = cuModel.F_LegalPhone;
-                            model.F_AddressProvince = cuModel.F_AddressProvince;
-                            model.F_AddressCity = cuModel.F_AddressCity;
-                            model.F_AddressCountry = cuModel.F_AddressCountry;
-                            model.F_AddressTownship = cuModel.F_AddressTownship;
-                            model.F_AddressFull = cuModel.F_AddressFull;
-                            model.F_Brands = cuModel.F_Brands;
-                            model.F_Channel = cuModel.F_Channel;
-                            model.F_IsRunXLX = cuModel.F_IsRunXLX;
-                            model.F_AnnualSales = cuModel.F_AnnualSales;
-                            model.F_Formula = cuModel.F_Formula;
-                            model.F_RaiseCrops = cuModel.F_RaiseCrops;
-                            model.F_PlantingArea = cuModel.F_PlantingArea;
-                            model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
                         }
+                        model.F_CompanyName = cuModel.F_CompanyName;//公司名称
+                        model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
+                        model.F_Salesman = cuModel.F_Salesman;
+                        model.F_SalesPhone = cuModel.F_SalesPhone;
+                        model.F_Legal = cuModel.F_Legal;
+                        model.F_LegalPhone = cuModel.F_LegalPhone;
+                        model.F_AddressProvince = cuModel.F_AddressProvince;
+                        model.F_AddressCity = cuModel.F_AddressCity;
+                        model.F_AddressCountry = cuModel.F_AddressCountry;
+                        model.F_AddressTownship = cuModel.F_AddressTownship;
+                        model.F_AddressFull = cuModel.F_AddressFull;
+                        model.F_Brands = cuModel.F_Brands;
+                        model.F_Channel = cuModel.F_Channel;
+                        model.F_IsRunXLX = cuModel.F_IsRunXLX;
+                        model.F_AnnualSales = cuModel.F_AnnualSales;
+                        model.F_Formula = cuModel.F_Formula;
+                        model.F_RaiseCrops = cuModel.F_RaiseCrops;
+                        model.F_PlantingArea = cuModel.F_PlantingArea;
+                        model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
                     }
-
                     if (valcode(model1[i].F_MaterialID.ToString(), 11))
                     {
                         model.F_MaterialID =model1[i].F_MaterialID;//验证物料编码为11位纯数字
@@ -2439,34 +2442,48 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
                 model.F_Source = model.F_Source.ToString();//工单来源
             }
-            if (type == 2)
-            {
+           
                 if (input.F_Type == 2||input.F_Type == 3)
                 {
-                    //if (string .IsNullOrEmpty(input.F_CustomerID) )
-                    //{
-                    //    int i = 0;
-                    //    while (true)
-                    //    {
-                    //        if (!getunique(0, GetCusCode(i)))
-                    //        {
-                    //            input.F_CustomerID = GetCusCode(i);
-                    //            break;
-                    //        }
-                    //        else
-                    //        {
-                    //            i++;
-                    //        }
-                    //    }
-                    //    var Customer = new Model.T_Cus_CustomerBaseNew();
-                    //    #region 保存客户基本信息
-                    //    Customer = inputtooCustomer(Customer, input);
-                    //    Customer.F_CreateBy = usercode;
-                    //    Customer.F_CreateOn = DateTime.Now;
-                    //    Customer.F_IsDelete = 0;
-                    //    #endregion
-                    //    int b = customerBaseBLL.Add(Customer);
-                    //}
+                    if (string.IsNullOrEmpty(input.F_CustomerID))
+                    {
+                        var sql = $" and  F_LegalPhone  = '" + input.F_CusPhone.Trim() + "'";
+                        var Customer = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql).FirstOrDefault(); ;
+                        if (Customer != null)
+                        {
+                            model.F_CustomerID = Customer.F_CustomerCode;
+                            if (!string.IsNullOrEmpty(input.F_Salesman))
+                                Customer.F_Salesman = input.F_Salesman;
+                            if (!string.IsNullOrEmpty(input.F_SalesPhone))
+                                Customer.F_SalesPhone = input.F_SalesPhone;
+                            if (!string.IsNullOrEmpty(input.F_Brands))
+                                Customer.F_Brands = input.F_Brands;
+                            if (!string.IsNullOrEmpty(input.F_AreaName))
+                                Customer.F_AreaID = input.F_AreaName.Trim ();
+                            if (!string.IsNullOrEmpty(input.F_BranchName))
+                                Customer.F_BranchID = input.F_BranchName.Trim();
+                            customerBaseBLL .Update(Customer);
+                        }
+                    }
+                    else
+                    {
+                        var Customer = customerBaseBLL.GetModel(input.F_CustomerID.Trim());
+                        if (Customer != null)
+                        {
+                            if (!string.IsNullOrEmpty(input.F_Salesman))
+                                Customer.F_Salesman = input.F_Salesman;
+                            if (!string.IsNullOrEmpty(input.F_SalesPhone))
+                                Customer.F_SalesPhone = input.F_SalesPhone;
+                            if (!string.IsNullOrEmpty(input.F_Brands))
+                                Customer.F_Brands = input.F_Brands;
+                            if (!string.IsNullOrEmpty(input.F_AreaName))
+                                Customer.F_AreaID = input.F_AreaName.Trim();
+                            if (!string.IsNullOrEmpty(input.F_BranchName))
+                                Customer.F_BranchID = input.F_BranchName.Trim();
+                            customerBaseBLL.Update(Customer);
+                        }
+
+                    }
                     if (IsMaterial(input))
                     {
                         if (string.IsNullOrEmpty(input.F_MaterialID))
@@ -2490,8 +2507,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                     }
                 }
-                
-            }
+          
             #region 基本字段
             model.F_Source = input.F_Source.ToString();//工单来源
             model.F_WxOpenId = input.F_WxOpenId;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -38,7 +38,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         public ActionResult GetList(string code, string cusname, string cusphone,string createby, string starttime, string endtime, string keywords, string companyname, string province, string city,
-            string country,string telephone, string township, string touser, int source=0,int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
+            string country,string telephone, string township, string touser,string strvisit,string endvisit, int source=0,int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
            
               int userId = CurrentUser.UserData.F_UserId;
@@ -53,10 +53,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
-                if (starttime.Trim() != "" && starttime != "undefined")
+                if (!string.IsNullOrEmpty(starttime))
                     sql += " and datediff(day,F_CreateOn,'" + starttime + "')<=0 ";
-                if (endtime.Trim() != "" && endtime != "undefined")
+                if (!string.IsNullOrEmpty(endtime))
                     sql += " and datediff(day,F_CreateOn,'" + endtime + "')>=0   ";
+                if (!string.IsNullOrEmpty(strvisit))
+                    sql += " and datediff(day,F_VisitOn,'" + strvisit + "')<=0 ";
+                if (!string .IsNullOrEmpty (endvisit))
+                    sql += " and datediff(day,F_VisitOn,'" + endvisit + "')>=0   ";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -2226,7 +2230,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         ///综合查询列表
         /// </summary>
         public ActionResult GetComprehensive(string code, string cusname,string createby, string starttime, string endtime, string keywords, string cusphone, string companyname, string province, string city,
-            string country, string township,string category,string salebase, string touser, int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
+            string country, string township,string category,string salebase, string touser,string visitby, string visitresult, int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2289,6 +2293,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(visitby))//回访人
+                    sql += $" and F_VisitBy like '%" + visitby.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(visitresult))//回访结果
+                    sql += $" and F_VisitResult like '%" + visitresult.Trim() + "%'";
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 if (ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "YWY")
@@ -2450,8 +2458,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
-                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")";
+              
                 sql += $" and F_IsOver=" + 1;
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
@@ -3759,51 +3766,55 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 for (int i = 0; i < model1.Count; i++)
                 {
                     WorkOrderNewInput model = new WorkOrderNewInput();
-                    if (!string .IsNullOrEmpty(model1[i].F_CustomerID))
+                    Model.T_Cus_CustomerBaseNew cuModel = new Model.T_Cus_CustomerBaseNew();
+                    if (!string.IsNullOrEmpty(model1[i].F_CustomerID))
                     {
-                          //  var sql = "and  F_LegalPhone ='" + model1[i ].F_CusPhone.Trim() + "'";
-                          //  var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
-                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                            if (cuModel != null)
-                            {
-                            if (!string .IsNullOrEmpty (cuModel.F_AreaID))
+                        cuModel = cusbll .GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
+                    }
+                    else
+                    {
+                        var sql = $" and  F_LegalPhone ='" + model1[i].F_CusPhone.Trim() + "'";
+                        cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql).FirstOrDefault();
+                    }
+                    if (cuModel != null)
+                    {
+                        if (!string.IsNullOrEmpty(cuModel.F_AreaID))
+                        {
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
+                            if (pdModel != null)
                             {
-                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(cuModel.F_AreaID));//通过公司id获取部门
-                                if (pdModel != null)
-                                {
-                                    model.F_AreaName = pdModel.F_DeptName;
-                                }
+                                model.F_AreaName = pdModel.F_DeptName;
                             }
-                               if (!string .IsNullOrEmpty (cuModel.F_BranchID))
+                        }
+                        if (!string.IsNullOrEmpty(cuModel.F_BranchID))
+                        {
+                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
+                            if (pdModel1 != null)
                             {
-                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(cuModel.F_BranchID));
-                                if (pdModel1 != null)
-                                {
-                                    model.F_BranchName = pdModel1.F_DeptName;
-                                }
-                            }
-                               model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
-                                model.F_Salesman = cuModel.F_Salesman;
-                                model.F_SalesPhone = cuModel.F_SalesPhone;
-                                model.F_Legal = cuModel.F_Legal;
-                                model.F_LegalPhone = cuModel.F_LegalPhone;
-                                model.F_AddressProvince = cuModel.F_AddressProvince;
-                                model.F_AddressCity = cuModel.F_AddressCity;
-                                model.F_AddressCountry = cuModel.F_AddressCountry;
-                                model.F_AddressTownship = cuModel.F_AddressTownship;
-                                model.F_AddressFull = cuModel.F_AddressFull;
-                                model.F_Brands = cuModel.F_Brands;
-                                model.F_Channel = cuModel.F_Channel; 
-                            model.F_Channel = cuModel.F_CompanyName ;
-                            model.F_IsRunXLX = cuModel.F_IsRunXLX;
-                                model.F_AnnualSales = cuModel.F_AnnualSales;
-                                model.F_Formula = cuModel.F_Formula;
-                                model.F_RaiseCrops = cuModel.F_RaiseCrops;
-                                model.F_PlantingArea = cuModel.F_PlantingArea;
-                                model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
+                                model.F_BranchName = pdModel1.F_DeptName;
                             }
+                        }
+                        model.F_CustomerID = cuModel.F_CustomerCode;//客户编码
+                        model.F_Salesman = cuModel.F_Salesman;
+                        model.F_SalesPhone = cuModel.F_SalesPhone;
+                        model.F_Legal = cuModel.F_Legal;
+                        model.F_LegalPhone = cuModel.F_LegalPhone;
+                        model.F_AddressProvince = cuModel.F_AddressProvince;
+                        model.F_AddressCity = cuModel.F_AddressCity;
+                        model.F_AddressCountry = cuModel.F_AddressCountry;
+                        model.F_AddressTownship = cuModel.F_AddressTownship;
+                        model.F_AddressFull = cuModel.F_AddressFull;
+                        model.F_Brands = cuModel.F_Brands;
+                        model.F_Channel = cuModel.F_Channel;
+                        model.F_Channel = cuModel.F_CompanyName;
+                        model.F_IsRunXLX = cuModel.F_IsRunXLX;
+                        model.F_AnnualSales = cuModel.F_AnnualSales;
+                        model.F_Formula = cuModel.F_Formula;
+                        model.F_RaiseCrops = cuModel.F_RaiseCrops;
+                        model.F_PlantingArea = cuModel.F_PlantingArea;
+                        model.F_FertilizerBrand = cuModel.F_FertilizerBrand;
                     }
-                   
+
                     if (valcode(model1[i].F_MaterialID.ToString(), 11))
                     {
                         model.F_MaterialID = model1[i].F_MaterialID;//验证物料编码为11位纯数字
@@ -4359,6 +4370,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             dModel.F_CreateBy = usercode;
             int f = mmBLL.Add(dModel);
         }
+      
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
@@ -4387,36 +4399,51 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_Source = model.F_Source.ToString();//工单来源
             }
                 #region 基本字段
-                if (type == 2)
-            {
+            
 
                 if (input.F_Type == 2 || input.F_Type == 3)
                 {
-                    //if (string .IsNullOrEmpty(input.F_CustomerID))
-                    //{
-                    //    int i = 0;
-                    //    while (true)
-                    //    {
-                    //        if (!getunique(0, GetCusCode(i)))
-                    //        {
-                    //            input.F_CustomerID = GetCusCode(i);
-                    //            break;
-                    //        }
-                    //        else
-                    //        {
-                    //            i++;
-                    //        }
-                    //    }
-                    //    #endregion
-                    //    var Customer = new Model.T_Cus_CustomerBaseNew();
-                    //    #region 保存客户基本信息
-                    //    Customer = inputtooCustomer(Customer, input);
-                    //    Customer.F_CreateBy = usercode;
-                    //    Customer.F_CreateOn = DateTime.Now;
-                    //    Customer.F_IsDelete = 0;
-                    //    #endregion
-                    //    int b = cusbll.Add(Customer);
-                    //  }
+                    if (string.IsNullOrEmpty(input.F_CustomerID))
+                    {
+                        var sql = $" and  F_LegalPhone  = '" + input.F_CusPhone.Trim() + "'";
+                        var Customer = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql).FirstOrDefault(); ;
+                        if (Customer!=null )
+                        {
+                            model.F_CustomerID = Customer.F_CustomerCode;
+                            if (!string.IsNullOrEmpty(input.F_Salesman))
+                                Customer.F_Salesman = input.F_Salesman;
+                            if (!string.IsNullOrEmpty(input.F_SalesPhone))
+                                Customer.F_SalesPhone = input.F_SalesPhone;
+                            if (!string.IsNullOrEmpty(input.F_Brands))
+                                Customer.F_Brands = input.F_Brands;
+                            if (!string.IsNullOrEmpty(input.F_AreaName))
+                                Customer.F_AreaID = input.F_AreaName.Trim();
+                            if (!string.IsNullOrEmpty(input.F_BranchName))
+                                Customer.F_BranchID = input.F_BranchName.Trim();
+                            cusbll.Update(Customer);
+                        }
+                       
+
+                    }
+                    else
+                    {
+                        var Customer = cusbll.GetModel(input.F_CustomerID.Trim());
+                        if (Customer!=null )
+                        {
+                            if (!string.IsNullOrEmpty(input.F_Salesman))
+                                Customer.F_Salesman = input.F_Salesman;
+                            if (!string.IsNullOrEmpty(input.F_SalesPhone))
+                                Customer.F_SalesPhone = input.F_SalesPhone;
+                            if (!string.IsNullOrEmpty(input.F_Brands))
+                                Customer.F_Brands = input.F_Brands;
+                            if (!string.IsNullOrEmpty(input.F_AreaName))
+                                Customer.F_AreaID = input.F_AreaName.Trim();
+                            if (!string.IsNullOrEmpty(input.F_BranchName))
+                                Customer.F_BranchID = input.F_BranchName.Trim();
+                            cusbll.Update(Customer);
+                        }
+                     
+                    }
                     if ( IsMaterial(input))
                     {
                         if (string.IsNullOrEmpty(input.F_MaterialID))
@@ -4440,7 +4467,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                     }
                 }
-            }
+           
             #endregion
             model.F_Canal = input.F_Canal;//生产批次号
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)