Merge branch 'feat-liucheng'

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MsgController.cs

@@ -383,7 +383,7 @@ namespace CallCenterApi.Interface.Controllers
             //}
             #endregion
             
-            var msgListnew = new BLL.T_Msg_List().GetModelList(" ToUser='" + usercode + "' and Type in (2,8) and State=0 and IsDel=0 order by CreateDate desc");
+            var msgListnew = new BLL.T_Msg_List().GetModelList(" ToUser='" + usercode + "' and Type in (2,8,7) and State=0 and IsDel=0 order by CreateDate desc");
             return Success("获取消息", msgListnew);
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -534,16 +534,21 @@ namespace CallCenterApi.Interface.Controllers.customer
             string sql = $" F_DeleteFlag=0";
             if (!string.IsNullOrWhiteSpace(model.F_AddressCountry))//县
             {
-                sql += $" and F_Remark like '%{ model.F_AddressCountry.Trim()}%'";
+                sql += $" and (F_Remark like '%{ model.F_AddressCountry.Trim()}%'";
+                if (!string.IsNullOrWhiteSpace(model.F_AddressCity))//市
+                    sql += $" or F_Remark like '%{model.F_AddressCity.Trim()}%')";
+                else
+                    sql += $")";
             }
             else if (!string.IsNullOrWhiteSpace(model.F_AddressCity))//市
                 sql += $" and F_Remark like '%{model.F_AddressCity.Trim()}%'";
             else
-                sql += $"and 1!=1 ";
+                sql += $" and 1!=1";
             var modelist = new BLL.T_Sys_UserAccount().GetModelList(sql);
             var saleslist = modelist.Where(t => !string.IsNullOrEmpty(t.F_UserCode)).Select(p => new
             {
-                Salesman = new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName + "-" + p.F_UserName + "(" + p.F_UserCode + ")",              
+                //Salesman = new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName + "-" + p.F_UserName + "(" + p.F_UserCode + ")",              
+                Salesman = p.F_UserName +"-"+ new BLL.T_Sys_RoleInfo().GetModel(p.F_RoleId).F_RoleName + "-" + new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName,
                 SalesPhone = p.F_Mobile
             });
             var obj = new

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

@@ -1093,8 +1093,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 if (GetDeptUserCode(ua.F_DeptId) != "")
                                 {
                                     //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
-                                    sql += " and ((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
+                                    sql += " and (((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                                     sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
+                                    sql += " or T_Wo_WorkOrder.F_ID in (" + GetOverWo(ua.F_UserCode) + "))";
                                 }
                                 //  sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
                                 break;
@@ -1556,9 +1557,38 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and ( F_QuestionType like '%" + keywords.Trim()
-                         + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim()
-                         + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%')  ";
+                {
+
+                    var QuestionManage = quesBLL.GetModelList("F_QuestionName like '%" + keywords + "%' and F_IsDelete=0");
+                    if (QuestionManage != null)
+                    {
+                        if (QuestionManage.FirstOrDefault().F_Type == EnumWOType.Complaint.ToString())
+                        {
+                            if (QuestionManage.FirstOrDefault().F_Label == "3")
+                            {
+                                string queststrs = string.Format("'{0}'", string.Join(",", QuestionManage.Select(T => T.F_Id)).Replace(",", "','"));
+                                sql += $"  and T_Wo_WorkOrder.F_QuestionType  in (" + queststrs + ")";
+                            }
+                            else if (QuestionManage.FirstOrDefault().F_Label == "2")
+                            {
+
+                                sql += $"  and T_Wo_WorkOrder.F_QuestionType in ('" + GetComplaint(keywords, 1) + "')"; ;
+                            }
+                            else
+                            {
+                                sql += $"  and T_Wo_WorkOrder.F_QuestionType in ('" + GetComplaint(keywords, 0) + "')"; ;
+                            }
+                        }
+                        else
+                        {
+                            sql += $"  and (T_Wo_WorkOrder.F_QuestionType  in (" + string.Join(",", QuestionManage.Select(t => t.F_Id).ToArray()) + ") or T_Wo_WorkOrder.F_QuestionType like '%" + keywords + "%')"; 
+                        }         
+                    }
+
+                }
+                //sql += $"  and ( F_QuestionType like '%" + keywords.Trim()
+                //     + "%' or F_ZX_Area like '%" + keywords.Trim() + "%' or F_ZX_Branch like '%" + keywords.Trim()
+                //     + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%')  ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -1729,6 +1759,43 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return Error("无操作权限！");
             }
         }
+
+
+        /// <summary>
+        /// 获取问题类别
+        /// </summary>
+        /// <returns></returns>
+        public string GetComplaint(string msg, int type = 0)
+        {
+            string str = "";
+            string str1 = "";
+            string str3 = "";
+            if (type == 0)
+            {
+                str1 = " select F_Id from T_Wo_QuestionManage where F_QuestionName like '%"+ msg +"%'";
+                str3 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str1 + ")";
+            }
+            else if (type == 1)
+            {
+                str3 = " select F_Id from T_Wo_QuestionManage where  F_QuestionName like '%" + msg + "%'";
+            }
+            var dept = quesBLL.GetModelList("F_ParentId in(" + str3 + ")");
+            if (dept != null)
+            {
+                foreach (var it in dept)
+                {
+
+                    if (str != "")
+                        str += "','" + it.F_Id.ToString();
+                    else
+                        str += it.F_Id.ToString();
+
+                }
+            }
+            //  string str4 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str3 + ")";
+            return str;
+        }
+
         /// <summary>
         /// 根据部门获取工单号
         /// </summary>
@@ -1813,6 +1880,23 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             return str;
         }
+
+
+
+        /// <summary>
+        /// 获取完结审批的工单
+        /// </summary>
+        /// <param name="usercode"></param>
+        /// <returns></returns>
+        public string GetOverWo(string usercode)
+        {
+            string str = "";
+            str = $"Select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal + " and F_WoState in (" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.finish + ") and F_OptType=" + (int)EnumItemOpt.end + " and F_CreateUser='" + usercode + "'";
+            return str;
+
+        }
+
+
         /// <summary>
         /// 获取待完成的工单编号
         /// </summary>
@@ -1971,11 +2055,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         sql = "";
                         sql += $"  F_IsDelete=0";
                         //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
-                        sql += " and ((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 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) + ") ";
-                        }
+                        sql += " and (((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
+                        sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
+                        sql += " or T_Wo_WorkOrder.F_ID in (" + GetOverWo(ua.F_UserCode) + "))";
                         //   sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
                         YCL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
 
@@ -2985,14 +3067,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 var model = woBLL.GetModel(id);
                 if (model != null)
                 {
-                    if (model.F_SC_PreliminaryOpinion == "退换货")
+                    //if (model.F_SC_PreliminaryOpinion == "退换货")
+                    //{
+                    List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
+                    if (materlist != null)
                     {
-                        List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
-                        if (materlist != null)
-                        {
-                            model.MaterialItems = materlist;
-                        }
+                        model.MaterialItems = materlist;
                     }
+                    //}
                     list.Add(model);
                 }
                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " ");
@@ -3119,9 +3201,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //}
                     else if (itemlast.F_Flag == 9)
                     {
-                        if (itemlast.F_IsUsed == 0)
+                        var itemlest = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + "  and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                        if (itemlest.F_IsUsed == 0)
                         {
-                            flag = 9;
+                            if (itemlest.F_Flag == 9)
+                                flag = 9;
+                            else
+                                flag = itemlest.F_Type;
                         }
                         else
                         {
@@ -3160,7 +3246,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     foreach (var item in itemnext2)
                                     {
-                                        if (item.F_WoState != 11)
+                                        if (item.F_WoState != 11 && item.F_WoState != 10)
                                             flag = item.F_Type;
                                     }
                                 }
@@ -3735,17 +3821,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     else
                         model.F_TS_Quantity = "";
                     model.F_TS_Level = model1[i].F_TS_Level;//投诉-重要级别：轻微、一般、较大、重大
-                    if (model1[i].F_SC_PreliminaryOpinion == "退换货")
+                                                           
+                    List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
+                    if (materlist != null)
                     {
-                        List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
-                        if (materlist != null)
-                        {
-                            model.MaterialItems = materlist;
-                            model.F_ZL_Fquantity = materlist.Sum(x => x.F_ReturnQuantity).ToString();
-                        }
+                        model.MaterialItems = materlist;
+                        model.F_ZL_Fquantity = materlist.Sum(x => x.F_ReturnQuantity).ToString();
                     }
-                    else
-                        model.MaterialItems = null;
+
                     model.F_CarNumber = model1[i].F_CarNumber;
                     model.F_LoadingFee = model1[i].F_LoadingFee;
                     model.F_UnLoadingFee = model1[i].F_UnLoadingFee;
@@ -4959,10 +5042,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (model.F_Source == "3")
                 {
                     model.F_State = (int)EnumWorkOrderState.customers;
+                    model.F_State2 = (int)EnumWorkOrderState.customers;
                 }
                 else
                 {
                     model.F_State = (int)EnumWorkOrderState.audit;
+                    model.F_State2 = (int)EnumWorkOrderState.audit;
                 }
                 model.F_limit = overtime;
                
@@ -5257,7 +5342,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         [WechatActionFilter]
         public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
-            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="", int flag = 1,int inoutflag = 0, string Supercont = "")
+            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="", int flag = 1,int inoutflag = 0, string Supercont = "", int opttype = 1, string cont2 = "")
         {
 
             if (!string.IsNullOrEmpty(OpenId))
@@ -5320,10 +5405,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
 
                     }
-                    if (hclid == 0 && hclbm == 0 && isApprovalp != 0)
-                    {
-                        return Error("请选择接收部门");
-                    }
+                    //if (hclid == 0 && hclbm == 0 && isApprovalp != 0)
+                    //{
+                    //    return Error("请选择接收部门");
+                    //}
                     #region 五要素
                     input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
                     input.F_EventReason = deptment.EventReason;// 事件原因
@@ -5348,6 +5433,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             }
                         }      
                         model.F_Flag = flag;
+                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextUser like '%{ua.F_UserCode}%' and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
                         if (flag == 3)
                         {
                             if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
@@ -5364,9 +5450,26 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (clbm2 == 0 && clid2 == 0)
                             {
                                 return Error("请选择接收部门");
+                            }                          
+                            if (opttype == 2) //填写处理结果
+                            {
+                                flag = 3;
+                                DealWO(ua, model,"", input, cont2, 1, "", 1,"", flag,isApprovalp);
+                            }
+                            else if (opttype == 3) // 待处理状态
+                            {
+                                flag = 3;
+                                modellast.F_Type = 1;
+                                modellast.F_Flag = flag;
+                                modellast.F_NextDept = 0;
+                                itembll.Update(modellast);
                             }
-                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag,Supercont);
-                            Overorder(ua, model, 1);
+                            else //完结工单
+                            {
+                                Overorder(ua, model, 1);
+                            }
+                            model.F_Flag = flag;
+                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag,Supercont);                        
                         }
                         else
                         {
@@ -5374,8 +5477,26 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             {
                                 return Error("请选择接收部门");
                             }
+                            if (opttype == 2) //填写处理结果
+                            {
+                                flag = 3;
+                                DealWO(ua, model,"", input, cont2, 1, "", 2,"", flag,isApprovalp);
+                            }
+                            else if (opttype == 3) // 待处理状态
+                            {
+                                flag = 3;
+                                modellast.F_Type = 2;
+                                modellast.F_Flag = flag;
+                                modellast.F_NextDept = 0;
+                                itembll.Update(modellast);
+                            }
+                            else //完结工单
+                            {
+                                Overorder(ua, model, 2);
+                            }
+                            model.F_Flag = flag;
                             var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
-                            Overorder(ua, model, 2);
+                          
                         }
                         return Success("转派成功");
                     }
@@ -5453,13 +5574,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                         //    }
 
                                         //}
-                                        else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货")
+                                        else if (deptmodel.F_DeptId == 248)
                                         {
-                                            input.F_CarNumber = deptment.CarNumber;//返厂车牌号
-                                            input.F_LoadingFee = deptment.LoadingFee;//装车费
+                                            input.F_CarNumber = deptment.CarNumber;
                                             input.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
                                             input.F_MaterialFee = deptment.MaterialFee;//返料费
-                                            input.F_DrivePhone = deptment.DrivePhone;//电话号码
+                                            input.F_DrivePhone = deptment.DrivePhone;//电话号码nt.CarNumber;//返厂车牌号
+                                            input.F_LoadingFee = deptment.LoadingFee;//装车费
                                             if (!string.IsNullOrEmpty(jsonstr))
                                             {
                                                 JavaScriptSerializer Serializer = new JavaScriptSerializer();   //实例化⼀个能够序列化数据的类
@@ -5545,7 +5666,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         if (zflag != 3)
                         {
-                            var modeldpts = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextDept={clbm} and F_Type not in({zflag},3) and F_Flag=3 order by   F_ID desc ").FirstOrDefault();
+                            var modeldpts = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextDept={clbm} and F_Type not in({zflag},3) and F_Flag=3 and F_OptType not in(15,4,5) order by   F_ID desc ").FirstOrDefault();
                             if (modeldpts != null)
                                 return Error("不允许同一个部门出现在两条线内,请重新指派！");
                         }
@@ -5712,39 +5833,39 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 touser = users;
             }
             string htouser = "", htousername = "";
-            if (isApprovalp != 0 && nowUser.F_DeptId == 37)
-            {
-                if (hclid != 0)
-                {
-                    Model.T_Sys_UserAccount clus = userAccountBLL.GetModel(hclid);
-                    if (clus != null)
-                    {
-                        if (string.IsNullOrEmpty(htouser))
-                        {
-                            htouser = clus.F_UserCode;
-                            htousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
-                        }
-                    }
-                }
-                else
-                {
-                    var list = userAccountBLL.GetModelList(" F_DeptId='" + hclbm + "'");
-                    foreach (var l in list)
-                    {
-                        if (string.IsNullOrEmpty(htouser))
-                        {
-                            htouser = l.F_UserCode;
-                            htousername = l.F_UserName + "(" + l.F_UserCode + ")";
-                        }
-                        else
-                        {
-                            htouser = htouser + "," + l.F_UserCode;
-                            htousername = htousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
-                        }
-                    }
-                }
-                AddLog(model.F_ID, (int)EnumWorkOrderState.assign, htousername + "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat, 2);
-            }
+            //if (isApprovalp != 0 && nowUser.F_DeptId == 37)
+            //{
+            //    if (hclid != 0)
+            //    {
+            //        Model.T_Sys_UserAccount clus = userAccountBLL.GetModel(hclid);
+            //        if (clus != null)
+            //        {
+            //            if (string.IsNullOrEmpty(htouser))
+            //            {
+            //                htouser = clus.F_UserCode;
+            //                htousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        var list = userAccountBLL.GetModelList(" F_DeptId='" + hclbm + "'");
+            //        foreach (var l in list)
+            //        {
+            //            if (string.IsNullOrEmpty(htouser))
+            //            {
+            //                htouser = l.F_UserCode;
+            //                htousername = l.F_UserName + "(" + l.F_UserCode + ")";
+            //            }
+            //            else
+            //            {
+            //                htouser = htouser + "," + l.F_UserCode;
+            //                htousername = htousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
+            //            }
+            //        }
+            //    }
+            //    AddLog(model.F_ID, (int)EnumWorkOrderState.assign, htousername + "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat, 2);
+            //}
 
             #region 财务审核后，填单人员可以收到到账提醒（短信到账提醒）20220217
             if (nowUser.F_DeptId == 260)
@@ -6178,13 +6299,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         //    strsql = " and F_Type in(2,3)";
                         //}
 
-                        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();
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState in(1,4) and F_IsUsed=0 and F_NextUser like '%" + ua.F_UserCode + "%' order by  F_ID desc ").FirstOrDefault();
                         if (modellist == null)
                         {
                             return Error("非接单人不可操作工单");
 
                         }
-                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState=1 and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ");
+                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState in(1,4) and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ");
                         if (modellast.Count > 0)
                         {
                             int isused = modellast.Select(p => p.F_IsUsed == 0).Count();
@@ -6604,36 +6725,34 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        //string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
-                        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)
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        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 ");
+                        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 (modellist.Count <= 0)
                         {
                             return Error("非接单人不可操作工单");
                         }
-
-                        //if (!string.IsNullOrEmpty(modellist.F_CreateUser))
-                        //{
-                        //    var deptid = userAccountBLL.GetModel(modellist.F_CreateUser.ToString())?.F_DeptId;
-                        //    if (markdepts.Contains(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 '%" + modellist.F_CreateUser + "%' order by F_ID desc").FirstOrDefault();
-                        //        if (itemnext.F_Flag == 9)
-                        //        {
-                        //            model.F_Flag = 9;
-                        //        }
-
-                        //    }
-                        //}
-                        if (inoutflag != 0)
+                        if (markdepts.Contains(ua.F_DeptId.ToString()) && itemnext.F_Flag == 9)
                         {
-                            flag = inoutflag;
+                            if (modellist.Count >= 2)
+                            {
+                                flag = 3;
+                            }
+                            else
+                                return Error("异常退回工单失败！");
                         }
                         else
                         {
-                            flag = Convert.ToInt32(modellist.F_Type);
+                            if (inoutflag != 0)
+                            {
+                                flag = inoutflag;
+                            }
+                            else
+                            {
+                                flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                            }
                         }
+
                         var res = BackWO(ua, model, cont, type, flag);
                         if (res)
                             return Success("退回成功");
@@ -6674,22 +6793,20 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
                         if (modelnext != null)
                         {
-                            foreach (var item in modelnext)
-                            {
-                                if (item.F_IsUsed == 1)
-                                    return Error("撤回失败,无法撤回！");
-                            }
                             if (inoutflag != 0)
                             {
                                 flag = inoutflag;
                             }
                             else
                             {
-                                var modellist = itembll.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 ");
-                                if (modellist == null)
-                                { return Error("无操作权限"); }
+                                var modellist = itembll.GetModelList($"F_WoID={model.F_ID}  and F_IsUsed=0 and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
+
+                                if (modellist.Count <= 0)
+                                    return Error("撤回失败,无法撤回！");
                                 if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                                 {
+                                    if (modellist != null && modellist.Count < 2)
+                                        return Error("撤回失败,无法撤回！");
                                     flag = 3;
                                 }
                                 else if (modellist != null && modellist.Count > 0)
@@ -6702,8 +6819,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                             flag = 3;
                                             model.F_Flag = 9;
                                         }
-                                        else if (itemnext.F_Flag == 9)
+                                        else if (itemnext != null && itemnext.F_Flag == 9)
                                         {
+                                            if (modellist != null && modellist.Count < 2)
+                                                return Error("撤回失败,无法撤回！");
                                             flag = 3;
                                             model.F_Flag = 9;
                                         }
@@ -6930,6 +7049,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else
                     {
+                        model.F_Flag = 9;
                         model.F_State = wostate;
                         model.F_State2 = wostate;
                     }

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

@@ -279,8 +279,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //    sql += " and F_State2 in(10,11)";
                             //}
                             //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
-                            sql += " and ((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
+                            sql += " and (((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                             sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
+                            sql += " or T_Wo_WorkOrder.F_ID in (" + GetOverWo(ua.F_UserCode) + "))";
                         }
 
                         break;
@@ -645,6 +646,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
 
         }
+
+        /// <summary>
+        /// 获取完结审批的工单
+        /// </summary>
+        /// <param name="usercode"></param>
+        /// <returns></returns>
+        public string GetOverWo(string usercode)
+        {
+            string str = "";
+            str = $"Select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType="+(int)EnumItemType.deal+" and F_WoState in (" +(int)EnumWorkOrderState.audit+","+(int)EnumWorkOrderState.finish + ") and F_OptType=" + (int)EnumItemOpt.end + " and F_CreateUser='"+ usercode + "'";
+            return str;
+
+        }
         /// <summary>
         /// 获取工单数量
         /// </summary>
@@ -821,11 +835,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //{
                             //    sql += " and F_State2 in(10,11)";
                             //}
-                            sql += " and ((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 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) + ") ";
-                            }
+                            sql += " and (((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
+                            sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
+                            sql += " or T_Wo_WorkOrder.F_ID in (" + GetOverWo(ua.F_UserCode) + "))";
                             //   sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
                             YCL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
 
@@ -2515,14 +2527,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var model = workOrder.GetModel(id);
                 if (model != null)
                 {
-                    if (model.F_SC_PreliminaryOpinion == "退换货")
+                    //if (model.F_SC_PreliminaryOpinion == "退换货")
+                    //{
+                    List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
+                    if (materlist != null)
                     {
-                        List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
-                        if (materlist != null)
-                        {
-                            model.MaterialItems = materlist;
-                        }
+                        model.MaterialItems = materlist;
                     }
+                    //}
                     list.Add(model);
                 }
                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " ");
@@ -2642,9 +2654,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //}
                     else if (itemlast.F_Flag == 9)
                     {
-                        if (itemlast.F_IsUsed == 0)
+                        var itemlest = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + "  and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                        if (itemlest.F_IsUsed == 0)
                         {
-                            flag = 9;
+                            if (itemlest.F_Flag == 9)
+                                flag = 9;
+                            else
+                                flag = itemlest.F_Type;
                         }
                         else
                         {
@@ -2679,14 +2695,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
                                 var itemnext2 = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + "  and F_IsUsed=0 and  F_WoID='" + fid + "' and F_CreateUser='" + ua.F_UserCode + "' order by F_ID desc");
-                                if (itemnext2.Count > 0)
+                                if (itemnext2.Count > 0 && itemnext2.Count == 2)
                                 {
-                                    foreach (var item in itemnext2)
-                                    {
-                                        if (item.F_WoState != 11)
-                                            flag = item.F_Type;
-                                    }
+                                    flag = 3;
+                                }
+                                else if (itemnext2.Count > 0)
+                                {
+                                    flag = itemnext2.FirstOrDefault().F_Type;
                                 }
+                                else
+                                {
+                                    flag = itemlast.F_Type;
+                                }
+                                //if (itemnext2.Count > 0)
+                                //{
+                                //    foreach (var item in itemnext2)
+                                //    {
+                                //        if (item.F_WoState != 11)
+                                //            flag = item.F_Type;
+                                //    }
+                                //}
                             }
                         }
                     }
@@ -2713,20 +2741,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
-                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_OptType =1 and  F_WoID='" + fid + "'and (F_CreateUser='" + ua.F_UserCode + "' or     F_NextUser like '%" + ua.F_UserCode + "%') order by F_ID desc");
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0  and  F_WoID='" + fid + "'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_OptType =1 and  F_WoID='" + fid + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                        var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + fid + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
                         if (itemlast.Count == 2)
                         {
                             woflag = 9;
                         }
-                        else if (itemnext != null && itemnext.F_Flag == 9)
-                        {
-                            woflag = 9;
-                        }
+                        //else if (itemnext != null && itemnext.F_Flag == 9)
+                        //{
+                        //    woflag = 9;
+                        //}
                     }
                 }
             }
@@ -6688,6 +6716,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.F_QuestionType = manage.F_QuestionName;//问题类别3
                                 model.F_QuestionTypeid = manage.F_Id;
                                 #region 20220215修改 肥效类增加作物字段
+                                var cropid = 0;
                                 if (manage.F_Label == "3")
                                 {
                                     Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别2
@@ -6695,13 +6724,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     model.F_QuestionTypeone = Manage2.F_QuestionName;//问题类别1
                                     model.F_QuestionTypeoneid = Manage2.F_Id;//问题类别1
                                     model.F_QuestionTypetwo = Manage1.F_QuestionName;//问题类别2
-                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别2
-                                    var cropid = 0;
-                                    if (int.TryParse(model1[i].F_Crops.Trim(), out cropid))
-                                    {
-                                        model.F_QuestionTypefour = new BLL.T_Sys_DictionaryValue().GetModel(cropid)?.F_Name ?? "";//问题类别4
-                                        model.F_QuestionTypefourid = cropid;//问题类别4
-                                    }
+                                    model.F_QuestionTypetwoid = Manage1.F_Id;//问题类别2                             
+                                }
+                                if (int.TryParse(model1[i].F_Crops.Trim(), out cropid))
+                                {
+                                    model.F_QuestionTypefour = new BLL.T_Sys_DictionaryValue().GetModel(cropid)?.F_Name ?? "";//作物名称
+                                    model.F_QuestionTypefourid = cropid;//作物
                                 }
                                 #endregion
                                 #region 修改前
@@ -6736,23 +6764,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.F_TS_Quantity = "";
                     model.F_TS_Level = model1[i].F_TS_Level;//投诉-重要级别：轻微、一般、较大、重大
 
-                    if (model1[i].F_SC_PreliminaryOpinion == "退换货")
+                    //if (model1[i].F_SC_PreliminaryOpinion == "退换货")
+                    //{
+                    List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
+                    if (materlist != null)
                     {
-                        List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
-                        if (materlist != null)
-                        {
-                            model.MaterialItems = materlist;
-                            model.F_ZL_Fquantity = materlist.Sum(x => x.F_ReturnQuantity).ToString();
-                        }
+                        model.MaterialItems = materlist;
+                        model.F_ZL_Fquantity = materlist.Sum(x => x.F_ReturnQuantity).ToString();
                     }
-                    else
-                     model.MaterialItems = null;
-                    model.F_CarNumber= model1[i].F_CarNumber;
+                    //}
+                    //else
+                    // model.MaterialItems = null;
+                    model.F_CarNumber = model1[i].F_CarNumber;
                     model.F_DrivePhone = model1[i].F_DrivePhone;
                     model.F_LoadingFee = model1[i].F_LoadingFee;
                     model.F_UnLoadingFee = model1[i].F_UnLoadingFee;
                     model.F_MaterialFee = model1[i].F_MaterialFee;
-                    model.F_EventReason= model1[i].F_EventReason;  //事件原因-内线
+                    model.F_EventReason = model1[i].F_EventReason;  //事件原因-内线
                     model.F_EventReason2 = model1[i].F_EventReason2;  //事件原因-内线
                     #endregion
                     #region 咨询类
@@ -7930,7 +7958,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     inputs.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
 
                                 }
-                                else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货") //退换货成品库录入物料信息
+                                else if (deptmodel.F_DeptName == "成品库") //退换货成品库录入物料信息
                                 {
                                     if (string.IsNullOrEmpty(jsonstr))
                                     {
@@ -7966,7 +7994,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
 
                                 }
-                                else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货")
+                                else if (deptmodel.F_DeptId == 248)
                                 {
                                     inputs.F_CarNumber = deptment.CarNumber;//返厂车牌号
                                     inputs.F_LoadingFee = deptment.LoadingFee;//装车费
@@ -8160,7 +8188,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //验证信息 
                     if (model != null)
                     {
-                        if (model.F_State != 11 && model.F_State != 10)
+                        if ((model.F_State != 11 && model.F_State != 10)&&(model.F_State2 != 11 && model.F_State2 != 10))
                             return Error("无操作权限！");
                         if (model.F_State == 11 && model.F_VisitResult != "不满意")
                             return Error("非不满意工单不可退回");
@@ -8192,24 +8220,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //{
             //    strsql = $" and F_Type in(2,3)";
             //}
-            var itemlasts = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID} and  F_WoState={(int)EnumWorkOrderState.finish}");
+            var itemlasts1 = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID} and  F_WoState in ({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) and F_OptType={(int)EnumItemOpt.end} and F_Type in(1,3) order by  F_CreateTime desc").FirstOrDefault();
+            var itemlasts2 = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID} and  F_WoState in ({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) and F_OptType={(int)EnumItemOpt.end} and F_Type=2 order by  F_CreateTime desc").FirstOrDefault();
             string creatuser1 = "";
             string creatuser2 = "";
-            if (itemlasts.Count > 0)
+            if (itemlasts1 != null)
             {
-                foreach (var it in itemlasts)
-                {
-                    if (it.F_WoState == 10 && (it.F_Type == 1 || it.F_Type == 3))
-                    {
-                        creatuser1 = it.F_CreateUser;
-                        woflag = Convert.ToInt32(it.F_Type);
-                    }
-                    if (it.F_WoState == 10 && it.F_Type==2 )
-                    {
-                        creatuser2 = it.F_CreateUser;
-                    }
-                }
+                creatuser1 = itemlasts1.F_CreateUser;
+                woflag = Convert.ToInt32(itemlasts1.F_Type);
+
+            }
+            if (itemlasts2 != null)
+            {
+                woflag = Convert.ToInt32(itemlasts2.F_Type);
+                creatuser2 = itemlasts2.F_CreateUser;
             }
+
             var opt = "退回";
             #region 读取当前登录人部门
             string deptname = "";
@@ -8467,7 +8493,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         [Authority]
         public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, string F_Files,
-            int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=1,int inoutflag = 0,string Supercont="")
+            int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=1,int inoutflag = 0,string Supercont="",int opttype=1, string cont2="")
         {
             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
@@ -8547,10 +8573,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                 }
 
-                if (hclid == 0 && hclbm == 0 && isApprovalp != 0)
-                {
-                    return Error("请选择接收部门");
-                }
+                //if (hclid == 0 && hclbm == 0 && isApprovalp != 0)
+                //{
+                //    return Error("请选择接收部门");
+                //}
                 #region 五要素
                 input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
                 input.F_EventReason = deptment.EventReason;// 事件原因
@@ -8574,6 +8600,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
                         }
                     }
+                    var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextUser like '%{ua.F_UserCode}%' and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
                     model.F_Flag = flag;
                     if (flag == 3)
                     {
@@ -8592,8 +8619,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             return Error("请选择接收部门");
                         }
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag,Supercont);
-                        Overorder(ua, model,2,1);
+                        if (opttype == 2) //填写处理结果
+                        {
+                            flag = 3;
+                            DealWO(ua, model, input, cont2, "", 1, "", 1, flag,isApprovalp);
+                        }
+                        else if (opttype == 3) // 待处理状态
+                        {
+                            flag = 3;
+                            modellast.F_Type = 1;
+                            modellast.F_Flag = flag;
+                            modellast.F_NextDept = 0;
+                            itembll.Update(modellast);
+                        }
+                        else //完结工单
+                        {
+                           Overorder(ua, model, 2, 1);
+                        }
+                        model.F_Flag = flag;
+                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
                         //DealWO(ua, model, input, "", "", 1, "", 1, "",flag);
                     }
                     else
@@ -8602,9 +8646,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             return Error("请选择接收部门");
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);
-                        Overorder(ua, model,2,2);
-                        //DealWO(ua, model, input, "", "", 1, "", 2, "",flag);
+                        if (opttype == 2) //填写处理结果
+                        {
+                            flag = 3;
+                            DealWO(ua, model, input, cont2, "", 1, "", 2, flag, isApprovalp);
+                        }
+                        else if (opttype == 3) // 待处理状态
+                        {
+                            flag = 3;                         
+                            modellast.F_Type = 2;
+                            modellast.F_Flag = flag;
+                            modellast.F_NextDept = 0;
+                            itembll.Update(modellast);
+                        }
+                        else //完结工单
+                        {
+                            Overorder(ua, model, 2, 2);
+                        }
+                        model.F_Flag = flag;
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);                               
                     }
                     return Success("转派成功");
                 }
@@ -8687,7 +8747,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     //    }
 
                                     //}
-                                    else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货")
+                                    else if (deptmodel.F_DeptId == 248)
                                     {
                                         input.F_CarNumber = deptment.CarNumber;//返厂车牌号
                                         input.F_LoadingFee = deptment.LoadingFee;//装车费
@@ -8790,7 +8850,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (zflag != 3)
                     {
-                        var modeldpts = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextDept={clbm} and F_Type not in({zflag},3) and F_Flag=3 order by   F_ID desc ").FirstOrDefault();
+                        var modeldpts = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextDept={clbm} and F_Type not in({zflag},3) and F_Flag=3 and F_OptType not in(15,4,5) order by   F_ID desc ").FirstOrDefault();
                         if (modeldpts != null)
                             return Error("不允许同一个部门出现在两条线内,请重新指派！");
                     }
@@ -9216,36 +9276,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (model != null)
                     {
                         int flag = 0;
-                        //string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
-                        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)
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        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 ");
+                        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 (modellist.Count <= 0)
                         {
                             return Error("非接单人不可操作工单");
                         }
-
-                        //if (!string.IsNullOrEmpty(modellist.F_CreateUser))
-                        //{
-                        //    var deptid = sysUserAccountBll.GetModel(modellist.F_CreateUser.ToString())?.F_DeptId;
-                        //    if (markdepts.Contains(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 '%" + modellist.F_CreateUser + "%' order by F_ID desc").FirstOrDefault();
-                        //        if (itemnext!=null && itemnext.F_Flag == 9)
-                        //        {
-                        //            model.F_Flag = 9;
-                        //        }
-                               
-                        //    }
-                        //}
-                        if (inoutflag != 0)
+                        if (markdepts.Contains(ua.F_DeptId.ToString()) && itemnext.F_Flag == 9)
                         {
-                            flag = inoutflag;
+                            if (modellist.Count >= 2)
+                            {
+                                flag = 3;
+                            }
+                            else
+                                return Error("异常退回工单失败！");
                         }
                         else
                         {
-                            flag = Convert.ToInt32(modellist.F_Type);
+                            if (inoutflag != 0)
+                            {
+                                flag = inoutflag;
+                            }
+                            else
+                            {
+                                flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                            }
                         }
-                       
+
                         var res = BackWO(ua, model, cont, type, flag);
                         if (res)
                             return Success("退回成功");
@@ -9291,19 +9349,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }                                                  
                             else
                             {
-                                var modellist = itembll.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 ");
-                                //foreach (var item in modellist)
-                                //{
-                                //    if (item.F_IsUsed==1 )
-                                //        return Error("撤回失败,无法撤回！");
-                                //}
+                                var modellist = itembll.GetModelList($"F_WoID={model.F_ID}  and F_IsUsed=0 and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
+                                
                                 if(modellist.Count<=0)
                                     return Error("撤回失败,无法撤回！");                                               
                                 if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
-                                {
-                                    if (model.F_Flag == 3 && modellist != null && modellist.Count < 2)
-                                        return Error("撤回失败,无法撤回！");
-                                    else if ((model.F_Flag == 1 || model.F_Flag == 2) && modellist != null && modellist.Count < 1)
+                                {                                  
+                                    if (modellist != null && modellist.Count < 2)
                                         return Error("撤回失败,无法撤回！");
                                     flag = 3;
                                 }
@@ -9319,10 +9371,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         }
                                         else if (itemnext!=null && itemnext.F_Flag == 9)
                                         {
-                                            if (model.F_Flag == 3 && modellist != null && modellist.Count < 2)
-                                                return Error("撤回失败,无法撤回！");
-                                            else if ((model.F_Flag == 1 || model.F_Flag == 2) && modellist != null && modellist.Count < 1)
-                                                return Error("撤回失败,无法撤回！");
+                                            if(modellist != null && modellist.Count < 2)
+                                                return Error("撤回失败,无法撤回！");                                          
                                             flag = 3;
                                             model.F_Flag = 9;
                                         }
@@ -9357,7 +9407,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult ReturnvisitOrder(long orderid, string reason, string call, string F_VisitRemarks, int isOver = 0, int sms = 0,int resultscore=0,int effectscore=0,int servicescore=0,int qualityscore=0,int npscore=0)
+        public ActionResult ReturnvisitOrder(long orderid, string reason, string call, string F_VisitRemarks, int isOver = 0, int sms = 0,int resultscore=-1,int effectscore=-1,int servicescore=-1,int qualityscore=-1,int npscore=-1)
         {
             int userId = CurrentUser.UserData.F_UserId;
             string cont = "";
@@ -9376,7 +9426,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         //}
                         decimal evaluationscore = 0;
                         evaluationscore =Convert.ToDecimal(Math.Round((double)(resultscore + effectscore + servicescore + qualityscore)/4,1));//9-10非常满意，7-8满意，5-6一般，5分一下不满意
-                        if (evaluationscore < 5)
+                        if (evaluationscore < 5 && evaluationscore!=-1)
                             cont = "不满意";
                         else if (evaluationscore == 5 || evaluationscore == 6)
                             cont = "一般";
@@ -9384,6 +9434,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             cont = "一般";
                         else if (evaluationscore == 9 || evaluationscore == 10)
                             cont = "非常满意";
+                        else if (evaluationscore==-1)
+                            cont = "未评价";
                         model.F_VisitResultScore = resultscore;
                         model.F_EffectiveScore = effectscore;
                         model.F_ServiceAttitude = servicescore;
@@ -9420,7 +9472,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (model != null)
                     {
                         int flag = 0;
-                        var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_WoID='{model.F_ID }'and F_IsUsed=0 and F_WoState={(int)EnumWorkOrderState.finish} order by F_ID desc").FirstOrDefault();
+                        var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_OptType={(int)EnumItemOpt.end} and F_WoID='{model.F_ID }' and F_WoState in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) order by F_CreateTime desc").FirstOrDefault();                    
                         if (isover == 1)
                         {
                             if (inoutflag > 0)
@@ -9501,9 +9553,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         public bool RemindWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont)
         {
-
-            string strsql = " and F_Type in(1,2)";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "'"+ strsql + " and F_IsUsed=0 order by F_ID desc");
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_IsUsed=0 order by F_ID desc");
             #region 接收人
             int todept = 0; string touser = ""; int flag = 3;
             if (itemlast != null && itemlast.Count > 0)
@@ -9513,10 +9563,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     touser = item.F_NextUser;
                     todept = item.F_NextDept.Value;
                     if (string.IsNullOrWhiteSpace(touser))
-                        touser = item.F_CreateUser;
-                    var usermodel= sysUserAccountBll.GetModel(touser);
-                    if (usermodel != null)
-                        flag = usermodel.F_Flag;
+                        touser = item.F_CreateUser;               
+                     flag = Convert.ToInt32(item.F_Type);
                     #region 读取被催办人部门
                     if (todept == 0 && !string.IsNullOrWhiteSpace(touser))
                     {
@@ -9534,7 +9582,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
                     var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")催办工单，催办说明：" + cont;
-                    long itemid = AddLog(model.F_ID, model.F_State.Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser, model.F_limit, int.Parse(item.F_IsSMS.ToString()),"",0, flag);
+                    long itemid = AddLog(model.F_ID, model.F_State.Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser, model.F_limit, int.Parse(item.F_IsSMS.ToString()),"",0,flag);
                     if (itemid > 0)
                     {
                         if (!string.IsNullOrWhiteSpace(touser))
@@ -9727,6 +9775,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else
                     {
+                        model.F_Flag = 9;
                         model.F_State = wostate;
                         model.F_State2 = wostate;
                     }
@@ -9941,28 +9990,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_WoID='{model.F_ID }' and F_WoState={(int)EnumWorkOrderState.finish}");
+            var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_OptType={(int)EnumItemOpt.end} and F_WoID='{model.F_ID }' and F_WoState in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) order by F_CreateTime desc").FirstOrDefault();
             long nn = 0;
-            if (itemlist.Count > 0)
+            if (itemlist!=null)
             {
-                foreach (var item in itemlist)
-                {
-                    if (item.F_Type == 1 || item.F_Type == 3)
-                    {
-                        model.F_State = wostate;
-                    }
-                    else if (item.F_Type == 2)
-                    {
-                        model.F_State2 = wostate;
-                    }
-                }
-                nn = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
+                model.F_State = wostate;
+                nn = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms,"",0,1);
             }
             else
             {
                 model.F_State = wostate;
                 model.F_State2 = wostate;
-                nn = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
+                nn = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 1);
             }
             //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
             if (nn > 0)
@@ -10042,8 +10081,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
            
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
-                touser = itemlast.F_CreateUser;         
-            var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_WoID='{model.F_ID }' and F_WoState={(int)EnumWorkOrderState.finish}").FirstOrDefault();
+                touser = itemlast.F_CreateUser;
+            //var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_OptType={(int)EnumItemOpt.end} and F_WoID='{model.F_ID }' and F_WoState in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) order by F_CreateTime desc").FirstOrDefault();
             if (flag == 1)
             {
                 model.F_State = wostate;//外线关闭
@@ -10140,7 +10179,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 model.F_DealResult = "已处理";//处理结果
                 opt = "处理完结";
-                optbut = (int)EnumItemOpt.deal;
+                optbut = (int)EnumItemOpt.end;
                 wostate = (int)EnumWorkOrderState.finish;
                 model.F_DealBy = nowUser.F_UserCode;
                 model.F_DealTime = DateTime.Now;
@@ -10630,40 +10669,39 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 touser = users;
             }
             string htouser = "", htousername = "";
-            if (isApprovalp != 0 && nowUser.F_DeptId == 37)
-            {
-                if (hclid != 0)
-                {
-                    Model.T_Sys_UserAccount clus = sysUserAccountBll.GetModel(hclid);
-                    if (clus != null)
-                    {
-                        if (string.IsNullOrEmpty(htouser))
-                        {
-                            htouser = clus.F_UserCode;
-                            htousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
-                        }
-                    }
-                }
-                else
-                {
-                    var list = sysUserAccountBll.GetModelList(" F_DeptId='" + hclbm + "'");
-                    foreach (var l in list)
-                    {
-                        if (string.IsNullOrEmpty(htouser))
-                        {
-                            htouser = l.F_UserCode;
-                            htousername = l.F_UserName + "(" + l.F_WorkNumber + ")";
-                        }
-                        else
-                        {
-                            htouser = htouser + "," + l.F_UserCode;
-                            htousername = htousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
-                        }
-                    }
-                }
-              AddLog(model.F_ID, (int)EnumWorkOrderState.assign, htousername + "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat, 2);
-            }
-
+            //if (isApprovalp != 0 && nowUser.F_DeptId == 37)
+            //{
+            //    if (hclid != 0)
+            //    {
+            //        Model.T_Sys_UserAccount clus = sysUserAccountBll.GetModel(hclid);
+            //        if (clus != null)
+            //        {
+            //            if (string.IsNullOrEmpty(htouser))
+            //            {
+            //                htouser = clus.F_UserCode;
+            //                htousername = clus.F_UserName + "(" + clus.F_WorkNumber + ")";
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        var list = sysUserAccountBll.GetModelList(" F_DeptId='" + hclbm + "'");
+            //        foreach (var l in list)
+            //        {
+            //            if (string.IsNullOrEmpty(htouser))
+            //            {
+            //                htouser = l.F_UserCode;
+            //                htousername = l.F_UserName + "(" + l.F_WorkNumber + ")";
+            //            }
+            //            else
+            //            {
+            //                htouser = htouser + "," + l.F_UserCode;
+            //                htousername = htousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
+            //            }
+            //        }
+            //    }
+            //    AddLog(model.F_ID, (int)EnumWorkOrderState.assign, htousername + "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, overtime, sms, creat, 2);
+            //}
             #region 财务审核后，填单人员可以收到到账提醒（短信到账提醒）20220217
             if (nowUser.F_DeptId == 260)
             {
@@ -10679,7 +10717,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #region 工单处理
             var opt = "指派";
             int optbut = (int)EnumItemOpt.assign;
-            int wostate = (int)EnumWorkOrderState.assign;//已指派待接单
+            int wostate = (int)EnumWorkOrderState.assign;//已指派待接单         
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);