用户，转派修改

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -96,6 +96,13 @@ namespace CallCenterApi.BLL
             return dal.GetworkModel(F_WorkNumber);
         }
         /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount GetName(string F_Name)
+        {
+            return dal.GetName(F_Name);
+        }
+        /// <summary>
         /// 根据Openid 获取用户
         /// </summary>
         /// <param name="openid"></param>

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -371,6 +371,31 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
+        public Model.T_Sys_UserAccount GetName(string F_WorkNumber)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId from T_Sys_UserAccount ");
+            strSql.Append(" where F_UserName=@F_UserName");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50)
+            };
+            parameters[0].Value = F_WorkNumber;
+
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
         public Model.T_Sys_UserAccount GetworkModel(string F_WorkNumber)
         {
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -202,32 +202,35 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="cont"></param>
         public SmsSingleSenderResult SMSSingleshot(string  phone,string  cont)
         {
-            try
-            {
-             
-
-               SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
-                  var result = ssender.send(0, "86", phone,
-                cont, "", "");
-                   Console.WriteLine(result);
-                return result;
-
-            }
-            catch (JSONException e)
-            {
-                Console.WriteLine(e);
-                return null;
-            }
-            catch (HTTPException e)
+            string sms = Configs.GetValue("sms");
+            if (sms == "1")
             {
-                Console.WriteLine(e);
-                return null;
+                try
+                {
+                    SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
+                    var result = ssender.send(0, "86", phone,
+                  cont, "", "");
+                    Console.WriteLine(result);
+                    return result;
+                }
+                catch (JSONException e)
+                {
+                    Console.WriteLine(e);
+                    return null;
+                }
+                catch (HTTPException e)
+                {
+                    Console.WriteLine(e);
+                    return null;
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                    return null;
+                }
             }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
+            else
                 return null;
-            }
         }
         /// <summary>
         /// 单发短信
@@ -236,19 +239,16 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="cont"></param>
         public SmsSingleSenderResult SMSSingleshot(int templateId, string [] msg,string cusphone)
         {
+            string sms = Configs.GetValue("sms");
+            if (sms == "1")
+            {
                 try
                 {
-                SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
-                var result = ssender.sendWithParam("86", cusphone,
-                    templateId, msg, smsSign, "", "");
-              
-             //   SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
-               //     var result = ssender.send(0, "86", phone,
-                 //    cont, "", "");
-              //      Console.WriteLine(result);
+                    SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
+                    var result = ssender.sendWithParam("86", cusphone,
+                        templateId, msg, smsSign, "", "");
                     return result;
-               
-            }
+                }
                 catch (JSONException e)
                 {
                     Console.WriteLine(e);
@@ -264,6 +264,10 @@ namespace CallCenterApi.Interface.Controllers
                     Console.WriteLine(e);
                     return null;
                 }
+            }
+            else
+                return null;
+           
         }
         /// <summary>
         /// 群发短信

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -275,6 +275,7 @@ namespace CallCenterApi.Interface.Controllers
                     }
                    
                 }
+              
              
                 if (input.Username != null)
                     userAccountModel.F_UserName = input.Username.Trim();

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

@@ -63,6 +63,7 @@ namespace CallCenterApi.Interface.Controllers.report
             public string salejiujiang;
             public string salexinjiang;
             public string saledongbei;
+            public string cheyong;
             public string total;
         }
 
@@ -73,6 +74,7 @@ namespace CallCenterApi.Interface.Controllers.report
             public int salejiujiang;
             public int salexinjiang;
             public int saledongbei;
+            public int cheyongniaosu;
             public int total;
             public string immediate;
             public int overdue;
@@ -97,13 +99,18 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-          //  sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
-            // var depts = new BLL.T_Wo_WorkOrder().GetModelList(sql);
+            var dicv = dicvalueBll.GetList(" F_DictionaryFlag='" + "XSJD" + "' and F_State=1 ").Tables[0];
+            List<Brand> list = new List<Brand>();
+            List<Model.T_Sys_DictionaryValue> dicval = new List<Model.T_Sys_DictionaryValue>();
+            if (dicv != null)
+            {
+                dicval = dicvalueBll.DataTableToList(dicv);
+            }
             dt.Columns.Add("反馈类型");
-            dt.Columns.Add("新乡");
-            dt.Columns.Add("九江");
-            dt.Columns.Add("新疆");
-            dt.Columns.Add("东北");
+            foreach (var it in dicval)
+            {
+                dt.Columns.Add(it.F_Name );
+            }
             dt.Columns.Add("合计");
             dt.Columns.Add("即时办结率");
            
@@ -146,7 +153,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (i ==5)
                     {
-                        nsg = "and F_Type !=3  and F_IsOver=" + 1 ;
+                        nsg = " and F_IsOver=" + 1 ;
                     }
                    else  if (i == 6)
                     {
@@ -157,10 +164,10 @@ namespace CallCenterApi.Interface.Controllers.report
                         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();
-                drNew["东北"] = woBLL.GetModelList(sql + "and F_SalesBase='东北'" + nsg).Count.ToString();
+                foreach (var it in dicval)
+                {
+                    drNew[it.F_Name ] = woBLL.GetModelList(sql + "and F_SalesBase='"+ it.F_Name+"'" + nsg).Count.ToString();
+                }
                 drNew["合计"] = woBLL.GetModelList(sql + nsg).Count.ToString();
                 int a = woBLL.GetModelList(sql + "and F_DealType='当即办理'" + nsg).Count;
                 int b = woBLL.GetModelList(sql + nsg).Count;
@@ -204,7 +211,7 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-          //  sql += $"  and T_Wo_WorkOrder.F_State in ( " + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate + ") "; ;
+         
             List<marketList> markets = new List<marketList>();
 
 
@@ -247,7 +254,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (i == 5)
                     {
-                        nsg = "and F_Type !=3 and F_IsOver=" + 1;
+                        nsg = " and F_IsOver=" + 1;
                     }
                     else if (i == 6)
                     {
@@ -258,11 +265,11 @@ namespace CallCenterApi.Interface.Controllers.report
                         nsg = "and F_VisitResult='不满意'";
                     }
                 }
-
                 brand.salexinxinag = woBLL.GetModelList(sql + "and F_SalesBase='新乡'" + nsg).Count;
                 brand.salejiujiang = woBLL.GetModelList(sql + "and F_SalesBase='九江'" + nsg).Count;
                 brand.salexinjiang = woBLL.GetModelList(sql + "and F_SalesBase='新疆'" + nsg).Count;
                 brand.saledongbei = woBLL.GetModelList(sql + "and F_SalesBase='东北'" + nsg).Count;
+                brand.cheyongniaosu = woBLL.GetModelList(sql + "and F_SalesBase='车用尿素'" + nsg).Count;
                 brand.total = woBLL.GetModelList(sql + nsg).Count;
                 int a = woBLL.GetModelList(sql + "and F_DealType='当即办理'" + nsg).Count;
                 int b = woBLL.GetModelList(sql + nsg).Count;
@@ -309,12 +316,14 @@ namespace CallCenterApi.Interface.Controllers.report
             List<Model.T_Wo_WorkOrder> workerjiujiang = woBLL.GetModelList(sql + "and F_SalesBase='九江'");
             List<Model.T_Wo_WorkOrder> workerxinjiang = woBLL.GetModelList(sql + "and F_SalesBase='新疆'");
             List<Model.T_Wo_WorkOrder> workerxinxiang = woBLL.GetModelList(sql + "and F_SalesBase='新乡'");
+            List<Model.T_Wo_WorkOrder> workercheyong = woBLL.GetModelList(sql + "and F_SalesBase='车用尿素'");
             List<Model.T_Wo_WorkOrder> workertotal = woBLL.GetModelList(sql);
             dt.Columns.Add("类型");
             dt.Columns.Add("新乡");
             dt.Columns.Add("九江");
             dt.Columns.Add("新疆");
             dt.Columns.Add("东北");
+            dt.Columns.Add("车用尿素");
             dt.Columns.Add("合计");
             for (int i = 0; i < ConsultingNeedslist.Count + Complaintlist.Count + SpotChecklist.Count + 5; i++)
             {
@@ -323,11 +332,13 @@ namespace CallCenterApi.Interface.Controllers.report
                 int salejiujiang = 0;
                 int salexinjiang = 0;
                 int salexinxiang = 0;
+                int cheyongniaosu = 0;
                 int total = 0;
                 saledongbei = workercount(i, workerdongbei, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 salejiujiang = workercount(i, workerjiujiang, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 salexinjiang = workercount(i, workerxinjiang, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 salexinxiang = workercount(i, workerxinxiang, ConsultingNeedslist, Complaintlist, SpotChecklist);
+                cheyongniaosu= workercount(i, workercheyong, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 total = workercount(i, workertotal, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 market brand = new market();
                 switch (i)
@@ -370,6 +381,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["九江"] = string.Format("{0:f2}%", salejiujiang / total * 100);
                         drNew["新疆"] = string.Format("{0:f2}%", salexinjiang / total * 100);
                         drNew["新乡"] = string.Format("{0:f2}%", salexinxiang / total * 100);
+                        drNew["车用尿素"] = string.Format("{0:f2}%", cheyongniaosu / total * 100);
                         drNew["合计"] = string.Format("{0:f2}%", 100);
                     }
                     else
@@ -378,6 +390,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["九江"] = "0.00%";
                         drNew["新疆"] = "0.00%";
                         drNew["新乡"] = "0.00%";
+                        drNew["车用尿素"] = "0.00%";
                         drNew["合计"] = "0.00%";
                     }
                 }
@@ -387,6 +400,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     drNew["九江"] = salejiujiang.ToString();
                     drNew["新疆"] = salexinjiang.ToString();
                     drNew["新乡"] = salexinxiang.ToString();
+                    drNew["车用尿素"] = cheyongniaosu.ToString();
                     drNew["合计"] = total.ToString();
                 }
                 dt.Rows.Add(drNew);
@@ -431,6 +445,7 @@ namespace CallCenterApi.Interface.Controllers.report
             List<Model.T_Wo_WorkOrder> workerjiujiang = woBLL.GetModelList(sql + "and F_SalesBase='九江'");
             List<Model.T_Wo_WorkOrder> workerxinjiang = woBLL.GetModelList(sql + "and F_SalesBase='新疆'");
             List<Model.T_Wo_WorkOrder> workerxinxiang = woBLL.GetModelList(sql + "and F_SalesBase='新乡'");
+            List<Model.T_Wo_WorkOrder> workerniaosu = woBLL.GetModelList(sql + "and F_SalesBase='车用尿素'");
             List<Model.T_Wo_WorkOrder> workertotal = woBLL.GetModelList(sql);
             List<market> markets = new List<market>();
 
@@ -441,11 +456,13 @@ namespace CallCenterApi.Interface.Controllers.report
                 int salejiujiang = 0;
                 int salexinjiang = 0;
                 int salexinxiang = 0;
+                int cheyong = 0;
                 int total = 0;
                 saledongbei = workercount(i, workerdongbei, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 salejiujiang = workercount(i, workerjiujiang, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 salexinjiang = workercount(i, workerxinjiang, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 salexinxiang = workercount(i, workerxinxiang, ConsultingNeedslist, Complaintlist, SpotChecklist);
+                cheyong = workercount(i, workerniaosu, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 total = workercount(i, workertotal, ConsultingNeedslist, Complaintlist, SpotChecklist);
                 market brand = new market();
                 switch (i)
@@ -488,6 +505,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         brand.salejiujiang = string.Format("{0:f2}%", salejiujiang / total * 100);
                         brand.salexinjiang = string.Format("{0:f2}%", salexinjiang / total * 100);
                         brand.salexinxiang = string.Format("{0:f2}%", salexinxiang / total * 100);
+                        brand.cheyong = string.Format("{0:f2}%", cheyong / total * 100);
                         brand.total = string.Format("{0:f2}%", 100);
                     }
                     else
@@ -496,6 +514,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         brand.salejiujiang = "0.00%";
                         brand.salexinjiang = "0.00%";
                         brand.salexinxiang = "0.00%";
+                        brand.cheyong  = "0.00%";
                         brand.total = "0.00%";
                     }
                 }
@@ -505,6 +524,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     brand.salejiujiang = salejiujiang.ToString();
                     brand.salexinjiang = salexinjiang.ToString();
                     brand.salexinxiang = salexinxiang.ToString();
+                    brand.cheyong = cheyong.ToString();
                     brand.total = total.ToString();
                 }
                 markets.Add(brand);
@@ -909,13 +929,13 @@ namespace CallCenterApi.Interface.Controllers.report
                     if (it.F_IsUsed == 0 && it.F_OptType == 1)
                     {
                         pending++;
-                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1  and F_Type !=3 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1   and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                     if (it.F_OptType == 2 && it.F_IsUsed == 0)
                     {
                         beprocessed++;
-                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_Type !=3 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1  and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                 }
@@ -997,13 +1017,13 @@ namespace CallCenterApi.Interface.Controllers.report
                     if (it .F_IsUsed ==0&&it .F_OptType ==1)
                     {
                         pending++;
-                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_Type !=3 and F_ID=" + it.F_WoID );
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1  and F_ID=" + it.F_WoID );
                         Overdue++;
                     }
                     if (it .F_OptType ==2&& it.F_IsUsed == 0)
                     {
                         beprocessed++;
-                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_Type !=3 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1  and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                 }
@@ -1057,8 +1077,12 @@ namespace CallCenterApi.Interface.Controllers.report
             public int visit;
             public int Overdue;
             public int visitcont;
+            public int verysatisfied;
             public int satisfied;
+            public int commonly;
             public int dissatisfied;
+            public int other;
+           
         }
         /// <summary>
         /// 导出客户回访数量表
@@ -1153,24 +1177,34 @@ namespace CallCenterApi.Interface.Controllers.report
             List<Returnvisit> returnvisits = new List<Returnvisit>();
             Returnvisit model = new Returnvisit();
             var workordewr = woBLL.GetModelList(sql + "and F_State in(10,11) and F_IsVisit =1");
-            model. name ="客户回访"; int bevisit = 0, visit = 0, Overdue = 0, satisfied = 0, dissatisfied = 0;int visitcont = 0;
+            model. name ="客户回访"; int bevisit = 0, visit = 0, Overdue = 0, verysatisfied = 0, satisfied=0, commonly=0, dissatisfied = 0;int visitcont = 0, other=0;
             var workorder = woBLL.GetModelList(sql + "and F_State in(10,11)");
             visitcont = workorder.Count;
             foreach (var it in workordewr)
             {
                 if (it.F_State == 10)
                     bevisit++;
+                if (it.F_IsOver == 1)
+                    Overdue++;
                 if (it.F_State == 11)
+                {
                     visit++;
-                if (it.F_IsOver == 1&&it .F_Type !="3")
-                    Overdue++;
-                if (it.F_VisitResult == "满意" || it.F_VisitResult == "非常满意")
-                    satisfied++;
-                if (it.F_VisitResult == "不满意")
-                    dissatisfied++;
+                    if (it.F_VisitResult == "非常满意")
+                        verysatisfied++;
+                    if (it.F_VisitResult == "满意")
+                        satisfied++;
+                    if (it.F_VisitResult == "一般")
+                        commonly++;
+                    if (it.F_VisitResult == "不满意")
+                        dissatisfied++;
+                    if (it.F_VisitResult == "其他" || it.F_VisitResult == "")
+                        other++;
+                }
+                   
             }
             model.bevisit = bevisit; model.visit = visit; model.visitcont = visitcont; model.Overdue = Overdue;
-            model.satisfied = satisfied; model.dissatisfied = dissatisfied;
+            model.satisfied = satisfied; model.dissatisfied = dissatisfied; model.verysatisfied = verysatisfied;
+            model.commonly = commonly;model.other = other;
             returnvisits.Add(model);
             return Success("获取成功", returnvisits
            );
@@ -2382,7 +2416,6 @@ question, int page = 1, int limit = 10)
                     case 4:
                         template.name = "东北";
                         break;
-                   
                 }
                 if (i > 0)
                 {
@@ -2535,7 +2568,7 @@ question, int page = 1, int limit = 10)
             model.overdue = new List<Template>();
             string sqloverdue = "";
             sqloverdue += "";
-            var modlelist = workOrder.GetModelList(sql + sqloverdue + "and F_IsOver=1 and F_Type !=3 " + time);
+            var modlelist = workOrder.GetModelList(sql + sqloverdue + "and F_IsOver=1  " + time);
             Template templatee = new Template();
             templatee.name = "合计";
             templatee.number =0;
@@ -2682,7 +2715,7 @@ question, int page = 1, int limit = 10)
         private bool Refresh()
         {
             int type = 0;
-            var modlelist = workOrder.GetModelList(" F_IsDelete=0 and F_Type !=3" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+            var modlelist = workOrder.GetModelList(" F_IsDelete=0 " + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
                 (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish + ")");
             if (modlelist.Count > 0)
             {

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

@@ -102,7 +102,7 @@ namespace CallCenterApi.Interface.Controllers.report
             Dictionary<string, List<List<string>>> body = new Dictionary<string, List<List<string>>>();
             //坐席
             //  DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_RoleId in (1,4,28,29) and F_DeleteFlag=0").Tables[0];//客服坐席、班长坐席、售前坐席、投诉坐席
-            DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_DeleteFlag=0 and F_SeatFlag=1  ").Tables[0];
+            DataTable dtable = new BLL.T_Sys_UserAccount().GetList("F_DeleteFlag=0 and F_SeatFlag=1   and  F_DeptId = 2").Tables[0];
             int allcount = dtable.Rows.Count;
             for (int i = 0; i < allcount; i++)
             {

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

@@ -1697,25 +1697,30 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 dapt = deptmodel1.F_ParentId;
                 deptname = deptmodel1.F_DeptName;
             }
+            int isbl = 0;
             if (dapt != 0)
             {
                 if (dapt == 11)
                 {
+                    isbl = 1;
                     nextda = 37;
                     opt = "流转市场管理科";
                 }
                 else if (dapt == 14)
                 {
+                    isbl = 1;
                     nextda = 57;
                     opt = "流转营销管理处";
                 }
                 else if (dapt == 15)
                 {
+                    isbl = 1;
                     nextda = 74;
                     opt = "流转策划推广";
                 }
                 else if (dapt == 16)
                 {
+                    isbl = 1;
                     nextda = 88;
                     opt = "流转销售部";
                 }
@@ -1726,6 +1731,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //}
                 else if (ua.F_DeptId == 17 || ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                 {
+                    isbl = 1;
                     nextda = ua.F_DeptId;
                     opt = "流转" + deptname;
                 }
@@ -1741,7 +1747,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             if (nextda != 0)
             {
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model .F_limit , sms, 0, 0, 0, time.ToString());
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model .F_limit , sms, 0, 0, 0, time.ToString(), isbl);
                 return res;
             }
             else
@@ -2334,7 +2340,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         model.F_AuditState = "";
                     }
-
+                   
                     model.F_AuditBy = model1[i].F_AuditBy;//审核人
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
@@ -2716,6 +2722,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
             ;
             return str;
         }
+        private bool IsCustomerBaseNew(WorkOrderNewInput input)
+        {
+            bool n = false;
+            if (!string.IsNullOrEmpty(input.F_CustomerID) || !string.IsNullOrEmpty(input.F_CompanyName)
+               || !string.IsNullOrEmpty(input.F_AreaName) || !string.IsNullOrEmpty(input.F_BranchName)
+                || !string.IsNullOrEmpty(input.F_Salesman) || !string.IsNullOrEmpty(input.F_SalesPhone)
+              || !string.IsNullOrEmpty(input.F_Brands) )
+            {
+                n = true;
+            }
+            return n;
+        }
         /// <summary>
         /// 添加客户
         /// </summary>
@@ -2852,14 +2870,74 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             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;
+                            Customer.F_SalesPhone = input.F_Brands;
                         if (!string.IsNullOrEmpty(input.F_AreaName))
-                            Customer.F_AreaID = input.F_AreaName.Trim();
+                        {
+                            Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
+                            try
+                            {
+                                pdModel = departmentBLL.GetModel(int.Parse(input.F_AreaName));
+                            }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(input.F_AreaName);
+                            }
+                            Customer.F_AreaID = pdModel.F_DeptId.ToString();
+                        }
+
                         if (!string.IsNullOrEmpty(input.F_BranchName))
-                            Customer.F_BranchID = input.F_BranchName.Trim();
+                        {
+                            Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
+                            try
+                            {
+                                pdModel = departmentBLL.GetModel(int.Parse(input.F_BranchName));
+                            }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(input.F_BranchName);
+                            }
+                            Customer.F_BranchID = pdModel.F_DeptId.ToString();
+                        }
+                        if (!string.IsNullOrEmpty(input.F_CompanyName ))
+                            Customer.F_CompanyName = input.F_CompanyName;
                         customerBaseBLL.Update(Customer);
                     }
+                    else
+                    {
+                        if (IsCustomerBaseNew(input))
+                        {
+                            
+                            if (string.IsNullOrEmpty(input.F_CustomerID))
+                            {
+                                while (true)
+                                {
+                                    int i = 0;
+                                    while (true)
+                                    {
+                                        if (!getunique(0, GetCusCode(i)))
+                                        {
+                                            input.F_CustomerID = GetCusCode(i);
+                                            break;
+                                        }
+                                        else
+                                        {
+                                            i++;
+                                        }
+                                    }
+                                }
+                            }
+                            var CustomerBaseNewmodel = new Model.T_Cus_CustomerBaseNew();
+                            CustomerBaseNewmodel.F_CustomerCode = input.F_CustomerID;
+                            CustomerBaseNewmodel.F_CreateBy = usercode;
+                            CustomerBaseNewmodel.F_CreateOn = DateTime.Now;
+                            CustomerBaseNewmodel.F_IsDelete = 0;
+                            customerBaseBLL.Add(inputtooCustomer(CustomerBaseNewmodel, input));
+                        }
+                    }
+
                 }
                 else
                 {
@@ -2872,39 +2950,50 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             Customer.F_SalesPhone = input.F_SalesPhone;
                         if (!string.IsNullOrEmpty(input.F_Brands))
                             Customer.F_Brands = input.F_Brands;
+                        if (!string.IsNullOrEmpty(input.F_CompanyName))
+                            Customer.F_CompanyName = input.F_CompanyName.Trim();
                         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))
-                    {
-                        while (true)
                         {
-                            if (!gematerque(0, GetIntCode()))
+                            Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
+                            try
                             {
-                                input.F_MaterialID = GetIntCode();
-                                AddMait(input, usercode);
-                                break;
+                                pdModel = departmentBLL.GetModel(int.Parse(input.F_AreaName));
                             }
+                            catch
+                            {
+                                pdModel = departmentBLL.GetModel(input.F_AreaName);
+                            }
+                            Customer.F_AreaID = pdModel.F_DeptId.ToString();
                         }
-                    }
-                    else
-                    {
-                        if (!gematerque(0, input.F_MaterialID))
+
+                        if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
-                            AddMait(input, usercode);
+                            {
+                                Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
+                                try
+                                {
+                                    pdModel = departmentBLL.GetModel(int.Parse(input.F_BranchName));
+                                }
+                                catch
+                                {
+                                    pdModel = departmentBLL.GetModel(input.F_BranchName);
+                                }
+                                Customer.F_BranchID = pdModel.F_DeptId.ToString();
+                            }
                         }
+                        if (!string.IsNullOrEmpty(input.F_CompanyName))
+                            Customer.F_CompanyName = input.F_CompanyName;
+                        customerBaseBLL  .Update(Customer);
                     }
                 }
+
             }
 
             #region 基本字段
+            if (!string.IsNullOrEmpty(input.F_MaterialID))
+            {
+                model.F_MaterialID = input.F_MaterialID.ToString();//物料编码为11为纯数字
+            }
             model.F_Source = input.F_Source.ToString();//工单来源
             model.F_WxOpenId = input.F_WxOpenId;
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -2972,6 +3061,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_CreateBy = model.F_CreateBy;//添加人
                 model.F_UpdateBy = usercode;//修改人工号
                 model.F_UpdateOn = DateTime.Now;//修改人工号
+              
                 if (input.F_UpdateCount != null)
                 {
                     model.F_UpdateCount = model.F_UpdateCount + 1;//修改次数
@@ -3038,6 +3128,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             return count > 0;
         }
+      
         /// <summary>
         /// 添加工单
         /// </summary>
@@ -3052,7 +3143,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                var model = new Model.T_Wo_WorkOrder();
+            
+            if (input.F_Type == 3)
+            {
+                if (string.IsNullOrEmpty(input.F_Files))
+                    return Error("请上传抽检单");
+                if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
+                    return Error("请选择抽检时间");
+            }
+
+            var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(null , model, input, 2);
                 model.F_State = (int)EnumWorkOrderState.customers;
@@ -3089,11 +3189,22 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (ua == null && input.F_Source != 3)
                 {
                     return Error("无操作权限！");
+                   
+                }
+                if (input .F_Source !=3& input.F_Type  == 2)
+                {
+                    if (string.IsNullOrEmpty(input.F_SalesBase))
+                        return Error("请输入基地！");
+                    if (string.IsNullOrEmpty(input.F_QuestionType))
+                        return Error("请选择问题类别！");
                 }
+
+
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
+
                 else
                 {
                     if (!string.IsNullOrEmpty(input.F_BatchNumber))
@@ -3124,16 +3235,26 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                //if (input.F_Type == 2 || input.F_Type == 3)
-                //{
-                //    if (string.IsNullOrEmpty(input.F_CustomerID))
-                //    {
-                //        if (string.IsNullOrEmpty(input.F_LegalPhone))
-                //            return Error("请输入客户电话");
-                //        if (getunphone(0, input.F_LegalPhone))
-                //            return Error("已存在该客户请勿重复添加");
-                //    }
-                //}
+              
+                if (!string.IsNullOrEmpty(input.F_CustomerID))
+                {
+                    var Customer = customerBaseBLL.GetModel(input.F_CustomerID.Trim());
+                    if (Customer == null)
+                        return Error("无此客户编码！");
+                }
+                if (!string.IsNullOrWhiteSpace(input.F_MaterialID))
+                {
+                    var Customer = mmBLL.GetModel(input.F_MaterialID.Trim());
+                    if (Customer == null)
+                        return Error("无此物料编码！");
+                }
+                if (input.F_Type == 3)
+                {
+                    if (string.IsNullOrEmpty(input.F_Files))
+                        return Error("请上传抽检单");
+                    if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
+                        return Error("请选择抽检时间");
+                }
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(ua, model, input, 2);
@@ -3223,7 +3344,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 if (nextda != 0)
                                 {
-                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms);
+                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms,0,0,0,"",1);
                                     if (res)
                                         return Success("添加成功");
                                     else
@@ -3440,7 +3561,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "")
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int  isbl=0)
         {
 
             string smscont = "";
@@ -3489,7 +3610,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 string users = string.Empty;
                 deptid = clbm;
-                var list = userAccountBLL.GetModelList(" F_DeptId='" + clbm + "'");
+                string sql = "";
+                if  (isbl>0)
+                {
+                    sql = " and F_RoleId=59";
+                }
+                var list = userAccountBLL.GetModelList(" F_DeptId='" + clbm + "'"+ sql);
                 foreach (var l in list)
                 {
                     if (string.IsNullOrEmpty(users))
@@ -3644,7 +3770,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("查询失败");
                 }
                 string sql = $" and F_IsDelete=0";
-                sql += "and F_Type !=3";
+              //  sql += "and F_Type !=3";
                 DataTable dt = new DataTable();
                 #region 筛选条件
                 if (type > 0 && type < 5)//工单类型
@@ -4025,6 +4151,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
+                if (string.IsNullOrEmpty(cont))
+                    return Error("请输入处理内容");
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
                 WorkOrderNewInput input = new WorkOrderNewInput();
                 if (ua != null)
@@ -4116,7 +4244,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         private bool Refresh()
         {
             int type = 0;
-            var modlelist = woBLL.GetModelList("  F_Type != 3  and F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+            var modlelist = woBLL.GetModelList(" F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
                 (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish + ")");
             if (modlelist.Count > 0)
             {
@@ -4305,6 +4433,34 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, deptid, nowUser, model.F_limit, sms);
             if (itemid > 0)
             {
+                string smscont = "";
+                if (model.F_Type == "1")
+                {
+                    smscont = "咨询";
+                }
+                else if (model.F_Type == "2")
+                {
+                    smscont = "投诉";
+                }
+                else if (model.F_Type == "3")
+                {
+                    smscont = "抽检";
+                }
+                else
+                {
+                    smscont = "建议";
+                }
+                string[] mag = { smscont };
+                string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
+                var tousermodel = new BLL.T_Sys_UserAccount().GetModel(touser);
+                if (tousermodel != null)
+                {
+                    if (!string.IsNullOrEmpty(tousermodel.F_Mobile))
+                    {
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, tousermodel.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(tousermodel.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
                 #region 处理工单
                 if (deptid == 2)
                 {
@@ -4357,6 +4513,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             if (isover == 1)
             {
+
                 model.F_DealResult = "已处理";//处理结果
                 opt = "处理完结";
                 optbut = (int)EnumItemOpt.end;
@@ -4510,11 +4667,30 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
+                if(input.F_Type == 2)
+                {
+                    if (string.IsNullOrEmpty(input.F_SalesBase))
+                        return Error("请输入基地！");
+                    if (string.IsNullOrEmpty(input.F_QuestionType))
+                        return Error("请选择问题类别！");
+                }
+               
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
-
+                if (!string.IsNullOrEmpty(input.F_CustomerID))
+                {
+                    var Customer = customerBaseBLL.GetModel(input.F_CustomerID.Trim());
+                    if (Customer == null)
+                        return Error("无此客户编码！");
+                }
+                if (!string.IsNullOrWhiteSpace(input.F_MaterialID))
+                {
+                    var Customer = mmBLL.GetModel(input.F_MaterialID.Trim());
+                    if (Customer == null)
+                        return Error("无此物料编码！");
+                }
                 else
                 {
                     if (!string.IsNullOrEmpty(input.F_BatchNumber))
@@ -4638,7 +4814,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         if (nextda != 0)
                         {
-                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms );
+                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms,0,0,0,"",1 );
                             if (res)
                                 return Success("保存成功");
                             else

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

@@ -52,7 +52,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (source > 0)//工单来源
                 {
                     if (source==1)
-                        sql += $" and F_Source in (1,'')";
+                        sql += $"( and F_Source in (1,'') or F_Source is null)";
                     else 
                     sql += $" and F_Source='" + source + "'";
                 }
@@ -79,11 +79,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                 {
                     string F_WorkNumber = "";
+
                     Model.T_Sys_UserAccount user = sysUserAccountBll.GetworkModel(createby);
+                  
                     if (user != null)
                     {
                         F_WorkNumber = user.F_UserCode;
                     }
+                    else
+                    {
+                        Model.T_Sys_UserAccount userer = sysUserAccountBll.GetName (createby);
+                        if (userer!=null )
+                             F_WorkNumber = user.F_UserCode;
+                    }
                     if (!string.IsNullOrEmpty(F_WorkNumber))
                     {
                         sql += $"and F_CreateBy  in(" + createby + "," + F_WorkNumber + ") ";
@@ -1410,30 +1418,36 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 dapt = deptmodel1.F_ParentId;
                 deptname = deptmodel1.F_DeptName;
             }
+            int isbl = 0;
             if (dapt != 0)
             {
                 if (dapt == 11)
                 {
+                    isbl = 1;
                     nextda = 37;
                     opt = "流转市场管理科";
                 }
                 else if (dapt == 14)
                 {
+                    isbl = 1;
                     nextda = 57;
                     opt = "流转营销管理处";
                 }
                 else if (dapt == 15)
                 {
+                    isbl = 1;
                     nextda = 74;
                     opt = "流转策划推广";
                 }
                 else if (dapt == 16)
                 {
+                    isbl = 1;
                     nextda = 88;
                     opt = "流转销售部";
                 }
                 else if (ua.F_DeptId==17|| ua.F_DeptId == 18 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                 {
+                    isbl = 1;
                       nextda = ua.F_DeptId;
                       opt = "流转"+ deptname;
                 }
@@ -1454,7 +1468,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (nextda != 0)
             {
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model .F_limit , sms, 0, 0, 0, time.ToString());
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model .F_limit , sms, 0, 0, 0, time.ToString(), isbl);
                 return res;
             }
             else
@@ -2767,7 +2781,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("查询失败");
                 }
                 string sql = $" and F_IsDelete=0";
-                sql += "and F_Type !=3";
+             //   sql += "and F_Type !=3";
                 DataTable dt = new DataTable();
                 #region 筛选条件
                 if (type > 0 && type < 5)//工单类型
@@ -3392,7 +3406,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private bool  Refresh()
         {
             int type = 0;
-            var modlelist = workOrder .GetModelList(" F_Type != 3  and F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + 
+            var modlelist = workOrder .GetModelList("  F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + 
                 (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish  + ")");
             if (modlelist.Count >0)
             {
@@ -3655,6 +3669,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("工单类型错误！");
                 if(string .IsNullOrEmpty (input.F_CusName))
                     return Error("请输入客户姓名！");
+                if (input.F_Type == 2)
+                {
+                    if (string.IsNullOrEmpty(input.F_SalesBase))
+                        return Error("请输入基地！");
+                    if (string.IsNullOrEmpty(input.F_QuestionType))
+                        return Error("请选择问题类别！");
+                }
+                
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim ()))
@@ -3686,18 +3708,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 if (!string.IsNullOrEmpty (input.F_MaterialID)  && !valcode(input.F_MaterialID.ToString(), 11))
                     return Error("物料编码为11为纯数字！");
-                //if (input.F_Type == 2 || input.F_Type == 3)
-                //{
-                //    if (string.IsNullOrEmpty(input.F_CustomerID))
-                //    {
-                //        if (string.IsNullOrEmpty(input.F_LegalPhone))
-                //            return Error("请输入客户电话");
-                //        if (getunphone(0, input.F_LegalPhone))
-                //            return Error("已存在该客户请勿重复添加");
-                //    }
-                //}
+                if (!string.IsNullOrEmpty(input.F_CustomerID))
+                {
+                    var Customer = cusbll.GetModel(input.F_CustomerID.Trim());
+                    if (Customer == null)
+                        return Error("无此客户编码！");
+                }
+                if (!string.IsNullOrWhiteSpace(input.F_MaterialID))
+                {
+                    var Customer = mmBLL.GetModel(input.F_MaterialID.Trim());
+                    if (Customer == null)
+                        return Error("无此物料编码！");
+                }
+                if (input.F_Type == 3)
+                {
+                    if (string.IsNullOrEmpty(input.F_Files))
+                        return Error("请上传抽检单");
+                    if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
+                        return Error("请选择抽检时间");
+                }
 
-                        var model = new Model.T_Wo_WorkOrder();
+                var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 model = inputtoobj(model, input, 2);
@@ -3782,7 +3813,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             if (nextda != 0)
                             {
-                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0);
+                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0,0,0,0,"",1);
                                 if (res)
                                     return Success("添加成功");
                                 else
@@ -3957,6 +3988,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
+                if (input.F_Type == 2)
+                {
+                    if (string.IsNullOrEmpty(input.F_SalesBase))
+                        return Error("请输入基地！");
+                    if (string.IsNullOrEmpty(input.F_QuestionType))
+                        return Error("请选择问题类别！");
+                }
+                   
                 if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim()))
                 {
                     return Error("请输入正确的生产批次号！");
@@ -4009,7 +4048,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     return Error("此工单已处理不能修改！");
                 }
-
+                if (!string.IsNullOrEmpty(input.F_CustomerID))
+                {
+                    var Customer = cusbll.GetModel(input.F_CustomerID.Trim());
+                    if (Customer == null)
+                        return Error("无此客户编码！");
+                }
+                if (!string.IsNullOrWhiteSpace(input.F_MaterialID))
+                {
+                    var Customer = mmBLL.GetModel(input.F_MaterialID.Trim());
+                    if (Customer == null)
+                        return Error("无此物料编码！");
+                }
                 #region 保存客户基本信息
                 model = inputtoobj(model, input,1);
                 #endregion
@@ -4089,7 +4139,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 if (nextda != 0)
                                 {
-                                    var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0);
+                                    var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0,0,0,0,"",1);
                                     if (res)
                                         return Success("保存成功");
                                     else
@@ -4219,7 +4269,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         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_CompanyName = cuModel.F_CompanyName;
                         model.F_IsRunXLX = cuModel.F_IsRunXLX;
                         model.F_AnnualSales = cuModel.F_AnnualSales;
                         model.F_Formula = cuModel.F_Formula;
@@ -4771,9 +4821,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return true;
         }
-      
 
-      
+        private bool IsCustomerBaseNew(WorkOrderNewInput input)
+        {
+            bool n = false;
+            if (!string.IsNullOrEmpty(input.F_CustomerID) || !string.IsNullOrEmpty(input.F_CompanyName)
+               || !string.IsNullOrEmpty(input.F_AreaName) || !string.IsNullOrEmpty(input.F_BranchName)
+                || !string.IsNullOrEmpty(input.F_Salesman) || !string.IsNullOrEmpty(input.F_SalesPhone)
+              || !string.IsNullOrEmpty(input.F_Brands))
+            {
+                n = true;
+            }
+            return n;
+        }
+
         /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
@@ -4815,8 +4876,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 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_SalesPhone = input.F_Brands;
                         if (!string.IsNullOrEmpty(input.F_AreaName))
@@ -4846,10 +4905,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             Customer.F_BranchID = pdModel.F_DeptId.ToString();
                         }
-                               
-                            cusbll.Update(Customer);
+                        if (!string.IsNullOrEmpty(input.F_CompanyName))
+                            Customer.F_CompanyName = input.F_CompanyName;
+                        cusbll.Update(Customer);
+                        }
+                        else
+                        {
+                        if (IsCustomerBaseNew(input))
+                         {
+                            
+                            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 CustomerBaseNewmodel = new Model.T_Cus_CustomerBaseNew();
+                            CustomerBaseNewmodel.F_CustomerCode  = input.F_CustomerID;
+                            CustomerBaseNewmodel.F_CreateBy = usercode;
+                            CustomerBaseNewmodel.F_CreateOn = DateTime.Now;
+                            CustomerBaseNewmodel.F_IsDelete = 0;
+                          
+                            cusbll .Add(inputtooCustomer(CustomerBaseNewmodel, input));
+                        }
                         }
-
                     }
                     else
                     {
@@ -4862,9 +4951,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 Customer.F_SalesPhone = input.F_SalesPhone;
                             if (!string.IsNullOrEmpty(input.F_Brands))
                                Customer.F_Brands = input.F_Brands;
+                        if (!string.IsNullOrEmpty(input.F_CompanyName))
+                            Customer.F_CompanyName = input.F_CompanyName.Trim();
                         if (!string.IsNullOrEmpty(input.F_AreaName))
                         {
-                            Model.T_Sys_Department pdModel = new T_Sys_Department();
+                            Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
                             try
                             {
                                 pdModel = departmentBLL.GetModel(int.Parse(input.F_AreaName));
@@ -4879,7 +4970,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (!string.IsNullOrEmpty(input.F_BranchName))
                         {
                             {
-                                Model.T_Sys_Department pdModel = new T_Sys_Department();
+                                Model.T_Sys_Department pdModel = new Model . T_Sys_Department();
                                 try
                                 {
                                     pdModel = departmentBLL.GetModel(int.Parse(input.F_BranchName));
@@ -4891,8 +4982,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 Customer.F_BranchID = pdModel.F_DeptId.ToString();
                             }
                         }
-                              
-                            cusbll.Update(Customer);
+                        if (!string.IsNullOrEmpty(input.F_CompanyName))
+                            Customer.F_CompanyName = input.F_CompanyName;
+                        cusbll.Update(Customer);
                         }
                     }
                 }
@@ -4911,7 +5003,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_Description = input.F_Description;//问题描述
             model.F_ZX_Area = input.F_ZX_Area;// 大区
             model.F_ZX_Branch = input.F_ZX_Branch;//分公司
-            model.F_Files = model.F_Files;//附件上传ids
+           
+         
             model.F_Brand = input.F_WorkerBrand;//工单品牌
             model.F_DealType = model.F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
             #endregion
@@ -4931,7 +5024,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #region 咨询类
          //   model.F_ZX_ProName = input.F_ZX_ProName;//咨询-产品名称：三聚氰胺、甲醇、液氨、二甲醚、糠醇、其他
             model.F_ZX_Quantity = input.F_ZX_Quantity;// 咨询-问题数量（吨）
-          
+            if (!string.IsNullOrEmpty(input.F_Files))
+                model.F_Files = input.F_Files;//附件上传ids
+            else
+                model.F_Files = model.F_Files;//附件上传ids
             #endregion
             #region 抽检类
             model.F_CJ_Time = input.F_CJ_Time;// 抽检-抽检时间
@@ -4952,7 +5048,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_SC_QualityMonth = new WorkOrderController().GetProTime(input.F_BatchNumber, DateTime.Now).ToString();
                 }
             }
-          
+         
             if (type ==1)
             {
                 model.F_State = model.F_State;//工单状态
@@ -4960,6 +5056,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_CreateBy = model.F_CreateBy;//添加人
                 model.F_UpdateBy = usercode;//修改人工号
                 model.F_UpdateOn = DateTime .Now ;//修改人工号
+               
                 if (input.F_UpdateCount!=null )
                 {
                     model.F_UpdateCount = model.F_UpdateCount + 1;//修改次数
@@ -5082,21 +5179,38 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
+                if (input.F_Type == 2)
+                {
+                    if (string.IsNullOrEmpty(input.F_SalesBase))
+                        return Error("请输入基地！");
+                    if (string.IsNullOrEmpty(input.F_QuestionType))
+                        return Error("请选择问题类别！");
+                }
+                    
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
                     return Error("客户编号为10为纯数字！");
 
                 if (!string.IsNullOrEmpty(input.F_MaterialID) && !valcode(input.F_MaterialID.ToString(), 11))
                     return Error("物料编码为11为纯数字！");
-                //if (input.F_Type == 2 || input.F_Type == 3)
-                //{
-                //    if (string.IsNullOrEmpty(input.F_CustomerID))
-                //    {
-                //        if (string.IsNullOrEmpty(input.F_LegalPhone))
-                //            return Error("请输入客户电话");
-                //        if (getunphone(0, input.F_LegalPhone))
-                //            return Error("已存在该客户请勿重复添加");
-                //    }
-                //}
+                if (!string.IsNullOrEmpty(input.F_CustomerID))
+                {
+                    var Customer = cusbll .GetModel(input.F_CustomerID.Trim());
+                    if (Customer == null)
+                        return Error("无此客户编码！");
+                }
+                if (!string.IsNullOrWhiteSpace(input.F_MaterialID))
+                {
+                    var Customer = mmBLL.GetModel(input.F_MaterialID.Trim());
+                    if (Customer == null)
+                        return Error("无此物料编码！");
+                }
+                if (input.F_Type == 3)
+                {
+                    if (string.IsNullOrEmpty(input.F_Files))
+                        return Error("请上传抽检单");
+                    if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
+                        return Error("请选择抽检时间");
+                }
                 #endregion
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
@@ -5306,10 +5420,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 deptid = touser.F_DeptId;
             }
-         
+            string smscont = "";
+   
+          
             var itemid = AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser, deptid, nowUser, model.F_limit, sms);
             if (itemid > 0)
             {
+                if (model.F_Type == "1")
+                {
+                    smscont = "咨询";
+                }
+                else if (model.F_Type == "2")
+                {
+                    smscont = "投诉";
+                }
+                else if (model.F_Type == "3")
+                {
+                    smscont = "抽检";
+                }
+                else
+                {
+                    smscont = "建议";
+                }
+                  string[] mag = { smscont };
+                   string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
+                if (touser!=null )
+                {
+                    if (!string .IsNullOrEmpty (touser.F_Mobile) )
+                    {
+
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(touser.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
+                   
                 #region 处理工单
                 model.F_State = 2;
                 workOrder.Update(model);
@@ -5363,26 +5507,45 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                     }
                 }
+               
                 if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
+                if (input.F_Type == 2)
+                {
+                    if (string.IsNullOrEmpty(input.F_SalesBase))
+                        return Error("请输入基地！");
+                    if (string.IsNullOrEmpty(input.F_QuestionType))
+                        return Error("请选择问题类别！");
+                }
+                    
                 #endregion
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
                     return Error("客户编号为10为纯数字！");
 
                 if (!string.IsNullOrEmpty(input.F_MaterialID) && !valcode(input.F_MaterialID.ToString(), 11))
                     return Error("物料编码为11为纯数字！");
-                //if (input.F_Type == 2 || input.F_Type == 3)
-                //{
-                //    if (string.IsNullOrEmpty(input.F_CustomerID))
-                //    {
-                //        if (string.IsNullOrEmpty(input.F_LegalPhone))
-                //            return Error("请输入客户电话");
-                //        if (getunphone(0, input.F_LegalPhone))
-                //            return Error("已存在该客户请勿重复添加");
-                //    }
-                //}
+                if (!string.IsNullOrEmpty(input.F_CustomerID))
+                {
+                    var Customer = cusbll.GetModel(input.F_CustomerID.Trim());
+                    if (Customer == null)
+                        return Error("无此客户编码！");
+                }
+                if (!string.IsNullOrWhiteSpace(input.F_MaterialID))
+                {
+                    var Customer = mmBLL.GetModel(input.F_MaterialID.Trim());
+                    if (Customer == null)
+                        return Error("无此物料编码！");
+                }
+                if (input.F_Type == 3)
+                {
+                    if (string.IsNullOrEmpty(input.F_Files))
+                        return Error("请上传抽检单");
+                    if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
+                        return Error("请选择抽检时间");
+                }
+
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(model, input, 2);
@@ -5658,6 +5821,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
+                if (string.IsNullOrEmpty(cont))
+                    return Error("请输入处理内容");
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 WorkOrderNewInput input = new WorkOrderNewInput();
                 if (ua != null)
@@ -6118,6 +6283,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemid = AddLog((int)model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, deptid, nowUser, model .F_limit ,sms );
             if (itemid > 0)
             {
+                string smscont = "";
+                if (model.F_Type == "1")
+                {
+                    smscont = "咨询";
+                }
+                else if (model.F_Type == "2")
+                {
+                    smscont = "投诉";
+                }
+                else if (model.F_Type == "3")
+                {
+                    smscont = "抽检";
+                }
+                else
+                {
+                    smscont = "建议";
+                }
+                string[] mag = { smscont };
+                string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
+                var tousermodel = new BLL.T_Sys_UserAccount().GetModel(touser);
+                if (tousermodel != null)
+                {
+                    if (!string .IsNullOrEmpty (tousermodel.F_Mobile))
+                    {
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, tousermodel.F_Mobile.Trim());
+                        bool n = new SMSController().AddSmS(tousermodel.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
+                    }
+                }
                 #region 处理工单
                 if (deptid==2)
                 {
@@ -6539,7 +6732,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "")
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int isbl=0)
         {
             string smscont = "";
             if (model.F_Type == "1")
@@ -6576,7 +6769,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     tousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
                     if (sms != 0)
                     {
-                        if (!string .IsNullOrEmpty (clus.F_Mobile.Trim ()))
+                        if (!string .IsNullOrEmpty (clus.F_Mobile))
                         {
                           
                             SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, clus.F_Mobile.Trim());
@@ -6591,7 +6784,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 string users = string.Empty;
                 deptid = clbm;
-                var list = sysUserAccountBll.GetModelList(" F_DeptId='" + clbm + "'");
+                string sql = "";
+                if (isbl > 0)
+                {
+                    sql = " and F_RoleId=59";
+                }
+                var list = sysUserAccountBll.GetModelList(" F_DeptId='" + clbm + "'"+ sql);
                 foreach (var l in list)
                 {
                     if (string.IsNullOrEmpty(users))