22

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

                                 }
                                 break;
                             case 2://待完成的(待接单)
-                                string strsql = GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode, ua.F_Flag);
+                                string strsql = GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode);
                                 if (strsql != "")
                                 {
-                                    if (ua.F_Flag == 1)
-                                    {
-                                        sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  ";
-                                    }
-                                    else if (ua.F_Flag == 2)
-                                    {
-                                        sql += $" and F_State2 in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ") ";
-                                    }
+                                    sql += $" and (F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ") ";                 
+                                    sql += $" or F_State2 in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")) ";
                                     sql += " and T_Wo_WorkOrder.F_ID in ( " + strsql + ")";
                                 }
                                 else
                                 }
                                 break;
                             case 4://待完成的(待处理)
-                                string dealstr = GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId, ua.F_Flag);
+                                string dealstr = GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId);
                                 if (!string.IsNullOrEmpty(dealstr))
-                                {
-                                    if (ua.F_Flag == 1)
-                                    {
-                                        sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
-                                    }
-                                    else if (ua.F_Flag == 2)
-                                    {
-                                        sql += " and (F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
-                                    }
+                                {                                 
+                                    sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
+                              
+                                    sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";                               
                                     sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                                     if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                                     {
-                                      sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
-                                        //if (ua.F_Flag == 1)
-                                        //{
-                                        //    sql += " or (F_State=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
-                                        //}
-                                        //else if (ua.F_Flag == 2)
-                                        //{
-                                        //    sql += " or (F_State2=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
-                                        //}
-                                    }
-                                    else
-                                    {
-                                        sql += $")";
+                                      sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + "))";                
                                     }
+                                    //else
+                                    //{
+                                    //    sql += $")";
+                                    //}
                                 }
                                 else
                                 {
                             case 10://已完成的
                                 if (GetDeptUserCode(ua.F_DeptId) != "")
                                 {
-                                    if (ua.F_Flag == 1)
-                                    {
-                                        sql += " and F_State in(10,11)";
-                                    }
-                                    else if (ua.F_Flag == 2)
-                                    {
-                                        sql += " and F_State2 in(10,11)";
-                                    }
+                                    sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
                                     sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
                                 }
                                 //  sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
                                 {
                                     return Success("无操作权限"); ;
                                 }
-                                sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_State2=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
+                                sql += $" and ((F_State=" + (int)EnumWorkOrderState.finish + " and F_State2!=" + (int)EnumWorkOrderState.evaluate + ") or (F_State!=" + (int)EnumWorkOrderState.evaluate + " and F_State2=" + (int)EnumWorkOrderState.finish + "))  and F_IsVisit = '" + "1" + "' " + uwhere; ;
                                 break;
                             case 7://已回访
                                 if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                                 {
                                     return Success("无操作权限"); ;
                                 }
-                                sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_State2=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
+                                sql += $" and (F_State=" + (int)EnumWorkOrderState.finish + " or F_State2=" + (int)EnumWorkOrderState.finish + ") and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
                                 break;
                             case 9://待接单
 
-                                string strsql2 = GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode, ua.F_Flag);
+                                string strsql2 = GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode);
                                 if (strsql2 != "")
                                 {
-                                    if (ua.F_Flag == 1)
-                                    {
-                                        sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  ";
-                                    }
-                                    else if (ua.F_Flag == 2)
-                                    {
-                                        sql += $" and F_State2 in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ") ";
-                                    }
+                                    sql += $" and (F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  ";
+                                    sql += $" or F_State2 in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")) ";
                                     sql += " and T_Wo_WorkOrder.F_ID in ( " + strsql2 + ")";
                                 }
                                 else
         /// <returns></returns>
         public string GetDWCWorkOrderID(string user, int deptid, int flag = 1)
         {
-            string str = string.Empty;
+             string str = string.Empty;
             string strsql = "";
 
             if (flag == 1)
                 strsql = "and F_Type in(2,3)";
             }
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-               + " and (F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ") and "
-               + "(F_CreateUser='" + user + "' or F_NextDept='" + deptid + "')) "//办理中和接单状态的操作人，退回下一步操作人，撤回下一步操作人
-               + " and isnull(F_IsUsed,'0')='0' " + strsql + "";
+                + " and "
+                + "F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ") and (F_NextUser like '%" + user + "%' or F_NextDept='" + deptid + "') "//办理中和接单状态的操作人，退回下一步操作人，撤回下一步操作人
+                + " and isnull(F_IsUsed,'0')='0'";
             return str;
         }
         public string GetHApproval(string user)
             }
             if (!string.IsNullOrEmpty(deptuser))
             {
-                if (flag == 1)
-                {
-                    // string deptuser = "select F_WoID from T_Sys_UserAccount where F_DeptId=" + deptid;
-                    str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-                        + " and isnull(F_IsUsed,'0')='0'  and F_Type in(1,3)" + " and "
-                       + " F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and (F_NextUser in('" + deptuser + "') or  F_NextDept =" + deptid + ") "; //办理中和接单状态的操作人
+                str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                      + " and isnull(F_IsUsed,'0')='0'" + " and "
+                     + " F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and (F_NextUser in('" + deptuser + "') or  F_NextDept =" + deptid + ") ";//办理中和接单状态的操作人
 
-
-                }
-                else if (flag == 2) //内线
-                {
-                    // string deptuser = "select F_WoID from T_Sys_UserAccount where F_DeptId=" + deptid;
-                    str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-                        + " and isnull(F_IsUsed,'0')='0'  and F_Type in(2,3)" + " and "
-                        + " F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and (F_NextUser in('" + deptuser + "') or F_NextDept =" + deptid + ") ";//办理中和接单状态的操作人
-                                                                                                                                                                                                  
-                }
             }
             else
             {
-                if (flag == 1)
-                {
-                    str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-                       + " and "
-                           + "F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
-                            + " and isnull(F_IsUsed,'0')='0' and F_Type in(1,3)";
-                }
-                else if (flag == 2)
-                {
-                    str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
-                      + " and "
-                          + "F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
-                           + " and isnull(F_IsUsed,'0')='0' and F_Type in(2,3)";
-                }
+                str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                        + " and F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + " "//办理中和接单状态的操作人
+                             + " and isnull(F_IsUsed,'0')='0'";
             }
 
             return str;
                         string strsql = GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode, ua.F_Flag);
                         if (strsql != "")
                         {
-                            if (ua.F_Flag == 1)
-                            {
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  ";
-                            }
-                            else if (ua.F_Flag == 2)
-                            {
-                                sql += $" and F_State2 in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ") ";
-                            }
+                            //if (ua.F_Flag == 1)
+                            //{
+                            sql += $" and (F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  ";
+                            //}
+                            //else if (ua.F_Flag == 2)
+                            //{
+                            sql += $" or F_State2 in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")) ";
+                            //}
                             sql += " and T_Wo_WorkOrder.F_ID in ( " + strsql + ")";
 
                         }
                     case 1://待完成的(待处理)
                         sql = "";
                         sql += $"  F_IsDelete=0";
-                        string dealstr = GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId, ua.F_Flag);
+                        string dealstr = GetDWCWorkOrderID(ua.F_UserCode, ua.F_DeptId);
                         if (!string.IsNullOrEmpty(dealstr))
                         {
-                            if (ua.F_Flag == 1)
-                            {
-                                sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
-                            }
-                            else if (ua.F_Flag == 2)
-                            {
-                                sql += " and (F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
-                            }
+                            //if (ua.F_Flag == 1)
+                            //{
+                            sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
+                            //}
+                            //else if (ua.F_Flag == 2)
+                            //{
+                            sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";
+                            //}
                             sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                             if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                             {
-                                sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
-                                //if (ua.F_Flag == 1)
-                                //{
-                                //    sql += " or (F_State=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
-                                //}
-                                //else if (ua.F_Flag == 2)
-                                //{
-                                //    sql += " or (F_State2=" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
-                                //}
-                            }
-                            else
-                            {
-                                sql += $")";
+                                sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + "))";
                             }
+                            //else
+                            //{
+                            //    sql += $")";
+                            //}
 
                         }
                         else
                     case 2://已完成的
                         sql = "";
                         sql += $"  F_IsDelete=0";
-                        if (ua.F_Flag == 1)
-                        {
-                            sql += " and F_State in(10,11)";
-                        }
-                        else if (ua.F_Flag == 2)
-                        {
-                            sql += " and F_State2 in(10,11)";
-                        }
+                        sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
                         if (GetDeptUserCode(ua.F_DeptId) != "")
                         {
                             sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
+                int woflag = 0;
+                string markdepts = "37,57,74,88,268,295,339";
                 string sqlstr = "";
                 if (id <= 0)
                 {
                     FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
                 }
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                var itemlasts = itembll.GetModelList("  F_WoID=" + id + " and  F_Type=" + ua.F_Flag + " ");
+                var itemlasts = itembll.GetModelList("  F_WoID=" + id + "");
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_WoState =1 and  F_WoID='" + id + "'and F_CreateUser='" + ua.F_UserCode + "' order by F_ID desc");
+                if (itemlast != null && itemlast.Count > 0)
+                {
+                    if (markdepts.Contains(ua.F_DeptId.ToString()))
+                    {
+                        var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                        if (itemlast.Count == 2 || itemnext.F_Flag == 9)
+                        {
+                            woflag = 9;
+                        }
+                    }
+                }
                 //var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
                 if (list.Count > 0)
                 {
                             rows = Input,
                             FileUrl,
                             total = itemlasts,
+                            woflag = woflag
                         };
                        
                         return Content(obj.ToJson());
                 return Error("无操作权限！");
             }
         }
+        /// <summary>
+        /// 获取当前节点内外线状态
+        /// </summary>
+        /// <param name="fid"></param>
+        /// <returns></returns>
+        public int? GetNodeState(int fid, string usercode)
+        {
+            int? flag = 0;
+
+            string markdepts = "37,57,74,88,268,295,339";
+            if (!string.IsNullOrEmpty(usercode))
+            {
+                Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(usercode);
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_OptType=1  and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID").FirstOrDefault();
+                if (itemlast != null)
+                {
+                    //if (!markdepts.Contains(ua.F_DeptId.ToString()))
+                    //{
+                    if (itemlast.F_Flag != 9)
+                    {
+                        flag = itemlast.F_Type;
+                    }
+                    //}
+                    else if (itemlast.F_Flag == 9)
+                    {
+                        if (itemlast.F_IsUsed == 0)
+                        {
+                            flag = 9;
+                        }
+                        else
+                        {
+                            var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_OptType=1  and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                            if (itemnext != null)
+                                flag = itemnext.F_Type;
+                        }
+                    }
+                }
+            }
+            return flag;
+        }
         public string GetID(string str, long id)
         {
             if (str != "")
                     model.F_WorkmanShip = model1[i].F_WorkmanShip;//质量管理科-工艺
                     model.F_Manufacturers = model1[i].F_Manufacturers;//质量管理科-原料及厂家
                     model.F_ProductionNum = model1[i].F_ProductionNum;//质量管理科-该批次生产数量
+                    model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
+                    model.inout = GetNodeState(model1[i].F_ID,ua.F_UserCode);
                     if (ua != null)
                     {
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                                 //}
                                 if (nextda != 0)
                                 {
-                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms,0,0,0,"",1);
+                                    model.F_Flag = 9;
+                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms,0,0,0,"",1,3,9);
                                     if (res)
                                         return Success("添加成功");
                                     else
                 }
                 if (model .F_State !=0)
                 {
-                    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 strsql = " and F_Type in(3,"+ua.F_Flag+")";
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%') and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                    if (modellist == null)
                     {
-                        if (modellist.F_NextUser != ua.F_UserCode)
-                            return Error("非接单人不可操作工单");
+                        //if (modellist.F_NextUser != ua.F_UserCode)
+                        return Error("非接单人不可操作工单");
                     }
                 }
                if (sms ==-1)
                     {
                         return Error("请选择接收部门");
                     }
-                    if (markdepts.Contains(ua.F_DeptId.ToString()))
+                    if (markdepts.Contains(ua.F_DeptId.ToString()) && model.F_Flag == 9)
                     {
                         if (markdepts.Contains(ua.F_DeptId.ToString()))
                         {
                                 input.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
                                 input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
                             }
-                        }
-                        if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
-                        {
-                            return Error("请选择接收部门");
-                        }
-
+                        }      
                         model.F_Flag = flag;
                         if (flag == 3)
                         {
                                 return Error("请选择接收部门");
                             }
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, ua.F_Flag);
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%') and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(modellist.F_Type));
                         if (res)
                         {
                             return Success("转派成功");
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单给 " + tousername + optcont;
-            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat,0,flag);
+            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser, overtime, sms, creat,0,flag,flagstate);
             if (itemid > 0)
             {
                 #region 处理工单
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     if (model != null)
                     {
-                        string strsql = "";
-                        if (ua.F_Flag == 1)
-                        {
-                            strsql = " and F_Type in(1,3)";
-                        }
-                        else if (ua.F_Flag == 2)
-                        {
-                            strsql = " and F_Type in(2,3)";
-                        }
+                        //string strsql = "";
+                        //if (ua.F_Flag == 1)
+                        //{
+                        //    strsql = " and F_Type in(1,3)";
+                        //}
+                        //else if (ua.F_Flag == 2)
+                        //{
+                        //    strsql = " and F_Type in(2,3)";
+                        //}
 
-                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 " + strsql + "  order by  F_ID desc ").FirstOrDefault();
-                        if (modellist != null)
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState=1 and F_IsUsed=0 and F_NextUser like '%" + ua.F_UserCode + "%' order by  F_ID desc ").FirstOrDefault();
+                        if (modellist == null)
                         {
-                            if (!string.IsNullOrEmpty(modellist.F_NextUser))
-                            {
-                                string[] sprt = modellist.F_NextUser.Split(',');
-                                if (sprt.Length == 1)
-                                {
-                                    if (modellist.F_NextUser != ua.F_UserCode)
-                                        return Error("非接单人不可操作工单");
-                                }
-                            }
+                            return Error("非接单人不可操作工单");
 
                         }
-                        if (ua.F_Flag == 1)
-                        {
-                            if (model.F_State == 2)
-                                return Error("工单已接单无需重新接单");
-                        }
-                        else if (ua.F_Flag == 2)
-                        {
-                            if (model.F_State2 == 2)
-                                return Error("工单已接单无需重新接单");
-                        }
-                        var res = SureWO(ua, model, ua.F_Flag);
+                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_IsUsed=1 and F_WoState=1 and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ").FirstOrDefault();
+                        if (modellast != null && modellast.F_ID > modellist.F_ID)
+                            return Error("工单已接单无需重新接单");
+                        int? zflag = modellist.F_Type;
+                        var res = SureWO(ua, model, Convert.ToInt32(zflag));
                         if (res)
                             return Success("接单成功");
                         else
                 {
                     model.F_State2 = wostate;//已接单待处理
                 }
+                else
+                {
+                    model.F_State = wostate;//已接单待处理
+                    model.F_State2 = wostate;//已接单待处理
+                }
                 model.F_DealBy = nowUser.F_UserCode;//已接单待处理
                 woBLL.Update(model);
                 #endregion
          string uncont = "",
         int isvisit = 1, int isover = 0)
         {
+            string markdepts = "37,57,74,88,268,422,339";
+            string qualdepts = "12,36,295,245";
             if (!string.IsNullOrEmpty(OpenId))
             {
                 if (string.IsNullOrEmpty(cont))
                 if (ua != null)
                 {
 
-                    if (isover == 1 && ua.F_DeptId != 36 && ua.F_DeptId != 37)
+                    if (!markdepts.Contains(ua.F_DeptId.ToString()) && !qualdepts.Contains(ua.F_DeptId.ToString()))
                         return Error("权限不足");
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                     {
                         if (model != null)
                         {
-                            string markdepts = "37,57,74,88,268,422,339";
-                            string qualdepts = "12,36,295,245";
-                            string strsql = "";
-                            if (ua.F_Flag == 1)
-                            {
-                                strsql = " and F_Type in(1,3)";
-                            }
-                            else if (ua.F_Flag == 2)
-                            {
-                                strsql = " and F_Type in(2,3)";
-                            }
-                            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 " + strsql + "  order by  F_ID desc ").FirstOrDefault();
-                            if (modellist != null)
+
+                            //string strsql = "";
+                            //if (ua.F_Flag == 1)
+                            //{
+                            //    strsql = " and F_Type in(1,3)";
+                            //}
+                            //else if (ua.F_Flag == 2)
+                            //{
+                            //    strsql = " and F_Type in(2,3)";
+                            //}
+                            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_IsUsed=0 and F_NextUser like '%" + ua.F_UserCode + "%' order by  F_ID desc ").FirstOrDefault();
+                            if (modellist == null)
                             {
-                                if (modellist.F_NextUser != ua.F_UserCode)
-                                    return Error("非接单人不可操作工单");
+                                //if (modellist.F_NextUser != ua.F_UserCode)
+                                return Error("非接单人不可操作工单");
                             }
                             if (markdepts.Contains(ua.F_DeptId.ToString()) || qualdepts.Contains(ua.F_DeptId.ToString()))
                             {
                                 input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
                                 //input.F_EventReason = deptment.EventReason;// 事件原因
                                 input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;// 改进要求
+                                input.F_IsVisit = isvisit.ToString();
 
                             }
-                            #region nouser
-                            //if (model.F_Type == "2" || model.F_Type == "5")
-                            //{
-                            //    if (deptmodel.F_DeptId == 37)
-                            //    {
-                            //        input.F_SC_ProductBase = deptment.ProductBase;//
-
-                            //    }
-                            //    else if (deptmodel.F_DeptId == 12)
-                            //    {
-                            //        input.F_IsVisit = isvisit.ToString();
-                            //        input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
-                            //        input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
-                            //        input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
-                            //        input.F_ZL_ApprovalOpinions = deptment.ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
-                            //        input.F_ZL_ApprovalDisagree = deptment.ApprovalDisagree;// 质量管理科-审批不同意意见
-                            //        input.F_ZL_CompensationMethod = deptment.CompensationMethod;// 质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
-                            //        input.F_ZL_CompensationMoney = deptment.CompensationMoney;// 质量管理科-补偿钱款
-                            //        input.F_ZL_CResponsibleUnits = deptment.CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
-                            //        input.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量（吨）
-                            //        input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;//  质量管理科-改进要求
-                            //        input.F_ZL_CApprovalNo = deptment.CApprovalNo;// 质量管理科-对应审批工作流单号
-                            //    }
-
-                            //}
-                            //else if (model.F_Type == "3")
-                            //{
-                            //    if (deptmodel.F_DeptId == 37)
-                            //    {
-                            //        input.F_SC_ProductBase = deptment.ProductBase;//
-                            //    }
-                            //    else if (deptmodel.F_DeptId == 12)
-                            //    {
-                            //        input.F_IsVisit = isvisit.ToString();
-                            //        input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
-                            //    }
-                            //}
-                            //if (deptmodel.F_DeptId == 25)
-                            //{
+                            
+                            var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0   order by  F_ID desc ").FirstOrDefault();
+                            if (model.F_State == 10 && model.F_State2 == 10)
+                                return Error("工单已处理请勿重复操作！");
+                            else
+                            {
+                                var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, Convert.ToInt32(modellist.F_Type), deptment.EventReason);
+                                if (res)
+                                    return Success("处理成功");
+                                else
+                                    return Error("处理失败！");
+                            }
 
-                            //    input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//销售内勤-确认返账金额
-                            //}
-                            //else if (deptmodel.F_DeptId == 36)
-                            //{
-                            //    input.F_ZL_Fquantity = deptment.Fquantity;//质量管理科-确认实收数量（吨）
-                            //}
-                            #endregion
                         }
                         else
                             return Error("工单不存在！");
                     {
                         return Error("请选择接收部门");
                     }
-                    if (model != null)
-                    {
-                        if (model.F_State == 10 && model.F_State2 == 10)
-                            return Error("工单已处理请勿重复操作！");
-                        else
-                        {
-                            var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, ua.F_Flag, deptment.EventReason);
-                            if (res)
-                                return Success("处理成功");
-                            else
-                                return Error("处理失败！");
-                        }
-                       
-                    }
-                    else
-                        return Error("工单不存在！");
+       
                 }
             }
             return Error("无操作权限！");
                     //验证信息
                     if (model != null)
                     {
-                        string strsql = "";
-                        if (ua.F_Flag == 1)
-                        {
-                            strsql = $" and F_Type in(1,3)";
-                        }
-                        else if (ua.F_Flag == 2)
-                        {
-                            strsql = $" and F_Type in(2,3)";
-                        }
-                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 {strsql} order by   F_ID desc ").FirstOrDefault();
-                        if (modellist != null)
+                        //string strsql = "";
+                        //if (ua.F_Flag == 1)
+                        //{
+                        //    strsql = $" and F_Type in(1,3)";
+                        //}
+                        //else if (ua.F_Flag == 2)
+                        //{
+                        //    strsql = $" and F_Type in(2,3)";
+                        //}
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%')  order by   F_ID desc ").FirstOrDefault();
+
+                        if (modellist == null)
                         {
-                            if (modellist != null)
-                            {
-                                string[] sprt = modellist.F_NextUser.Split(',');
-                                if (sprt.Length == 1)
-                                {
-                                    if (modellist.F_NextUser != ua.F_UserCode)
-                                        return Error("非接单人不可操作工单");
-                                }
-                            }
+                            return Error("非接单人不可操作工单");
                         }
-                        var res = BackWO(ua, model, cont, type, ua.F_Flag);
+                        var res = BackWO(ua, model, cont, type, (Convert.ToInt32(modellist.F_Type)));
                         if (res)
                             return Success("退回成功");
                         else
         /// <param name="cont"></param>
         /// <returns></returns>
         [WechatActionFilter]
-        public ActionResult RevokeWo(string OpenId,long orderid, string cont)
+        public ActionResult RevokeWo(string OpenId, long orderid, string cont)
         {
 
             if (!string.IsNullOrEmpty(OpenId))
                     {
                         int flag = 0;
                         Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_OptType =1 and F_IsUsed=0 and F_CreateUser={ua.F_UserCode} order by   F_ID desc ").FirstOrDefault();
 
                         if (modellist != null)
                         {
-                            string createuser = modellist.F_CreateUser;
-                            if (!string.IsNullOrEmpty(createuser))
+                            //string createuser = modellist.F_CreateUser;
+                            //if (!string.IsNullOrEmpty(createuser))
+                            //{
+                            //    if (createuser != ua.F_UserCode)
+                            //        return Error("无操作权限");
+                            //}
+                            //if (modellist.F_WoState == (int)EnumWorkOrderState.assign)
+                            //{
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                             {
-                                if (createuser != ua.F_UserCode)
-                                    return Error("无操作权限");
+                                flag = 3;
                             }
-                            if (modellist.F_WoState == (int)EnumWorkOrderState.assign)
+                            else
                             {
-                                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
-                                {
-                                    flag = 3;
-                                }
-                                else
-                                {
-                                    flag = ua.F_Flag;
-                                }
-                                var res = RevWO(ua, model, cont,flag);
-                                if (res)
-                                    return Success("撤回成功");
-                                else return Error("撤回失败！");
+                                flag = Convert.ToInt32(modellist.F_Type);
                             }
-                            else
-                                return Error("撤回失败！");
+                            var res = RevWO(ua, model, cont, flag);
+                            if (res)
+                                return Success("撤回成功");
+                            else return Error("撤回失败！");
+                            //}
+                            //else
+                            //    return Error("撤回失败！");
                         }
                         return Error("操作失败！");
                     }
         {
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
             #region 
-            string strsql = "";
-            Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
-            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" && flag != 3)
+            string strsql = "";         
+            if (nowUser != null)
             {
-                strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  F_CreateUser={nowUser.F_UserCode} and F_Type in({flag},3) ";
+                string flagstr = "";
+                if (flag != 3)
+                    flagstr = $" and F_Type in({ flag},3)";
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
+                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" && flag != 3)
+                {
+                    strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  F_CreateUser={nowUser.F_UserCode}{flagstr}";
+                }
+                else
+                {
+                    strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%'){flagstr}";
+                }
             }
             else
             {
-                strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%')"
-                       + $" and F_Type in({flag},3)";
+                strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid}";
             }
             //处理当前工单的记录之前的记录过期
             //var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
             }
 
             #endregion
+
+
             itemModel.F_WoID = woid;
             itemModel.F_IsSMS = sms;
             itemModel.F_WoState = wostate;