修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -16,6 +16,7 @@
   <add key="MailUserName" value="123@800100.com" />
   <!-- 设置邮箱密码 -->
   <add key="MailPassword" value="123456" />
+  <add key="SecurityCode" value="xinlianxin%#@6" />
   <!-- 设置邮箱主机 -->
   <add key="MailHost" value="smtp.ym.163.com" />
   <!-- ================== 3：微信配置参数 ================== -->

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -732,7 +732,6 @@ namespace CallCenterApi.Interface.Controllers.customer
             try
             {
                 model.F_AreaID = int .Parse (input.F_AreaID).ToString ();//大区ID
-                model.F_BranchID = int .Parse (input.F_BranchID).ToString ();//分公司ID
             }
             catch
             {
@@ -744,7 +743,14 @@ namespace CallCenterApi.Interface.Controllers.customer
                         model.F_AreaID = pdModel.F_DeptId .ToString();
                     }
                 }
-                if (!string .IsNullOrEmpty (input.F_BranchID))
+            }
+            try
+            {
+                model.F_BranchID = int.Parse(input.F_BranchID).ToString();//分公司ID
+            }
+            catch
+            {
+                if (!string.IsNullOrEmpty(input.F_BranchID))
                 {
                     Model.T_Sys_Department pdModel = departmentBLL.GetModel(input.F_BranchID);
                     if (pdModel != null)
@@ -753,6 +759,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                     }
                 }
             }
+         
             model.F_Gender = input.F_Gender;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话

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

@@ -775,6 +775,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         ///工单列表
         /// </summary>
+        /// 
+
         public ActionResult GetList(string handler,string description,string OpenId, string code, string cusname, string keywords, string cusphone, string companyname, string province, string city,string createby,string createtel,
             string country, string township, string category, string salebase, string touser, int source = 0, int state = -1, int status = -1, int type = 0,int condition=-1, int pageindex = 1, int pagesize = 10)
         {
@@ -1294,6 +1296,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return Success("暂无工单"); ;
             }
         }
+
+     
         public string GetDeptUserCode(int deptid)
         {
             string deptuser = string.Empty;
@@ -1946,6 +1950,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     if (model != null)
                     {
+                        var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
+                        if (itemlast!=null )
+                         sms = (int)itemlast.F_IsSMS;
                         var res = Approval(OpenId, orderid, AuditCont, ua, model, overtime, sms, IsAudit, AuditState);
                         if (res)
                             return Success("审核成功");
@@ -1991,7 +1998,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// 审核工单
         /// </summary>
         [WechatActionFilter]
-        public bool Approval(string OpenId, long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, float overtime = 0, int sms = 0, int IsAudit = 0, int AuditState = 0)
+        public bool Approval(string OpenId, long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, float overtime = 0, int sms = -1, int IsAudit = 0, int AuditState = 0)
         {
             bool res = true;
             string touser = ""; string tousername = "";
@@ -2019,7 +2026,20 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_CreateUser!=" + user.F_UserCode + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                     if (itemlast != null)
+                    {
                         toussers = itemlast.F_CreateUser;
+                        if (sms == -1)
+                        {
+                            sms = (int)itemlast.F_IsSMS;
+                        }
+                    }
+                    else
+                    {
+                        if (sms == -1)
+                        {
+                            sms = 0;
+                        }
+                    }
                     wostate = 16;
                     if (AuditState == 0)
                     {
@@ -2028,6 +2048,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         if (userid <= 0 || uaid <= 0)
                             res = false;
+                        else
+                        {
+                            if (sms ==1&& !string .IsNullOrEmpty(user .F_Mobile ))
+                            {
+                                SendSms(model.F_Type, user.F_Mobile, nowUser.F_UserId);
+                            }
+                        }
+
                     }
                     else if (AuditState == 1)
                     {
@@ -2052,7 +2080,22 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                         if (itemlast != null)
+                        {
                             toussers = itemlast.F_CreateUser;
+                            if (sms == -1)
+                            {
+                                sms = (int)itemlast.F_IsSMS;
+                            }
+                        }
+                        else
+                        {
+                            if (sms == -1)
+                            {
+                                sms = 0;
+                            }
+                        }
+
+
                         if (AuditState == 0)
                         {
                             opt = "同意上报";
@@ -2068,6 +2111,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
                                 res = false;
+                            
                             wostate = 16;
                         }
                         else
@@ -2103,28 +2147,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (nowUser.F_UserCode != model.F_CreateBy)
                 {
                     sendsysmsg(model, nowUser, model.F_CreateBy, (int)model.F_ID, opt);//
-                  //  var createmodel = userAccountBLL.GetModel(model.F_CreateBy);  //
-                  //  if (createmodel != null)
-                 //   {
-                     //   if (!string.IsNullOrEmpty(createmodel.F_WxOpenId))
-                    //    {
-                     //      sendwxmsg(model, createmodel.F_WxOpenId, nowUser, opt);
-                     //   }
-                  //  }
                 }
 
                 #region 向下一级操作人员推送消息
                 if (!string.IsNullOrWhiteSpace(touser))
                 {
                     sendsysmsg(model, nowUser, touser, (int)model.F_ID, opt);//
-                 //   var modelUser2 = userAccountBLL.GetModel(touser);  //
-                  //  if (modelUser2 != null)
-                  //  {
-                      //  if (!string.IsNullOrEmpty(modelUser2.F_WxOpenId))
-                      //  {
-                       //     sendwxmsg(model, modelUser2.F_WxOpenId, nowUser, opt);
-                      //  }
-                  //  }
                 }
                 #endregion 向下一级操作人员推送消息
             }
@@ -2132,6 +2160,32 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return false;
             return true;
         }
+        public bool SendSms(string type,string F_Mobile,int userid)
+        {
+             string smscont = "";
+            if (type == "1")
+            {
+                smscont = "咨询";
+            }
+            else if (type == "2")
+            {
+                smscont = "投诉";
+            }
+            else if (type == "3")
+            {
+                smscont = "抽检";
+            }
+            else
+            {
+                smscont = "建议";
+            }
+            string[] mag = { smscont };
+          string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
+           SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, F_Mobile.Trim());
+            bool n = new SMSController().AddSmS(F_Mobile.Trim(), smsmsg, userid);
+            return n;
+            
+        }
         /// <summary>
         /// 大区经理未审批流转市场管理科
         /// </summary>
@@ -3931,6 +3985,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, overtime, sms );
                                 AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
+                                if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
+                                {
+                                    SendSms(model.F_Type, user.F_Mobile, ua.F_UserId);
+                                }
                             }
                             else
                             {
@@ -4086,7 +4144,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         [WechatActionFilter]
         public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
-            int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0)
+            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0)
         {
 
             if (!string.IsNullOrEmpty(OpenId))
@@ -4102,7 +4160,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             return Error("非接单人不可操作工单");
                     }
                 }
-               
+               if (sms ==-1)
+                {
+                    var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
+                     sms = (int)itemlast.F_IsSMS;
+                }
                 WorkOrderNewInput input = new WorkOrderNewInput();
 
                 if (ua != null)
@@ -5272,14 +5334,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (nowUser.F_UserCode != model.F_CreateBy)
                 {
                     sendsysmsg(model, nowUser, model.F_CreateBy, (int)model.F_ID, opt);//推送系统消息
-                 //   var createmodel = userAccountBLL.GetModel(model.F_CreateBy);  //被指派人
-                 ///   if (createmodel != null)
-                   // {
-                      //  if (!string.IsNullOrEmpty(createmodel.F_WxOpenId))
-                     //   {
-                        //    sendwxmsg(model, createmodel.F_WxOpenId, nowUser, opt);
-                      //  }
-                  //  }
+                  if (model.F_State == (int)EnumWorkOrderState.finish)
+                    {
+                        var createmodel = userAccountBLL.GetModel(model.F_CreateBy);  //被指派人
+                        if (createmodel != null)
+                        {
+                            if (!string.IsNullOrEmpty(createmodel.F_WxOpenId))
+                            {
+                                sendwxmsg(model, createmodel.F_WxOpenId, nowUser, "工单完结");
+                            }
+                        }
+                    }
+                   
                 }
                 #endregion
                 #region 向上一级操作人员推送消息
@@ -5489,6 +5555,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
 
                         AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
+                        if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
+                        {
+                            SendSms(model.F_Type, user.F_Mobile, ua.F_UserId);
+                        }
                     }
                     else
                     {

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

@@ -1235,7 +1235,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 审核工单
         /// </summary>
-        public bool Approval( long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, float overtime = 0, int sms = 0, int IsAudit = 0, int AuditState = 0)
+        public bool Approval( long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, float overtime = 0, int sms = -1, int IsAudit = 0, int AuditState = 0)
         {
             bool res = true;
             string touser = ""; string tousername = "";
@@ -1265,6 +1265,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         deptmodelsname = deptmodels.F_DeptName + "-";
                     }
                     var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_CreateUser!=" + user.F_UserCode  + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
+
+                    if (itemlast != null)
+                    {
+                        toussers = itemlast.F_CreateUser;
+                        if (sms == -1)
+                        {
+                            sms = (int)itemlast.F_IsSMS;
+                        }
+                    }
+                    else
+                    {
+                        if (sms == -1)
+                        {
+                            sms =0;
+                        }
+                    }
+                   
                     if (itemlast != null)
                         toussers = itemlast.F_CreateUser;
                     wostate = 16;
@@ -1275,6 +1292,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         if (userid <= 0 || uaid <= 0)
                             res = false;
+                        else
+                        {
+                            if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
+                            {
+                                SendSms(model.F_Type, user.F_Mobile, nowUser.F_UserId);
+                            }
+                        }
                     }
                     else if (AuditState == 1)
                     {
@@ -1299,8 +1323,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit  + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                         if (itemlast != null)
+                        {
                             toussers = itemlast.F_CreateUser;
-
+                            if (sms == -1)
+                            {
+                                sms = (int)itemlast.F_IsSMS;
+                            }
+                        }
+                        else
+                        {
+                            if (sms == -1)
+                            {
+                                sms = 0;
+                            }
+                        }
                         if (AuditState == 0)
                         {
                             opt = "同意上报";
@@ -4353,7 +4389,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                 AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
                                 AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
+                            if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
+                            {
+                                SendSms(model.F_Type, user.F_Mobile, ua.F_UserId);
                             }
+                        }
                             else
                             {
                           
@@ -4716,8 +4756,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     deptname1 = deptmode.F_DeptName + "-";
                                 }
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
-
-                                AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
+                                int sms = 0;
+                                if (itemlast!=null )
+                                   sms = (int)itemlast.F_IsSMS;
+                                AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, sms);
+                                if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
+                                {
+                                    SendSms(model.F_Type, user.F_Mobile, ua.F_UserId);
+                                }
                             }
                             else
                             {
@@ -5101,7 +5148,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_CJ_Tonnage = model1[i].F_CJ_Tonnage;//抽检-抽检吨数
                     model.F_CJ_BagNo = model1[i].F_CJ_BagNo;//抽检-抽检袋数
                     model.F_CJ_Outlay = model1[i].F_CJ_Outlay;//抽检-公关费用金额：单位元
-                   
+                    model.F_Production = model1[i].F_Production;
                     model.F_DealBy = model1[i].F_DealBy;//处理人
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
                     model.F_DealContent = model1[i].F_DealContent;//处理内容
@@ -5671,7 +5718,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #endregion
             model.F_Canal = input.F_Canal;//生产批次号
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
-            model.F_CusName = input.F_CusName;//客户姓名
+            model.F_Production = input.F_Production;//生产单位
+        model.F_CusName = input.F_CusName;//客户姓名
             model.F_CusPhone = input.F_CusPhone;//客户电话
             model.F_CompanyName = input.F_CompanyName;//公司名称
             model.F_IncidentProvince = input.F_IncidentProvince;//事发地-省
@@ -7342,14 +7390,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (nowUser.F_UserCode != model.F_CreateBy)
                 {
                     sendsysmsg(model, nowUser, model.F_CreateBy, (int)model.F_ID , opt);//推送系统消息
-                 //   var createmodel = sysUserAccountBll.GetModel(model.F_CreateBy);  //被指派人
-                  //  if (createmodel != null)
-                //    {
-                //     if (!string.IsNullOrEmpty(createmodel.F_WxOpenId))
-                    //   {
-                      //     sendwxmsg(model, createmodel.F_WxOpenId, nowUser, opt);
-                     //  }
-                   // }
+                    if (model.F_State == (int)EnumWorkOrderState.finish)
+                    {
+                        var createmodel = sysUserAccountBll .GetModel(model.F_CreateBy);  //被指派人
+                        if (createmodel != null)
+                        {
+                            if (!string.IsNullOrEmpty(createmodel.F_WxOpenId))
+                            {
+                                sendwxmsg(model, createmodel.F_WxOpenId, nowUser, "工单完结");
+                            }
+                        }
+                    }
                 }
                 #endregion
                 #region 向上一级操作人员推送消息
@@ -7521,6 +7572,32 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return model;
         }
+        public bool SendSms(string type, string F_Mobile, int userid)
+        {
+            string smscont = "";
+            if (type == "1")
+            {
+                smscont = "咨询";
+            }
+            else if (type == "2")
+            {
+                smscont = "投诉";
+            }
+            else if (type == "3")
+            {
+                smscont = "抽检";
+            }
+            else
+            {
+                smscont = "建议";
+            }
+            string[] mag = { smscont };
+            string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
+            SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, F_Mobile.Trim());
+            bool n = new SMSController().AddSmS(F_Mobile.Trim(), smsmsg, userid);
+            return n;
+
+        }
         /// <summary>
         /// 转派工单
         /// </summary>
@@ -7566,7 +7643,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (!string .IsNullOrEmpty (clus.F_Mobile))
                         {
-                          
                             SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, clus.F_Mobile.Trim());
                             bool n = new SMSController().AddSmS(clus.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
                         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -875,6 +875,10 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        /// <summary>
+        /// 生产单位
+        /// </summary>
+        public string F_Production { set; get; }
     }
 }
 public class Questions
@@ -1256,7 +1260,7 @@ public class WorkOrderComplaint
     {
         get; set;
     }
-   
+
 }
 public class Prescription
 {
@@ -1397,5 +1401,6 @@ public class Product
     /// 业务员
     /// </summary>
     public string F_Salesman { set; get; }
+   
 }
 

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -826,6 +826,10 @@ namespace CallCenterApi.Model
             set { _f_deleteon = value; }
             get { return _f_deleteon; }
         }
+        /// <summary>
+        /// 生产单位
+        /// </summary>
+        public string F_Production { set; get; }
         #endregion Model
     }