工单退回修改，列表修改

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

@@ -1634,7 +1634,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_ID = model1[i].F_ID;//
                     model.F_WorkOrderCode = model1[i].F_WorkOrderCode;//工单编号
                     #region
-                    model.F_Source = int.Parse(model1[i].F_Source);//工单来源
+                    if (!string .IsNullOrEmpty (model1[i].F_Source))
+                    {
+                        model.F_Source = int.Parse(model1[i].F_Source);//工单来源
+                    }
                     if (model1[i].F_Source == "1")
                     {
                         model.F_SourceName = "电话";

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

@@ -3547,83 +3547,83 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                     model.F_Type =int .Parse ( model1[i].F_Type);//工单来源
-                    if (model1[i].F_Type == "1")
-                    {
-                        model.F_TypeName = "咨询";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
-                    }
-                    else if (model1[i].F_Type == "2")
-                    {
-                        model.F_TypeName = "投诉";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
-                    }
-                    else if (model1[i].F_Type == "3")
-                    {
-                        model.F_TypeName = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
-                    }
-                    else
-                   {
-                        model.F_TypeName = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
-                    }
-                    model.F_State = model1[i].F_State;
-                    if (model1[i].F_State ==0)//工单状态
-                    {
-                        model.F_StateName = "待指派";
-                    }
-                    else if (model1[i].F_State == 1)
-                    {
-                        model.F_StateName = "待接单";
-                    }
-                    else if (model1[i].F_State == 2)
-                    {
-                        model.F_StateName = "待处理";
-                    }
-                    else if (model1[i].F_State == 3)
-                    {
-                        model.F_StateName = "已退回";
-                    }
-                    else if (model1[i].F_State == 4)
-                    {
-                        model.F_StateName = "异常退回";
-                    }
-                    else if (model1[i].F_State == 5)
-                    {
-                        model.F_StateName = "处理中";
-                    }
-                    else if (model1[i].F_State == 6)
-                    {
-                        model.F_StateName = "待回访";
-                    }
-                    else if (model1[i].F_State == 7)
-                    {
-                        model.F_StateName = "待完结";
-                    }
-                    else if (model1[i].F_State == 10)
-                    {
-                        model.F_StateName = "已完结";
-                    }
-                    else if (model1[i].F_State == 11)
-                    {
-                        model.F_StateName = "已评价";
-                    }
-                    else if (model1[i].F_State == 12)
-                    {
-                        model.F_StateName = "已退回";
-                    }
-                    else if (model1[i].F_State == 13)
-                    {
-                        model.F_StateName = "导入工单";
-                    }
-                    else if (model1[i].F_State == 14)
-                    {
-                        model.F_StateName = "待审批";
-                    }
-                    else if (model1[i].F_State == 15)
-                    {
-                        model.F_StateName = "微信未通过";
-                    }
-                    else if (model1[i].F_State == 16)
-                    {
-                        model.F_StateName = "待审批";
-                    }
+                   // if (model1[i].F_Type == "1")
+                   // {
+                   //     model.F_TypeName = "咨询";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                   // }
+                   // else if (model1[i].F_Type == "2")
+                   // {
+                   //     model.F_TypeName = "投诉";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                   // }
+                   // else if (model1[i].F_Type == "3")
+                   // {
+                   //     model.F_TypeName = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                   // }
+                   // else
+                   //{
+                   //     model.F_TypeName = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                   // }
+                   // model.F_State = model1[i].F_State;
+                   // if (model1[i].F_State ==0)//工单状态
+                   // {
+                   //     model.F_StateName = "待指派";
+                   // }
+                   // else if (model1[i].F_State == 1)
+                   // {
+                   //     model.F_StateName = "待接单";
+                   // }
+                   // else if (model1[i].F_State == 2)
+                   // {
+                   //     model.F_StateName = "待处理";
+                   // }
+                   // else if (model1[i].F_State == 3)
+                   // {
+                   //     model.F_StateName = "已退回";
+                   // }
+                   // else if (model1[i].F_State == 4)
+                   // {
+                   //     model.F_StateName = "异常退回";
+                   // }
+                   // else if (model1[i].F_State == 5)
+                   // {
+                   //     model.F_StateName = "处理中";
+                   // }
+                   // else if (model1[i].F_State == 6)
+                   // {
+                   //     model.F_StateName = "待回访";
+                   // }
+                   // else if (model1[i].F_State == 7)
+                   // {
+                   //     model.F_StateName = "待完结";
+                   // }
+                   // else if (model1[i].F_State == 10)
+                   // {
+                   //     model.F_StateName = "已完结";
+                   // }
+                   // else if (model1[i].F_State == 11)
+                   // {
+                   //     model.F_StateName = "已评价";
+                   // }
+                   // else if (model1[i].F_State == 12)
+                   // {
+                   //     model.F_StateName = "已退回";
+                   // }
+                   // else if (model1[i].F_State == 13)
+                   // {
+                   //     model.F_StateName = "导入工单";
+                   // }
+                   // else if (model1[i].F_State == 14)
+                   // {
+                   //     model.F_StateName = "待审批";
+                   // }
+                   // else if (model1[i].F_State == 15)
+                   // {
+                   //     model.F_StateName = "微信未通过";
+                   // }
+                   // else if (model1[i].F_State == 16)
+                   // {
+                   //     model.F_StateName = "待审批";
+                   // }
                     #endregion
                     model.F_CusName = model1[i].F_CusName;//客户姓名
                     model.F_CusPhone = model1[i].F_CusPhone;//客户电话
@@ -5124,7 +5124,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
             var touser = ""; var deptid=0;
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal+ " and F_OptType !=" + (int)EnumItemOpt.reback+" and F_OptType !=" + (int)EnumItemOpt.abreback + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
             {
                 touser = itemlast.F_CreateUser;