增加渠道类型

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

@@ -3339,10 +3339,11 @@ 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_Channel))
+                            Customer.F_Channel = input.F_Channel;
 
                         if (!string.IsNullOrEmpty(input.F_Brands))
-                            Customer.F_SalesPhone = input.F_Brands;
+                            Customer.F_Brands = input.F_Brands;
                         if (!string.IsNullOrEmpty(input.F_AreaName))
                         {
                             Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
@@ -3427,6 +3428,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             Customer.F_Brands = input.F_Brands;
                         if (!string.IsNullOrEmpty(input.F_CompanyName))
                             Customer.F_CompanyName = input.F_CompanyName.Trim();
+                        if (!string.IsNullOrEmpty(input.F_Channel))
+                            Customer.F_Channel = input.F_Channel;
                         if (!string.IsNullOrEmpty(input.F_AreaName))
                         {
                             Model.T_Sys_Department pdModel = new Model.T_Sys_Department();
@@ -4528,12 +4531,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
                         if (modellist != null)
                         {
-                            string[] sprt = modellist.F_NextUser.Split(',');
-                            if (sprt.Length == 1)
+                            if (!string .IsNullOrEmpty(modellist.F_NextUser))
                             {
-                                if (modellist.F_NextUser != ua.F_UserCode)
-                                    return Error("非接单人不可操作工单");
+                                string[] sprt = modellist.F_NextUser.Split(',');
+                                if (sprt.Length == 1)
+                                {
+                                    if (modellist.F_NextUser != ua.F_UserCode)
+                                        return Error("非接单人不可操作工单");
+                                }
                             }
+                          
                         }
                         if (model.F_State == 2)
                         {

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

@@ -2443,10 +2443,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dt.Columns.Add("大区名称");
                             dt.Columns.Add("分公司名称");
                             dt.Columns.Add("公司名称");
+                            dt.Columns.Add("渠道类型");
                             dt.Columns.Add("物料编码");
                             dt.Columns.Add("物料名称");
                             dt.Columns.Add("型号");
                             dt.Columns.Add("规格");
+                            dt.Columns.Add("一级分类");
+                            dt.Columns.Add("二级分类");
+                            dt.Columns.Add("三级分类");
+                            dt.Columns.Add("物料品牌");
                             dt.Columns.Add("复合肥肥效");
                             dt.Columns.Add("产品线");
                             dt.Columns.Add("工艺");
@@ -2469,10 +2474,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dt.Columns.Add("大区名称");
                             dt.Columns.Add("分公司名称");
                             dt.Columns.Add("公司名称");
+                            dt.Columns.Add("渠道类型");
                             dt.Columns.Add("物料编码");
                             dt.Columns.Add("物料名称");
                             dt.Columns.Add("型号");
                             dt.Columns.Add("规格");
+                            dt.Columns.Add("一级分类");
+                            dt.Columns.Add("二级分类");
+                            dt.Columns.Add("三级分类");
+                            dt.Columns.Add("物料品牌");
                             dt.Columns.Add("复合肥肥效");
                             dt.Columns.Add("产品线");
                             dt.Columns.Add("工艺");
@@ -2497,8 +2507,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         foreach (var it in depts)
                         {
                             DataRow drNew = dt.NewRow();
-                         
 
+                          
 
                             drNew["工单编号"] = it.F_WorkOrderCode;//工单编号
                             #region
@@ -2514,10 +2524,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 drNew["工单来源"] = "微信客户";
                             }
-                            else
+                            else if (it.F_Source == "4")
                             {
                                 drNew["工单来源"] = "官网";
                             }
+                            else
+                            {
+                                drNew["工单来源"] = "电话";
+                            }
                             if (it.F_Type == "1")
                             {
                                 drNew["工单类型"] = "咨询";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
@@ -2735,8 +2749,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             drNew["电话"] = cuModel.F_SalesPhone;
                                             drNew["公司名称"] = cuModel.F_CompanyName;//公司名称
                                             drNew["经营品牌"] = cuModel.F_Brands;
-                                       
+                                    drNew["渠道类型"] = cuModel.F_Channel ;
                                     
+
+
                                 }
                                 #endregion
                                 #region 物料
@@ -2751,6 +2767,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                             drNew["物料名称"] = maModel.F_MaterialName;
                                             drNew["型号"] = maModel.F_Model;
                                             drNew["规格"] = maModel.F_Specs;
+                                            drNew["一级分类"] = maModel.F_Level1;
+                                            drNew["二级分类"] = maModel.F_Level2;
+                                            drNew["三级分类"] = maModel.F_Level3;
+                                            drNew["物料品牌"] = maModel.F_Brand;
                                             drNew["复合肥肥效"] = maModel.F_MaterialEffect;
                                             drNew["产品线"] = maModel.F_Pipeline;
                                             drNew["工艺"] = maModel.F_Craft;
@@ -4178,25 +4198,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = workOrder.GetModel(input.F_ID);
                 if (model == null)
                     return Error("查询不到此工单！");
-                if (ro != null)
+
+                if (ua.F_UserCode!="8000"&ua.F_UserCode != "9000")
                 {
-                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
+
+                    if (ro != null)
                     {
-                        if (model.F_CreateBy != ua.F_UserCode)
+                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                         {
-                            return Error("非创建人不能修改工单！");
+                            if (model.F_CreateBy != ua.F_UserCode)
+                            {
+                                return Error("非创建人不能修改工单！");
+                            }
                         }
-
+                    }
+                    if (model.F_State == 2)
+                    {
+                        return Error("此工单已接单不能修改！");
+                    }
+                    else if (model.F_State == 11 || model.F_State == 10)
+                    {
+                        return Error("此工单已处理不能修改！");
                     }
                 }
-                if (model.F_State == 2)
-                {
-                    return Error("此工单已接单不能修改！");
-                }
-                else if (model.F_State == 11|| model.F_State == 10)
-                {
-                    return Error("此工单已处理不能修改！");
-                }
+            
                 if (!string.IsNullOrEmpty(input.F_CustomerID))
                 {
                     var Customer = cusbll.GetModel(input.F_CustomerID.Trim());
@@ -5042,7 +5067,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (!string.IsNullOrEmpty(input.F_SalesPhone))
                                 Customer.F_SalesPhone = input.F_SalesPhone;
                         if (!string.IsNullOrEmpty(input.F_Brands))
-                            Customer.F_SalesPhone = input.F_Brands;
+                            Customer.F_Brands = input.F_Brands;
+
+                        if (!string.IsNullOrEmpty(input.F_Channel))
+                            Customer.F_Channel = input.F_Channel;
                         if (!string.IsNullOrEmpty(input.F_AreaName))
                         {
                             Model.T_Sys_Department pdModel = new T_Sys_Department();
@@ -5124,6 +5152,8 @@ 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_Channel))
+                            Customer.F_Channel = input.F_Channel;
                         if (!string.IsNullOrEmpty(input.F_CompanyName))
                             Customer.F_CompanyName = input.F_CompanyName.Trim();
                         if (!string.IsNullOrEmpty(input.F_AreaName))
@@ -5987,12 +6017,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
                         if (modellist != null)
                         {
-                            string[] sprt = modellist.F_NextUser.Split(',');
-                            if (sprt.Length ==1)
+                            if (!string .IsNullOrEmpty (modellist.F_NextUser))
                             {
-                                if (modellist.F_NextUser != ua.F_UserCode)
-                                    return Error("非接单人不可操作工单");
+                                string[] sprt = modellist.F_NextUser.Split(',');
+                                if (sprt.Length == 1)
+                                {
+                                    if (modellist.F_NextUser != ua.F_UserCode)
+                                        return Error("非接单人不可操作工单");
+                                }
                             }
+                            
                         }
                         if (model .F_State ==2)
                         {