zhupei 4 年之前
父節點
當前提交
5be36f1cc5

+ 6 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

2849
                     model.F_CJ_Tonnage = model1[i].F_CJ_Tonnage;//抽检-抽检吨数
2849
                     model.F_CJ_Tonnage = model1[i].F_CJ_Tonnage;//抽检-抽检吨数
2850
                     model.F_CJ_BagNo = model1[i].F_CJ_BagNo;//抽检-抽检袋数
2850
                     model.F_CJ_BagNo = model1[i].F_CJ_BagNo;//抽检-抽检袋数
2851
                     model.F_CJ_Outlay = model1[i].F_CJ_Outlay;//抽检-公关费用金额:单位元
2851
                     model.F_CJ_Outlay = model1[i].F_CJ_Outlay;//抽检-公关费用金额:单位元
2852
+                    model.F_Production = model1[i].F_Production;
2852
                     model.F_WorkerBrand = model1[i].F_Brand;//工单品牌
2853
                     model.F_WorkerBrand = model1[i].F_Brand;//工单品牌
2853
                     model.F_DealBy = model1[i].F_DealBy;//处理人
2854
                     model.F_DealBy = model1[i].F_DealBy;//处理人
2854
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
2855
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
3682
             model.F_Source = input.F_Source.ToString();//工单来源
3683
             model.F_Source = input.F_Source.ToString();//工单来源
3683
           
3684
           
3684
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
3685
             model.F_Type = input.F_Type.ToString();//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
3686
+            model.F_Production = input.F_Production;//生产单位
3687
+            LogFactory.GetLogger("123").Debug(input.F_Production);
3685
             model.F_CusName = input.F_CusName;//客户姓名
3688
             model.F_CusName = input.F_CusName;//客户姓名
3686
             model.F_CusPhone = input.F_CusPhone;//客户电话
3689
             model.F_CusPhone = input.F_CusPhone;//客户电话
3687
             model.F_CompanyName = input.F_CompanyName;//公司名称
3690
             model.F_CompanyName = input.F_CompanyName;//公司名称
3955
                 var model = new Model.T_Wo_WorkOrder();
3958
                 var model = new Model.T_Wo_WorkOrder();
3956
                 #region 保存客户基本信息
3959
                 #region 保存客户基本信息
3957
                 model = inputtoobj(ua, model, input, 2);
3960
                 model = inputtoobj(ua, model, input, 2);
3961
+                LogFactory.GetLogger("635").Debug("添加中。。。。");
3958
                 if (model.F_Source == "3")
3962
                 if (model.F_Source == "3")
3959
                 {
3963
                 {
3960
                     model.F_State = (int)EnumWorkOrderState.customers;
3964
                     model.F_State = (int)EnumWorkOrderState.customers;
4068
                         else
4072
                         else
4069
                         {
4073
                         {
4070
                             AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
4074
                             AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
4075
+                            LogFactory.GetLogger("456").Debug("添加成功");
4071
                             return Success("添加成功");
4076
                             return Success("添加成功");
4072
                         }
4077
                         }
4073
 
4078
 
4079
                     return Error("添加失败!");
4084
                     return Error("添加失败!");
4080
 
4085
 
4081
 
4086
 
4087
+
4082
             }
4088
             }
4083
             else
4089
             else
4084
             {
4090
             {

+ 33 - 33
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

2075
                  var   model = workOrder.GetModel(id);
2075
                  var   model = workOrder.GetModel(id);
2076
                 if (model != null)
2076
                 if (model != null)
2077
                     list.Add(model);
2077
                     list.Add(model);
2078
-                 var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
2078
+                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " ");
2079
 ;                var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
2079
 ;                var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
2080
                 FileUrl = GetFileData(model.F_Files , configfj.F_ParamValue);
2080
                 FileUrl = GetFileData(model.F_Files , configfj.F_ParamValue);
2081
                 if (list.Count > 0)
2081
                 if (list.Count > 0)
4282
             /// 添加工单
4282
             /// 添加工单
4283
             /// </summary>
4283
             /// </summary>
4284
             /// <returns></returns>
4284
             /// <returns></returns>
4285
-            public ActionResult Add(WorkOrderNewInput input, int overtime = 0,int sms = 0)
4285
+       public ActionResult Add(WorkOrderNewInput input, int overtime = 0,int sms = 0)
4286
         {
4286
         {
4287
             int userId = CurrentUser.UserData.F_UserId;
4287
             int userId = CurrentUser.UserData.F_UserId;
4288
             if (userId != 0)
4288
             if (userId != 0)
4291
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
4291
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
4292
 
4292
 
4293
                 #region 添加验证判断
4293
                 #region 添加验证判断
4294
-                if (!(input.F_Type> 0 && input.F_Type < 5))
4294
+                if (!(input.F_Type > 0 && input.F_Type < 5))
4295
                     return Error("工单类型错误!");
4295
                     return Error("工单类型错误!");
4296
-                if(string .IsNullOrEmpty (input.F_CusName))
4296
+                if (string.IsNullOrEmpty(input.F_CusName))
4297
                     return Error("请输入客户姓名!");
4297
                     return Error("请输入客户姓名!");
4298
                 if (input.F_Type == 2)
4298
                 if (input.F_Type == 2)
4299
                 {
4299
                 {
4302
                     if (string.IsNullOrEmpty(input.F_QuestionType))
4302
                     if (string.IsNullOrEmpty(input.F_QuestionType))
4303
                         return Error("请选择问题类别!");
4303
                         return Error("请选择问题类别!");
4304
                 }
4304
                 }
4305
-                
4305
+
4306
                 if (string.IsNullOrEmpty(input.F_CusPhone))
4306
                 if (string.IsNullOrEmpty(input.F_CusPhone))
4307
                     return Error("请输入客户电话!");
4307
                     return Error("请输入客户电话!");
4308
                 //if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim()))
4308
                 //if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim()))
4332
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
4332
                 if (!string.IsNullOrEmpty(input.F_CustomerID) && !valcode(input.F_CustomerID.ToString(), 10))
4333
                     return Error("客户编号为10为纯数字!");
4333
                     return Error("客户编号为10为纯数字!");
4334
 
4334
 
4335
-                if (!string.IsNullOrEmpty (input.F_MaterialID)  && !valcode(input.F_MaterialID.ToString(), 11))
4335
+                if (!string.IsNullOrEmpty(input.F_MaterialID) && !valcode(input.F_MaterialID.ToString(), 11))
4336
                     return Error("物料编码为11为纯数字!");
4336
                     return Error("物料编码为11为纯数字!");
4337
                 if (!string.IsNullOrEmpty(input.F_CustomerID))
4337
                 if (!string.IsNullOrEmpty(input.F_CustomerID))
4338
                 {
4338
                 {
4353
                     if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
4353
                     if (string.IsNullOrEmpty(input.F_CJ_Time.ToString()))
4354
                         return Error("请选择抽检时间");
4354
                         return Error("请选择抽检时间");
4355
                 }
4355
                 }
4356
-                if (!string .IsNullOrEmpty (input .F_SalesPhone))
4357
-                  {
4356
+                if (!string.IsNullOrEmpty(input.F_SalesPhone))
4357
+                {
4358
                     if (!IsNumeric(input.F_SalesPhone))
4358
                     if (!IsNumeric(input.F_SalesPhone))
4359
                         return Error("请输入正确的业务员电话");
4359
                         return Error("请输入正确的业务员电话");
4360
                 }
4360
                 }
4378
                     {
4378
                     {
4379
                         deptname = deptmodel.F_DeptName + "-";
4379
                         deptname = deptmodel.F_DeptName + "-";
4380
                     }
4380
                     }
4381
-                    Model.T_Wo_WorkOrder  modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
4382
-                      
4383
-                        if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
4384
-                        {
4381
+                    Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
4385
 
4382
 
4386
-                            if (GetUser(ua) != null)
4383
+                    if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "YWY")
4384
+                    {
4385
+
4386
+                        if (GetUser(ua) != null)
4387
+                        {
4388
+                            var user = GetUser(ua);
4389
+                            string deptname1 = "";
4390
+                            var deptmodel1 = departmentBLL.GetModel(user.F_DeptId);
4391
+                            if (deptmodel1 != null)
4387
                             {
4392
                             {
4388
-                                var user = GetUser(ua);
4389
-                                string deptname1 = "";
4390
-                                var deptmodel1 = departmentBLL.GetModel(user.F_DeptId);
4391
-                                if (deptmodel1 != null)
4392
-                                {
4393
-                                    deptname1 = deptmodel1.F_DeptName + "-";
4394
-                                }
4393
+                                deptname1 = deptmodel1.F_DeptName + "-";
4394
+                            }
4395
 
4395
 
4396
-                                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);
4397
-                                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);
4396
+                            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);
4397
+                            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);
4398
                             if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
4398
                             if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
4399
                             {
4399
                             {
4400
                                 SendSms(model.F_Type, user.F_Mobile, ua.F_UserId);
4400
                                 SendSms(model.F_Type, user.F_Mobile, ua.F_UserId);
4401
                             }
4401
                             }
4402
                         }
4402
                         }
4403
-                            else
4404
-                            {
4405
-                          
4403
+                        else
4404
+                        {
4405
+
4406
                             int dapt = 0, nextda = 0;
4406
                             int dapt = 0, nextda = 0;
4407
                             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
4407
                             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
4408
                             string deptneme = "";
4408
                             string deptneme = "";
4413
                             }
4413
                             }
4414
                             AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
4414
                             AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
4415
                             string opt = "";
4415
                             string opt = "";
4416
-                        
4416
+
4417
                             if (dapt != 0)
4417
                             if (dapt != 0)
4418
                             {
4418
                             {
4419
                                 if (dapt == 11)
4419
                                 if (dapt == 11)
4456
                             }
4456
                             }
4457
                             if (nextda != 0)
4457
                             if (nextda != 0)
4458
                             {
4458
                             {
4459
-                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0,0,0,0,"",1);
4459
+                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1);
4460
                                 if (res)
4460
                                 if (res)
4461
                                     return Success("添加成功");
4461
                                     return Success("添加成功");
4462
                                 else
4462
                                 else
4466
                             {
4466
                             {
4467
                                 return Error("流转失败!");
4467
                                 return Error("流转失败!");
4468
                             }
4468
                             }
4469
-                            }
4470
-                        }
4471
-                        else
4472
-                        {
4473
-                            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);
4474
                         }
4469
                         }
4470
+                    }
4471
+                    else
4472
+                    {
4473
+                        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);
4474
+                    }
4475
                     return Success("添加成功!");
4475
                     return Success("添加成功!");
4476
 
4476
 
4477
                 }
4477
                 }
6632
         /// </summary>
6632
         /// </summary>
6633
         /// <returns></returns>
6633
         /// <returns></returns>
6634
         [Authority]
6634
         [Authority]
6635
-        public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
6635
+       public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
6636
      string F_Files, string uncont = "",
6636
      string F_Files, string uncont = "",
6637
           int isvisit = 1, int isover = 0)
6637
           int isvisit = 1, int isover = 0)
6638
         {
6638
         {