11111

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

@@ -2243,10 +2243,17 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     opt = "流转车用尿素";
 
                 }
+
                 else if (dapt == 20)
                 {
                     nextda = 295;
                     opt = "流转新乡黑科质检";
+                }
+                else if (dapt == 332)
+                {
+                    nextda = 339;
+                    opt = "流转营销管理处";
+
 
                 }
                 else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
@@ -2849,6 +2856,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     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_WorkerBrand = model1[i].F_Brand;//工单品牌
                     model.F_DealBy = model1[i].F_DealBy;//处理人
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
@@ -3682,6 +3690,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             model.F_Source = input.F_Source.ToString();//工单来源
           
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+            model.F_Production = input.F_Production;//生产单位
+            LogFactory.GetLogger("123").Debug(input.F_Production);
             model.F_CusName = input.F_CusName;//客户姓名
             model.F_CusPhone = input.F_CusPhone;//客户电话
             model.F_CompanyName = input.F_CompanyName;//公司名称
@@ -3955,6 +3965,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 var model = new Model.T_Wo_WorkOrder();
                 #region 保存客户基本信息
                 model = inputtoobj(ua, model, input, 2);
+                LogFactory.GetLogger("635").Debug("添加中。。。。");
                 if (model.F_Source == "3")
                 {
                     model.F_State = (int)EnumWorkOrderState.customers;
@@ -4038,16 +4049,23 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                         opt = "流转车用尿素";
 
                                     }
+
                                     else if (dapt == 20)
                                     {
                                         nextda = 295;
                                         opt = "流转新乡黑科质检";
+                                    }
+                                    else if (dapt == 332)
+                                    {
+                                        nextda = 339;
+                                        opt = "流转营销管理处";
+
 
                                     }
                                     else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                                     {
                                         nextda = ua.F_DeptId;
-                                        opt = "流转" + deptment ;
+                                        opt = "流转" + deptment;
                                     }
                                 }
                                 if (nextda != 0)
@@ -4068,6 +4086,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else
                         {
                             AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
+                            LogFactory.GetLogger("456").Debug("添加成功");
                             return Success("添加成功");
                         }
 
@@ -4079,6 +4098,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("添加失败！");
 
 
+
             }
             else
             {
@@ -5608,19 +5628,26 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             else if (dapt == 18)
                             {
                                 nextda = 268;
-                               opt = "流转车用尿素" ;
+                                opt = "流转车用尿素";
 
                             }
+
                             else if (dapt == 20)
                             {
                                 nextda = 295;
                                 opt = "流转新乡黑科质检";
+                            }
+                            else if (dapt == 332)
+                            {
+                                nextda = 339;
+                                opt = "流转营销管理处";
+
 
                             }
-                            else if (ua.F_DeptId == 17  || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                            else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                             {
                                 nextda = ua.F_DeptId;
-                                opt = "流转" + deptname1 ;
+                                opt = "流转" + deptname1;
                             }
                         }
                         if (nextda != 0)

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

@@ -545,7 +545,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
                 if (modlelist.Count > 0)
                 {
-                    List<WorkOrderNewInput> Input = modeltooip(modlelist);
+                    List<WorkOrderNewInput> Input =modeltooip (modlelist);
                     var obj = new
                     {
                         state = "success",
@@ -1509,13 +1509,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     nextda = 295;
                     opt = "流转新乡黑科质检";
+                }
+                else if (dapt == 332)
+                {
+                    nextda = 339;
+                    opt = "流转营销管理处";
 
                 }
-                else if (ua.F_DeptId==17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                 {
                     isbl = 1;
-                      nextda = ua.F_DeptId;
-                      opt = "流转"+ deptname;
+                    nextda = ua.F_DeptId;
+                    opt = "流转" + deptname;
                 }
                 //else
                 //{
@@ -2075,7 +2080,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                  var   model = workOrder.GetModel(id);
                 if (model != null)
                     list.Add(model);
-                 var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
+                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " ");
 ;                var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                 FileUrl = GetFileData(model.F_Files , configfj.F_ParamValue);
                 if (list.Count > 0)
@@ -4282,7 +4287,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             /// 添加工单
             /// </summary>
             /// <returns></returns>
-            public ActionResult Add(WorkOrderNewInput input, int overtime = 0,int sms = 0)
+       public ActionResult Add(WorkOrderNewInput input, int overtime = 0,int sms = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -4291,9 +4296,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
 
                 #region 添加验证判断
-                if (!(input.F_Type> 0 && input.F_Type < 5))
+                if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if(string .IsNullOrEmpty (input.F_CusName))
+                if (string.IsNullOrEmpty(input.F_CusName))
                     return Error("请输入客户姓名！");
                 if (input.F_Type == 2)
                 {
@@ -4302,7 +4307,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     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()))
@@ -4332,7 +4337,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 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))
+                if (!string.IsNullOrEmpty(input.F_MaterialID) && !valcode(input.F_MaterialID.ToString(), 11))
                     return Error("物料编码为11为纯数字！");
                 if (!string.IsNullOrEmpty(input.F_CustomerID))
                 {
@@ -4353,8 +4358,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
                         return Error("请选择抽检时间");
                 }
-                if (!string .IsNullOrEmpty (input .F_SalesPhone))
-                  {
+                if (!string.IsNullOrEmpty(input.F_SalesPhone))
+                {
                     if (!IsNumeric(input.F_SalesPhone))
                         return Error("请输入正确的业务员电话");
                 }
@@ -4378,31 +4383,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         deptname = deptmodel.F_DeptName + "-";
                     }
-                    Model.T_Wo_WorkOrder  modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
-                      
-                        if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
-                        {
+                    Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
 
-                            if (GetUser(ua) != null)
+                    if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
+                    {
+
+                        if (GetUser(ua) != null)
+                        {
+                            var user = GetUser(ua);
+                            string deptname1 = "";
+                            var deptmodel1 = departmentBLL.GetModel(user.F_DeptId);
+                            if (deptmodel1 != null)
                             {
-                                var user = GetUser(ua);
-                                string deptname1 = "";
-                                var deptmodel1 = departmentBLL.GetModel(user.F_DeptId);
-                                if (deptmodel1 != null)
-                                {
-                                    deptname1 = deptmodel1.F_DeptName + "-";
-                                }
+                                deptname1 = deptmodel1.F_DeptName + "-";
+                            }
 
-                                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);
+                            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
-                            {
-                          
+                        else
+                        {
+
                             int dapt = 0, nextda = 0;
                             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                             string deptneme = "";
@@ -4413,7 +4418,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                             string opt = "";
-                        
+
                             if (dapt != 0)
                             {
                                 if (dapt == 11)
@@ -4442,10 +4447,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     opt = "流转车用尿素";
 
                                 }
+
                                 else if (dapt == 20)
                                 {
                                     nextda = 295;
                                     opt = "流转新乡黑科质检";
+                                }
+                                else if (dapt == 332)
+                                {
+                                    nextda = 339;
+                                    opt = "流转营销管理处";
+
 
                                 }
                                 else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
@@ -4456,7 +4468,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             if (nextda != 0)
                             {
-                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0,0,0,0,"",1);
+                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1);
                                 if (res)
                                     return Success("添加成功");
                                 else
@@ -4466,12 +4478,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 return Error("流转失败！");
                             }
-                            }
-                        }
-                        else
-                        {
-                            AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                         }
+                    }
+                    else
+                    {
+                        AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
+                    }
                     return Success("添加成功！");
 
                 }
@@ -4816,16 +4828,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         opt = "流转车用尿素";
 
                                     }
+
                                     else if (dapt == 20)
                                     {
                                         nextda = 295;
                                         opt = "流转新乡黑科质检";
+                                    }
+                                    else if (dapt == 332)
+                                    {
+                                        nextda = 339;
+                                        opt = "流转营销管理处";
+
 
                                     }
-                                    else if (ua.F_DeptId == 17  || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                                    else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                                     {
                                         nextda = ua.F_DeptId;
-                                        opt = "流转" + deptname1 ;
+                                        opt = "流转" + deptname1;
                                     }
 
                                 }
@@ -5737,7 +5756,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_Canal = input.F_Canal;//生产批次号
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
             model.F_Production = input.F_Production;//生产单位
-        model.F_CusName = input.F_CusName;//客户姓名
+            model.F_CusName = input.F_CusName;//客户姓名
             model.F_CusPhone = input.F_CusPhone;//客户电话
             model.F_CompanyName = input.F_CompanyName;//公司名称
             model.F_IncidentProvince = input.F_IncidentProvince;//事发地-省
@@ -6396,7 +6415,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public ActionResult AssignWorkOrder(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 userId = CurrentUser.UserData.F_UserId;
+             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
             if (userId != 0)
             {
@@ -6632,7 +6651,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
+       public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
      string F_Files, string uncont = "",
           int isvisit = 1, int isover = 0)
         {