高层审批修改，物料导入修改

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

@@ -1048,7 +1048,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public string GetHApproval(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where isnull(F_IsUsed,'0')='0' and F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + user + "'";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where isnull(F_IsUsed,'0')='0' and F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + user + "'"+ "and F_IsUsed=2"; ;
             return str;
         }
         /// <summary>
@@ -1087,7 +1087,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                    + " and "
-                       + "F_WoState in(" + (int)EnumWorkOrderState.assign + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
+                       + "F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
                         + " and isnull(F_IsUsed,'0')='0' ";
             }
 
@@ -1161,9 +1161,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string deptmodelsname = "";
             int wostate = 0;
             var toussers = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-            if (itemlast != null)
-                toussers = itemlast.F_CreateUser;
             #region 上报
             if (IsAudit!=0)
             {
@@ -1180,7 +1177,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         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_CreateTime desc").FirstOrDefault();
+                    if (itemlast != null)
+                        toussers = itemlast.F_CreateUser;
                     wostate = 16;
                     if (AuditState == 0)
                     {
@@ -1211,7 +1210,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
                     if (ro.F_RoleCode == "DQJL")
                     {
-
+                        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_CreateTime desc").FirstOrDefault();
+                        if (itemlast != null)
+                            toussers = itemlast.F_CreateUser;
                         if (AuditState == 0)
                         {
                             opt = "同意上报";
@@ -2511,7 +2512,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     return Error("无操作权限！");
                 }
-                    if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                     {
                         return Error("请输入正确的生产批次号！");
                     }
@@ -2702,6 +2703,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
                 if (ua != null)
                 {
+                    if (hclid == 0 && hclbm == 0 && isApprovalp != 0)
+                    {
+                        return Error("请选择接收部门");
+                    }
                     if (clbm == 0 && clid == 0)
                     {
                         return Error("请选择接收部门");
@@ -2860,7 +2865,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                     }
                 }
-                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat);
+                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat,2);
             }
            
             #endregion
@@ -3533,6 +3538,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
             }
             var opt = "退回";
+            int F_OptType = 1;
             int optbut = (int)EnumItemOpt.reback;
             int wostate = (int)EnumWorkOrderState.reback;
             if (type == 1)
@@ -3540,6 +3546,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 opt = "异常退回";
                 optbut = (int)EnumItemOpt.abreback;
                 wostate = (int)EnumWorkOrderState.abreback;
+                F_OptType = 2;
             }
             #region 读取当前登录人部门
             string deptname = "";
@@ -3552,7 +3559,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             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_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
             {
 
@@ -3570,7 +3577,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (itemid > 0)
             {
                 #region 处理工单
-                if (model.F_State == (int)EnumWorkOrderState.assign)
+                if (model.F_State == (int)EnumWorkOrderState.assign || model.F_State == (int)EnumWorkOrderState.abreback)
                 {
                     model.F_State = (int)EnumWorkOrderState.reassign;
                 }
@@ -3767,7 +3774,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
@@ -3827,7 +3834,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                       
-                        AddLog(input.F_ID, input.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                        AddLog(input.F_ID, model .F_State.Value, deptname1 + user.F_UserName + "(" + user.F_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
                     }
                     else
                     {

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

@@ -326,6 +326,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 dModel.F_MaterialEffect = dr["复合肥肥效"].ToString();//复合肥肥效
                                 dModel.F_Pipeline = dr["产品线"].ToString();//产品线
                                 dModel.F_Craft = dr["工艺"].ToString();//工艺
+                                dModel.F_Remark  = dr["备注"].ToString();//工艺
                                 dModel.F_CreateBy = userscode;
                                 dModel.F_CreateOn = DateTime.Now;
                                 dModel.F_IsDelete = 0;

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

@@ -918,9 +918,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string deptmodelsname = "";
             int wostate = 0;
             var toussers = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-            if (itemlast != null)
-                toussers = itemlast.F_CreateUser;
+          //  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_CreateTime desc").FirstOrDefault();
+        //    if (itemlast != null)
+               // toussers = itemlast.F_CreateUser;
             #region 上报
             if (IsAudit != 0)
             {
@@ -937,7 +937,9 @@ 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_CreateTime desc").FirstOrDefault();
+                    if (itemlast != null)
+                        toussers = itemlast.F_CreateUser;
                     wostate = 16;
                     if (AuditState == 0)
                     {
@@ -968,6 +970,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
                     if (ro.F_RoleCode == "DQJL")
                     {
+                        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_CreateTime desc").FirstOrDefault();
+                        if (itemlast != null)
+                            toussers = itemlast.F_CreateUser;
 
                         if (AuditState == 0)
                         {
@@ -1859,7 +1864,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                    + " and "
-                       + "F_WoState in(" + (int)EnumWorkOrderState.assign + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
+                       + "F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback+ ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
                         + " and isnull(F_IsUsed,'0')='0' ";
             }
 
@@ -2257,10 +2262,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
         }
+        /// <summary>
+        /// 获取高层审批
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
         public string GetHApproval(string user)
         {
             string str = string.Empty;
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where isnull(F_IsUsed,'0')='0' and F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + user + "'";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where   F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + user + "'"+ "and F_IsUsed=2";
             return str;
         }
         /// <summary>
@@ -3125,7 +3135,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim ()))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
@@ -3347,13 +3357,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     return Error("请输入客户姓名！");
                 if (string.IsNullOrEmpty(input.F_CusPhone))
                     return Error("请输入客户电话！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim ()))
                 {
                     return Error("请输入正确的生产批次号！");
                 }
                 else
                 {
-                    if (!string.IsNullOrEmpty(input.F_BatchNumber))
+                    if (!string.IsNullOrEmpty(input.F_BatchNumber.Trim ()))
                     {
                         var prono = input.F_BatchNumber.Substring(0, 6);
                         try
@@ -3394,6 +3404,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
                     AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0);
+                    Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+                    if (ro !=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 deptmode = departmentBLL.GetModel(user.F_DeptId);
+                                if (deptmode != null)
+                                {
+                                    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_UserCode + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                            }
+                            else
+                            {
+                                string deptname1 = "";
+                                var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
+                                if (deptmodel1 != null)
+                                {
+                                    deptname1 = deptmodel1.F_DeptName + "-";
+                                }
+                                var res = AssignWO(ua, model, input, "流转市场管理科", 37, 0, model.F_limit, 0);
+                                if (res)
+                                    return Success("保存成功");
+                                else
+                                    return Error("市场管理科接收失败！");
+                            }
+                        }
+                    }
                     return Success("保存成功！");
                 }
                 else
@@ -3547,83 +3591,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;//客户电话
@@ -4236,8 +4280,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
-                    return Error("请输入正确的工单批次号！");
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber))
+                    return Error("请输入正确的生产批次号！");
                 else
                 {
                     if (!string.IsNullOrEmpty(input.F_BatchNumber))
@@ -4398,8 +4442,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
-                if (!string.IsNullOrEmpty(input.F_BatchNumber) && vaBatchNumber(input.F_BatchNumber))
-                    return Error("请输入正确的工单批次号！");
+                if (!string.IsNullOrEmpty(input.F_BatchNumber) && !vaBatchNumber(input.F_BatchNumber.Trim ()))
+                    return Error("请输入正确的生产批次号！");
                 else
                 {
                     if (!string.IsNullOrEmpty(input.F_BatchNumber))
@@ -4522,6 +4566,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
               
                 if (ua != null)
                 {
+                    if (hclid == 0 && hclbm == 0&& isApprovalp!=0)
+                    {
+                        return Error("请选择接收部门");
+                    }
                     if (clbm == 0 && clid == 0)
                     {
                         return Error("请选择接收部门");
@@ -5105,6 +5153,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
             }
             var opt = "退回";
+            int F_OptType = 1;
             int optbut = (int)EnumItemOpt.reback;
             int wostate = (int)EnumWorkOrderState.reback;
             if (type == 1)
@@ -5112,6 +5161,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 opt = "异常退回";
                 optbut = (int)EnumItemOpt.abreback;
                 wostate = (int)EnumWorkOrderState.abreback;
+                F_OptType = 2;
             }
             #region 读取当前登录人部门
             string deptname = "";
@@ -5124,7 +5174,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_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();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID  + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
             {
                 touser = itemlast.F_CreateUser;
@@ -5143,7 +5193,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (itemid > 0)
             {
                 #region 处理工单
-                if (model .F_State == (int)EnumWorkOrderState.assign) 
+                if (model .F_State == (int)EnumWorkOrderState.assign|| model.F_State == (int)EnumWorkOrderState.abreback) 
                 {
                     model.F_State = (int)EnumWorkOrderState.reassign;
                 }
@@ -5607,7 +5657,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                     }
                 }
-                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat);
+                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, "审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat,2);
             }
             #endregion
             #region 工单处理