更新

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AnnotationController.cs

     public class AnnotationController : BaseController
     {
         // GET: Annotation
-        public ActionResult GetList()
+        public ActionResult GetList(int woid)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             string sql = " ";
+            int recordCount = 0;
             DataTable dt = new DataTable();
-
-            string strpageindex = RequestString.GetQueryString("page");
-            int pageindex = 1;
-            string strpagesize = RequestString.GetQueryString("pagesize");
-            int pagesize = 10;
-            if (strpageindex.Trim() != "")
+            if (woid > 0)
             {
-                pageindex = Convert.ToInt32(strpageindex);
-            }
+                sql = $" and F_Wocode={woid}";
+                string strpageindex = RequestString.GetQueryString("page");
+                int pageindex = 1;
+                string strpagesize = RequestString.GetQueryString("pagesize");
+                int pagesize = 10;
+                if (strpageindex.Trim() != "")
+                {
+                    pageindex = Convert.ToInt32(strpageindex);
+                }
 
-            if (strpagesize.Trim() != "")
-            {
-                pagesize = Convert.ToInt32(strpagesize);
+                if (strpagesize.Trim() != "")
+                {
+                    pagesize = Convert.ToInt32(strpagesize);
+                }
+                dt = BLL.PagerBLL.GetListPager(
+                    "T_Wo_AnnotationTab",
+                    "F_Id",
+                    "*",
+                    sql,
+                    "ORDER BY F_Id desc",
+                    pagesize,
+                    pageindex,
+                    true,
+                    out recordCount);
+            
             }
-            int recordCount = 0;
-            dt = BLL.PagerBLL.GetListPager(
-                "T_Wo_AnnotationTab",
-                "F_Id",
-                "*",
-                sql,
-                "ORDER BY F_Id desc",
-                pagesize,
-                pageindex,
-                true,
-                out recordCount);
-
             var obj = new
             {
                 state = "success",
                 total = recordCount
             };
 
-            res = Content(obj.ToJson());
-
-            return res;
+            return Content(obj.ToJson());
         }
         /// <summary>
         /// 获取详情
                     {
                         int id = RequestString.GetInt("id", 0);
                         string contents = RequestString.GetFormString("contents");
-                        string wocode = RequestString.GetFormString("wocodes");
+                        string wocode = RequestString.GetFormString("woid");
 
 
 

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

                                     sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                                     if (!string.IsNullOrEmpty(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) + ")))";
-                                        }
+                                      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
                                     {
                     else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                     {
                         string markdepts = "37,57,74,88,268,422,339";
-                        string qualdepts = "12,36,295";
+                        string qualdepts = "12,36,295,245";
                         string detpid = "" + ua.F_DeptId;
                         var deparmentlist = new List<Model.T_Sys_Department>();
                         Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
                             sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                             if (!string.IsNullOrEmpty(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) + ")))";
-                                }
+                                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
                             {
                         {
 
                             string markdepts = "37,57,74,88,268,422,339";
-                            string qualdepts = "12,36,295";
+                            string qualdepts = "12,36,295,245";
                             string detpid = "" + ua.F_DeptId;
                             var deparmentlist = new List<Model.T_Sys_Department>();
                             Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
                                 if (userlist.Count > 0)
                                 {
                                     if (flag == 1)
-                                       
-                                    contens = $" 修改注解,工单编号" + model.F_WorkOrderCode;
+                                        contens = $" 修改注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>" + model.F_WorkOrderCode + "</a>";
+
+                                    //< span class="top_notices_con">系统维护管理员 修改注解, 工单编号 20220527152927398</span>
                                     else
-                                        contens =$" 附加注解,工单编号" + model.F_WorkOrderCode; 
+                                        contens = $" 附加注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>" + model.F_WorkOrderCode + "</a>";
                                     foreach (var item in userlist)
                                     {
                                         touser = item.F_UserCode; ;
                                         msg.Type = (int)Model.MSGType.Annotation;
                                         msg.ToUser = touser;
                                         msg.ToID = (int)model.F_ID;
-                                        msg.Detail = ua.F_UserName + contens;
+                                        msg.Detail = $"<span class='top_notices_con'> " + ua.F_UserName + contens + "</span>";
                                         msg.State = 0;
                                         msg.IsDel = 0;
                                         msg.CreateDate = DateTime.Now;
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     if (model != null)
                     {
-                        var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
-                        if (itemlast!=null )
-                         sms = (int)itemlast.F_IsSMS;
+                        //var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
+                        //if (itemlast!=null )
+                        // sms = (int)itemlast.F_IsSMS;
                         var res = Approval(OpenId, orderid, AuditCont, ua, model, overtime, sms, IsAudit, AuditState);
                         if (res)
                             return Success("审核成功");
             string deptmodelsname = "";
             int wostate = 0;
             var toussers = "";
+            int woflag = 0;
             #region 上报
             if (IsAudit != 0)
             {
                             if (userid <= 0 || !res)
                                 res = false;
                             wostate = 1;
+                            woflag = 9;
                         }
                         else if (AuditState == 1)
                         {
             if (res)
             {
                 model.F_State = wostate;
-                model.F_State2 = wostate;
+                if (woflag == 9)
+                {
+                    model.F_State2 = 0;
+                }
+                else
+                {
+                    model.F_State2 = wostate;
+                }
+                model.F_Flag = woflag;
                 //处理内容
                 if (!string.IsNullOrEmpty(AuditCont))
                     model.F_AuditCont += AuditCont + "；";
                 deptname = deptmodel1.F_DeptName;
             }
             int isbl = 0;
+            int flag = 9;
             Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
             //if (dapt != 0)
             //{
                 isbl = 1;
                 nextda = 37;
                 opt = "流转市场管理科";
-                nextda2 = 36;
-                opt2 = "流转质量管理科";
+                //nextda2 = 36;
+                //opt2 = "流转质量管理科";
+                //flag = 3;
             }
             else if (CirculMarket(ua.F_DeptId, 14))
             {
                 isbl = 1;
                 nextda = 74;
                 opt = "流转策划推广";
+                //nextda2 = 245;
+                //opt2 = "流转质量督察处";
+                //flag = 3;
             }
             else if (CirculMarket(ua.F_DeptId, 16))
             {
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理已审批:" + AuditCont + "," + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
+                    //}
                 }
                 else
                 {
                     cont = "分公司经理已审批:" + AuditCont + "," + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
+                    //}
                 }
             }
             else
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理未审批" + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "大区经理未审批" + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "大区经理未审批" + opt2;
+                    //}
                 }
                 else
                 {
                     cont = "分公司经理未审批" + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "分公司经理未审批" + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "分公司经理未审批" + opt2;
+                    //}
                 }
             }
-            if (nextda != 0 || nextda2 != 0)
+            if (nextda != 0)
             {
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl);
-                if (nextda2 != 0)
-                {
-                    var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl,2);
-                }
-                return true;
+                model.F_Flag = 9;
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl,3,9);          
+                return res;
             }
             else return false;
         }
                     list.Add(model);
                 }
                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " ");
-                ; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+                //; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+                //if (!string.IsNullOrEmpty(model.F_Files))
+                //{
+                //    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                //}
                 if (!string.IsNullOrEmpty(model.F_Files))
                 {
-                    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                    var configfj = "http://192.168.8.9:1005/Upload/APP/2022/06/22/";
+                    FileUrl = GetFileData(model.F_Files, configfj);
                 }
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
                 if (model.F_Source != "3")
         /// <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 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)
         {
 
             if (!string.IsNullOrEmpty(OpenId))
                      sms = (int)itemlast.F_IsSMS;
                 }
                 WorkOrderNewInput input = new WorkOrderNewInput();
-
+                string markdepts = "37,57,74,88,268,422,339";
+                string qualdepts = "12,36,295,245";
                 if (ua != null)
                 {
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                     {
                         return Error("请选择接收部门");
                     }
-                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                    if (markdepts.Contains(ua.F_DeptId.ToString()))
                     {
+                        if (markdepts.Contains(ua.F_DeptId.ToString()))
+                        {
+                            if (model.F_Type == "2" || model.F_Type == "5")
+                            {
+                                input.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
+                                input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
+                            }
+                            else if (model.F_Type == "3")
+                            {
+                                input.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
+                                input.F_SC_CJ_SelfResult = deptment.SelfResult;//市场管理科-抽检-自检结果
+                                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)
+                        {
+                            if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
+                            {
+                                return Error("请选择接收部门");
+
+                            }
+                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag);
+                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
+
+                        }
+                        else if (flag == 2)
+                        {
+                            if (clbm2 == 0 && clid2 == 0)
+                            {
+                                return Error("请选择接收部门");
+                            }
+                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
+                            DealWO(ua, model,"", input, cont, 1, "", 1,"", flag);
+                        }
+                        else
+                        {
+                            if (clbm == 0 && clid == 0)
+                            {
+                                return Error("请选择接收部门");
+                            }
+                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag);
+                            DealWO(ua, model, "", input, cont, 1, "", 2, "", flag);
+                        }
+                        return Success("转派成功");
                     }
                     else
                     {
                                 return Error("请选择接收部门");
                             }
                         }
-                    }
-
-                    if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
-                    {
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2);
-                        if (res && res1)
-                        {
-                            return Success("转派成功");
-                        }
-                        else
-                            return Error("转派失败！");
-                    }
-                    else
-                    {
                         var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, ua.F_Flag);
                         if (res)
                         {
                         }
                         else
                             return Error("转派失败！");
-                    }
+                    }             
 
                 }
             }
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int  isbl=0, int flag = 1)
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int  isbl=0, int flag = 1, int flagstate = 0)
         {
 
             if (model.F_limit > 0)
                         if (model != null)
                         {
                             string markdepts = "37,57,74,88,268,422,339";
-                            string qualdepts = "12,36,295";
+                            string qualdepts = "12,36,295,245";
                             string strsql = "";
                             if (ua.F_Flag == 1)
                             {
         {
             #region 工单处理
             int sms = 0;
+            string markdepts = "37,57,74,88,268,422,339";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
                 strsql = "";
             }
 
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'" + strsql + " order by F_ID desc");
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_CreateUser='" + nowUser.F_UserCode + "' order by F_ID desc");
             if (itemlast != null && itemlast.Count > 0)
             {
+                if (markdepts.Contains(nowUser.F_DeptId.ToString()))
+                {
+                    var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + nowUser.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                    if (itemlast.Count == 2 || itemnext.F_Flag == 9)
+                    {
+                        flag = 3;
+                        model.F_Flag = 9;
+                    }
+                }
                 foreach (var item in itemlast)
                 {
                     touser = item.F_NextUser;
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string F_Files, WorkOrderNewInput input, string cont, int isover = 0, string uncont = "",int flag=1, string eventreason = "")
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string F_Files, WorkOrderNewInput input, string cont, int isover = 0, string uncont = "",int flag=1, string eventreason = "", int flagstate = 0)
         {
             #region 工单处理
             int sms = 0;
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
-            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag);
+            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag, flagstate);
             if (itemid > 0)
             {
                 #region 处理工单
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, float overtime, int sms, string create = "", int F_IsUsed = 0, int flag = 3)
+        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, float overtime, int sms, string create = "", int F_IsUsed = 0, int flag = 3,int flagstate = 0)
         {
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
             #region 
             itemModel.F_IsUsed = F_IsUsed;
             itemModel.F_LimitTime = overtime.ToString();
             itemModel.F_Type = flag;//区分内外线和公共部门
+            if (flagstate != 0)
+                itemModel.F_Flag = flagstate;
+            else
+                itemModel.F_Flag = new BLL.T_Wo_WorkOrder().GetModel(woid).F_Flag;
             if (nowUser != null)
             {
                 itemModel.F_CreateUser = nowUser.F_UserCode;

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

                         //sql += $" and (F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.revoke + ")" + " " + uwhere;
                         sql += $" and (F_State in(" + (int)EnumWorkOrderState.neworder + ")" + " " + uwhere;
                         //    sql +=  "and T_Wo_WorkOrder.F_ID in (" + GetBackWorkOrderID(ua.F_UserCode) + ") ";
-                        if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode, 1)))
+                        if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                         {
                             sql += $" or (F_State={(int)EnumWorkOrderState.assign} and F_State2={(int)EnumWorkOrderState.assign} and  T_Wo_WorkOrder.F_ID in ({GetRevokeWo(ua.F_UserCode, 1)}))";
                             sql += $" or (F_State={(int)EnumWorkOrderState.assign} and F_Flag=1  and  T_Wo_WorkOrder.F_ID in ({GetRevokeWo(ua.F_UserCode)}))";
                             sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                             if (!string.IsNullOrEmpty(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) + ")))";
-                                }
+                                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
                             {
                             return Success("无操作权限"); ;
                         }
                         //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" +"1" +"' "+ uwhere; ;
-                        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 6://已回访
-                        sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
+                        sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate+ " or F_State2="+ (int)EnumWorkOrderState.evaluate + ")";
                         sql += $" and F_IsVisit=" + 1; ;
                         sql += $" and F_VisitBy !=''";
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                         {
                             return Success("无操作权限"); ;
                         }
-                        sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
+                        //sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
                         break;
                     case 7://待完结
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                         {
                             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)"; ;
                         //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or  F_Type = 3)"; ;
                         break;
                     case 8://待审批
                         {
                             return Success("无操作权限"); ;
                         }
-                        sql += $" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
+                        sql += $" and (F_State in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}) or F_State2 in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}))"; 
                         break;
                     case 20: //抄送工单列表
                         if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                                 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) + ")))";
-                                    }
+                                    //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
                                 {
                             {
                                 RV_awaitVist = 0;
                                 break;
-                            }
-                            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; ;
                             //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
                             RV_awaitVist = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待回访
 
                         case 6://已回访
                             sql = "";
                             sql += $"  F_IsDelete=0";
-
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
                             {
                                 sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
-                                sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
+                                sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate+" or F_State2 = " + (int)EnumWorkOrderState.evaluate+")" ;
                             }
                             else if (ro.F_RoleCode == "XTGLY")
                             {
                                 uwhere = ""; ;
+                                sql += $" and (F_State=" + (int)EnumWorkOrderState.evaluate + " or F_State2 = " + (int)EnumWorkOrderState.evaluate + ")";
                             }
                             else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
                             {
                                 RV_haveVisit = 0;
                                 break;
                             }
-                            string where = $" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
-                            RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(sql + where).Count;//
+                            string where = $"F_IsDelete=0 and (F_State in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}) or F_State2 in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.evaluate}))"; ;
+                            RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(where).Count;//
                             sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
                             sql += $" and F_IsVisit=" + 1; ;
                             sql += $" and F_VisitBy !=''";
                                 DWJ = 0;
                                 break; ;
                             }
-                            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)"; ;
                             //sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and ( F_IsVisit = '" + "0" + "' or  F_Type = 3) "; ;
                             DWJ = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待完结
                             break;
                             {
 
                                 string markdepts = "37,57,74,88,268,422,339";
-                                string qualdepts = "12,36,295";
+                                string qualdepts = "12,36,295,245";
                                 string detpid = "" + ua.F_DeptId;
                                 var deparmentlist = new List<Model.T_Sys_Department>();
                                 Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
             string deptmodelsname = "";
             int wostate = 0;
             var toussers = "";
+            int woflag = 0;
             //  var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             //    if (itemlast != null)
             // toussers = itemlast.F_CreateUser;
                             if (userid <= 0 || !res)
                                 res = false;
                             wostate = 1;
+                            woflag = 9;
                         }
                         else if (AuditState == 1)
                         {
             if (res)
             {
                 model.F_State = wostate;
-                model.F_State2 = wostate;
+                if (woflag == 9)
+                {
+                    model.F_State2 = 0;
+                }
+                else
+                {
+                    model.F_State2 = wostate;
+                }
+                model.F_Flag = woflag;
                 //处理内容
                 if (!string.IsNullOrEmpty(AuditCont))
                     model.F_AuditCont += AuditCont + "；";
                 deptname = deptmodel1.F_DeptName;
             }
             int isbl = 0;
+            int flag = 9;
             Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
             //if (dapt != 0)
             //{
                 isbl = 1;
                 nextda = 37;
                 opt = "流转市场管理科";
-                nextda2 = 36;
-                opt2 = "流转质量管理科";
+                //nextda2 = 36;
+                //opt2 = "流转质量管理科";
+                //flag = 3;
             }
             else if (CirculMarket(ua.F_DeptId, 14))
             {
                 isbl = 1;
                 nextda = 74;
                 opt = "流转策划推广";
+                //nextda2 = 245;
+                //opt2 = "流转质量督察处";
+                //flag = 3;
             }
             else if (CirculMarket(ua.F_DeptId, 16))
             {
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理已审批:" + AuditCont + "," + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
+                    //}
                 }
                 else
                 {
                     cont = "分公司经理已审批:" + AuditCont + "," + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
+                    //}
                 }
             }
             else
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理未审批" + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "大区经理未审批" + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "大区经理未审批" + opt2;
+                    //}
                 }
                 else
                 {
                     cont = "分公司经理未审批" + opt;
-                    if (!string.IsNullOrEmpty(opt2))
-                    {
-                        cont2 = "分公司经理未审批" + opt2;
-                    }
+                    //if (!string.IsNullOrEmpty(opt2))
+                    //{
+                    //    cont2 = "分公司经理未审批" + opt2;
+                    //}
                 }
             }
-            if (nextda != 0 || nextda2 != 0)
+            if (nextda != 0)
             {
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl);
-                if (nextda2 != 0)
-                {
-                    var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
-                }
-                //else
+                //if (flag == 1)
                 //{
-
+                //    model.F_State2 = (int)EnumWorkOrderState.finish;
+                //    model.F_Flag = 1;
                 //}
-                return true;
+                model.F_Flag = 9;
+                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl,3,9);
+                //if (nextda2 != 0)
+                //{
+                //    model.F_Flag = 3;
+                //    var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
+                //}
+                return res;
+            }
+            else
+            {
+                return false;
             }
-            else return false;
 
         }
         /// <summary>
                     list.Add(model);
                 }
                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " and  F_Type=" + ua.F_Flag + " ");
-                ; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
-                FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                //var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
+                //FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                var configfj = "http://192.168.8.9:1005/";
+                FileUrl = GetFileData(model.F_Files, configfj);
                 if (list.Count > 0)
                 {
                     List<WorkOrderNewInput> Input = modeltooip(list);
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                 {
                     string markdepts = "37,57,74,88,268,422,339";
-                    string qualdepts = "12,36,295";
+                    string qualdepts = "12,36,295,245";
                     string detpid = "" + ua.F_DeptId;
                     var deparmentlist = new List<Model.T_Sys_Department>();
                     Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
                     }
                     else if (model1[i].F_State == 11)
                     {
-                        model.F_StateName = "已回访";
+                        model.F_StateName = "外线已完结";
                     }
                     else if (model1[i].F_State == 12)
                     {
                     }
                     else if (model1[i].F_State2 == 11)
                     {
-                        model.F_StateName2 = "已回访";
+                        model.F_StateName2 = "内线已完结";
                     }
                     else if (model1[i].F_State2 == 12)
                     {
                     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 未指派工单
+
+
 
                     if (ua != null)
                     {
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, float overtime, int sms, string create = "", int F_IsUsed = 0, int flag = 3)
+        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser, float overtime, int sms, string create = "", int F_IsUsed = 0, int flag = 3,int flagstate=0)
         {
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
             #region 
             string strsql = "";
+            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} and F_Type in({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}%')" 
-                       + $" and F_Type in({flag},3)";
+                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}" ;
             }
             //处理当前工单的记录之前的记录过期
             //var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
             itemModel.F_IsUsed = F_IsUsed;
             itemModel.F_LimitTime = overtime.ToString();
             itemModel.F_Type = flag;//区分内外线和公共部门
+            if (flagstate != 0)
+                itemModel.F_Flag = flagstate;
+            else
+                itemModel.F_Flag = new BLL.T_Wo_WorkOrder().GetModel(woid).F_Flag;
             if (create != "")
             {
                 itemModel.F_CreateTime = DateTime.Parse(create);
                     {
                         if (flag == 3)
                         {
-                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
-                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2);
+                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,0,0,0,"",0,1,flag);
+                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
                         }
                         else if (flag == 2)
                         {
-                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2);
-                            DealWO(ua, modlelist, input, cont, "", 1, "", 1, "");
+                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
+                            DealWO(ua, modlelist, input, cont, "", 1, "", 1, "",flag);
                         }
                         else
                         {
-                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
-                            DealWO(ua, modlelist, input, cont, "", 1, "", 2, "");
+                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,flag);
+                            DealWO(ua, modlelist, input, cont, "", 1, "", 2, "",flag);
 
                         }
                         return Success("转派成功");
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
                                 if (userlist.Count > 0)
                                 {
                                     if (flag == 1)
-                                        contens = $" 修改注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>"+ model.F_WorkOrderCode +"</a>" ;
+                                        contens = $" 修改注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>" + model.F_WorkOrderCode + "</a>";
 
                                     //< span class="top_notices_con">系统维护管理员 修改注解, 工单编号 20220527152927398</span>
                                     else
-                                        contens = $" 附加注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>"+ model.F_WorkOrderCode + "</a>";
+                                        contens = $" 附加注解,工单编号 <a href='./WorkOrder/commonHtml/orderDetails.html?oid={model.F_ID}'>" + model.F_WorkOrderCode + "</a>";
                                     foreach (var item in userlist)
                                     {
                                         touser = item.F_UserCode; ;
                                         msg.Type = (int)Model.MSGType.Annotation;
                                         msg.ToUser = touser;
                                         msg.ToID = (int)model.F_ID;
-                                        msg.Detail = $"<span class='top_notices_con'> "+ua.F_UserName + contens+ "</span>";
+                                        msg.Detail = $"<span class='top_notices_con'> " + ua.F_UserName + contens + "</span>";
                                         msg.State = 0;
                                         msg.IsDel = 0;
                                         msg.CreateDate = DateTime.Now;
         {
             #region 工单处理
             int sms = 0;
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
-            string creatuser = "";
+            int woflag = model.F_Flag;
+            string strsql = "";
+            if (woflag == 1)
+            {
+                strsql = $" and F_Type in(1,3)";
+            }
+            else if (woflag == 2)
+            {
+                strsql = $" and F_Type in(2,3)";
+            }
+            var itemlasts = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID}");
+            string creatuser1 = "";
+            string creatuser2 = "";
             if (itemlasts.Count > 0)
             {
                 foreach (var it in itemlasts)
                 {
-                    if (it.F_WoState == 10)
+                    if (it.F_WoState == 10 && it.F_Type == 1 && (it.F_Flag == 1 || it.F_Flag == 3))
+                    {
+                        creatuser1 = it.F_CreateUser;
+                    }
+                    if (it.F_WoState == 10 && it.F_Type==2 && (it.F_Flag == 2 || it.F_Flag == 3))
                     {
-                        creatuser = it.F_CreateUser;
+                        creatuser2 = it.F_CreateUser;
                     }
                 }
             }
             #endregion
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
-            int deptid = 0;
-            var touser = new BLL.T_Sys_UserAccount().GetModel(creatuser);
-            if (touser != null)
+            int deptid1 = 0;
+            int deptid2 = 0;
+            var touser1 = new BLL.T_Sys_UserAccount().GetModel(creatuser1);
+            if (touser1 != null)
             {
-                deptid = touser.F_DeptId;
+                deptid1 = touser1.F_DeptId;
             }
-            string smscont = "";
+            if (!string.IsNullOrEmpty(creatuser2))
+                deptid2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2)?.F_DeptId ?? 0;
 
+            string smscont = "";
 
-            var itemid = AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser, deptid, nowUser, model.F_limit, sms);
-            if (itemid > 0)
+            if (deptid1 > 0)
+                AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser1, deptid1, nowUser, model.F_limit, sms, "", 0, 1);
+            if (deptid2 > 0)
+                AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser2, deptid2, nowUser, model.F_limit, sms, "", 0, 2);
+            //if (itemid > 0)
+            //{
+            if (model.F_Type == "1")
             {
-                if (model.F_Type == "1")
-                {
-                    smscont = "咨询";
-                }
-                else if (model.F_Type == "2")
-                {
-                    smscont = "投诉";
-                }
-                else if (model.F_Type == "3")
-                {
-                    smscont = "抽检";
-                }
-                else if (model.F_Type == "5")
-                {
-                    smscont = "业务协办";
-                }
-                else
+                smscont = "咨询";
+            }
+            else if (model.F_Type == "2")
+            {
+                smscont = "投诉";
+            }
+            else if (model.F_Type == "3")
+            {
+                smscont = "抽检";
+            }
+            else if (model.F_Type == "5")
+            {
+                smscont = "业务协办";
+            }
+            else
+            {
+                smscont = "建议";
+            }
+            string[] mag = { smscont };
+            string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
+            if (touser1 != null)
+            {
+                if (!string.IsNullOrEmpty(touser1.F_Mobile))
                 {
-                    smscont = "建议";
+
+                    SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser1.F_Mobile.Trim());
+                    bool n = new SMSController().AddSmS(touser1.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
                 }
-                string[] mag = { smscont };
-                string smsmsg = "您好，您有一条新的" + smscont + "工单，请及时接单处理！";
-                if (touser != null)
+            }
+            if (deptid2 > 0)
+            {
+                var touser2 = new BLL.T_Sys_UserAccount().GetModel(creatuser2);
+                if (!string.IsNullOrEmpty(touser2.F_Mobile))
                 {
-                    if (!string.IsNullOrEmpty(touser.F_Mobile))
-                    {
 
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser.F_Mobile.Trim());
-                        bool n = new SMSController().AddSmS(touser.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
-                    }
+                    SmsSingleSenderResult result = new SMSController().SMSSingleshot(445305, mag, touser2.F_Mobile.Trim());
+                    bool n = new SMSController().AddSmS(touser2.F_Mobile.Trim(), smsmsg, nowUser.F_UserId);
                 }
+            }
 
-                #region 处理工单
+            #region 处理工单
+            if (!string.IsNullOrEmpty(creatuser1))
+            {
                 model.F_State = 2;
-                workOrder.Update(model);
-                #endregion
-                #region 推送消息
-                #region 向上一级操作人员推送消息
-                #endregion
-                #endregion
-                return true;
             }
-            else
-                return false;
+            if (!string.IsNullOrEmpty(creatuser2))
+            {
+                model.F_State2 = 2;
+            }
+            workOrder.Update(model);
+            #endregion
+            #region 推送消息
+            #region 向上一级操作人员推送消息
+            #endregion
+            #endregion
+            return true;
+            //}
+            //else
+            //    return false;
             #endregion
         }
         /// <summary>
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
+        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 userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
+            string markdepts = "37,57,74,88,268,422,339";
+            string qualdepts = "12,36,295,245";
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 {
                     return Error("请选择接收部门");
                 }
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" || markdepts.Contains(ua.F_DeptId.ToString()))
                 {
+                    if (markdepts.Contains(ua.F_DeptId.ToString()))
+                    {
+                        if (model.F_Type == "2" || model.F_Type == "5")
+                        {
+                            input.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
+                            input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
+                        }
+                        else if (model.F_Type == "3")
+                        {
+                            input.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
+                            input.F_SC_CJ_SelfResult = deptment.SelfResult;//市场管理科-抽检-自检结果
+                            input.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
+                            input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
+                        }
+                    }
                     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);
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2);
+                        }
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
+                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
 
                     }
                     else if (flag == 2)
                         {
                             return Error("请选择接收部门");
                         }
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2);
-                        DealWO(ua, model, input, cont, "", 1, "", 1, "");
+                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
+                        DealWO(ua, model, input, cont, "", 1, "", 1, "",flag);
                     }
                     else
                     {
                         {
                             return Error("请选择接收部门");
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
-                        DealWO(ua, model, input, cont, "", 1, "", 2, "");
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
+                        DealWO(ua, model, input, cont, "", 1, "", 2, "",flag);
                     }
                     return Success("转派成功");
                 }
                         {
                             if (model != null)
                             {
-                                if (deptmodel.F_DeptId == 12 || deptmodel.F_DeptId == 36)
+                                if (qualdepts.Contains(ua.F_DeptId.ToString()))
                                 {
                                     input.F_WorkmanShip = deptment.WorkmanShip;//质量管理科-工艺
                                     input.F_Manufacturers = deptment.Manufacturers;//质量管理科-原料及厂家
                                     input.F_ProductionNum = deptment.ProductionNum;//质量管理科-该批次生产数量
                                 }
-                                if (model.F_Type == "2" || model.F_Type=="5")
+                                if (model.F_Type == "2" || model.F_Type == "5")
                                 {
-                                    if (deptmodel.F_DeptId == 37)
+                                    if (markdepts.Contains(ua.F_DeptId.ToString()))
                                     {
                                         // input. F_SC_QualityMonth = QualityMonth;//市场管理科-超出质保期限
                                         input.F_SC_PreliminaryOpinion = deptment.PreliminaryOpinion;//市场管理科-初审意见:退货、换货、补偿、自行处理
                                     }
-                                    else if (deptmodel.F_DeptId == 12 || deptmodel.F_DeptId == 36)
+                                    else if (qualdepts.Contains(ua.F_DeptId.ToString()))
                                     {
-                                        input.F_IsVisit = isvisit.ToString();
+                                        //input.F_IsVisit = isvisit.ToString();
                                         input.F_ZL_QualityEventLevel = deptment.QualityEventLevel;//质量管理科-质量事件等级（未遂、一般、较大、重大）
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         input.F_ZL_ApprovalOpinions = deptment.ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
                                         //input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
 
                                     }
-                                   else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货") //退换货成品库录入物料信息
+                                    else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货") //退换货成品库录入物料信息
                                     {
                                         //if (string.IsNullOrEmpty(jsonstr))
                                         //{
                                                     itemodel.F_MaterialCode = item.materialcode;
                                                     itemodel.F_MaterialName = item.materialname;
                                                     itemodel.F_Formula = item.formula;
-                                                    itemodel.F_ReturnQuantity = item.returnum??0;
+                                                    itemodel.F_ReturnQuantity = item.returnum ?? 0;
                                                     itemodel.F_WoID = model.F_ID;//工单id
                                                     itemodel.F_CreateOn = DateTime.Now;
                                                     itemodel.F_Remark = item.specs;//规格
                                         }
 
                                     }
-                                    else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货" )
+                                    else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货")
                                     {
                                         input.F_CarNumber = deptment.CarNumber;//返厂车牌号
-                                        input.F_LoadingFee= deptment.LoadingFee;//装车费
+                                        input.F_LoadingFee = deptment.LoadingFee;//装车费
                                         input.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
                                         input.F_MaterialFee = deptment.MaterialFee;//返料费
                                         input.F_DrivePhone = deptment.DrivePhone;//电话号码
                                 }
                                 else if (model.F_Type == "3")
                                 {
-                                    if (deptmodel.F_DeptId == 37)
+                                    if (markdepts.Contains(ua.F_DeptId.ToString()))
                                     {
 
                                         input.F_SC_CJ_SpotResult = deptment.SpotResult;//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
                                         input.F_SC_CJ_ApprovalNo = deptment.ApprovalNo;//市场管理科-抽检-对应审批工作流单号
                                         input.F_SC_CJ_ReturnAccount = deptment.ReturnAccount;//市场管理科-抽检-确认返账金额
                                     }
-                                    else if (deptmodel.F_DeptId == 12 || deptmodel.F_DeptId == 36)
+                                    else if(qualdepts.Contains(ua.F_DeptId.ToString()))
                                     {
-                                        input.F_IsVisit = isvisit.ToString();
+                                        //input.F_IsVisit = isvisit.ToString();
                                         input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                     }
                                 input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
                                 //input.F_EventReason = deptment.EventReason;// 事件原因
                                 input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;// 改进要求
+                                input.F_IsVisit = isvisit.ToString();
 
                             }
                             #region nouser
         {
             #region 工单处理
             int sms = 0;
+            string markdepts = "37,57,74,88,268,422,339";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
                 strsql = "";
             }
 
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'"+strsql+" order by F_ID desc");
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_CreateUser='"+nowUser.F_UserCode+"' order by F_ID desc");         
             if (itemlast != null && itemlast.Count>0)
-            {
+            {            
+                if (markdepts.Contains(nowUser.F_DeptId.ToString()))
+                {
+                    var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + nowUser.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                    if (itemlast.Count == 2 || itemnext.F_Flag == 9)
+                    {
+                        flag = 3;
+                        model.F_Flag = 9;
+                    }                                              
+                }
                 foreach (var item in itemlast)
                 {
                     touser = item.F_NextUser;
             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 itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
-            if (itemid > 0)
+            var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_WoID='{model.F_ID }' and F_WoState={(int)EnumWorkOrderState.finish}");
+            if (itemlist.Count > 0)
+            {
+                foreach (var item in itemlist)
+                {
+                    if (item.F_Type == 1)
+                    {
+                        model.F_State = wostate;
+                    }
+                    else if (item.F_Type == 2)
+                    {
+                        model.F_State2 = wostate;
+                    }
+                }
+                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
+            }
+            //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
+            if (itemlist.Count > 0)
             {
                 #region 处理工单
-                model.F_State = wostate;
-                model.F_State2 = wostate;
+                //model.F_State = wostate;
+                //model.F_State2 = wostate;
                 model.F_VisitOn = DateTime.Now;
                 model.F_VisitResult = cont;
                 model.F_VisitBy = nowUser.F_UserCode;
                 #region 向上一级操作人员推送消息
                 if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
                 {//排除上一级指派人是自己
-                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
+                    sendsysmsg(model, nowUser, touser, 0, opt);
                     var lastUser = sysUserAccountBll.GetModel(touser);
                     //if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
                     //    sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
             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 itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
-            if (itemid > 0)
+            var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_WoID='{model.F_ID }' and F_WoState={(int)EnumWorkOrderState.finish}");
+            if (itemlist.Count > 0)
+            {
+                foreach (var item in itemlist)
+                {
+                    if (item.F_Type == 1 && model.F_State!=(int)EnumWorkOrderState.evaluate)
+                    {
+                        model.F_State = wostate;
+                        AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 1);
+                    }
+                    else if (item.F_Type == 2 && model.F_State2 != (int)EnumWorkOrderState.evaluate)
+                    {
+                        model.F_State2 = wostate;
+                        AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 2);
+                    }
+                }
+            }
+            //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
+            if (itemlist.Count > 0)
             {
                 #region 处理工单
                 model.F_VisitOn = DateTime.Now;
-                model.F_State = wostate;
-                model.F_State2 = wostate;
+                //model.F_State = wostate;
+                //model.F_State2 = wostate;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息
                 #region 向上一级操作人员推送消息
                 if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
                 {//排除上一级指派人是自己
-                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
+                    sendsysmsg(model, nowUser, touser, 0, opt);
                     // var lastUser = sysUserAccountBll.GetModel(touser);
                     //if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
                     //    sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int isover = 0, string uncont = "", int flag = 1,string eventreason="")
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int isover = 0, string uncont = "", int flag = 1,string eventreason="",int flagstate=0)
         {
             #region 工单处理
             int sms = 0;
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
-            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag);
+            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag, flagstate);
             if (itemid > 0)
             {
                 #region 处理工单
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "", int isbl = 0, int flag = 1)
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "", int isbl = 0, int flag = 1,int flagstate=0)
         {
             #region 系统升级派单时限可修改2021/12/24
             //if (model.F_limit > 0)
             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 处理工单

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

         audit,
         [Description("已撤回待指派")]
         revoke,
+        [Description("暂存工单")]
+        storage,
     }
     /// <summary>
     /// 工单记录类型枚举

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

         /// </summary>
         public string SuperiorOpinion2 { get; set; }
 
+        public int F_Flag { get; set; }
+
         #region 多物料
         public List<T_Wo_MaterialItems> MaterialItems { get; set; }
         #endregion

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

         /// </summary>
         public string F_EventReason2 { get; set; }
         /// <summary>
-        /// 1单线外2单线内3双线
+        /// 1单线外2单线内3双线9市场科可以双线指派工单
         /// </summary>
         public int F_Flag { get; set; }
 

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
-using CallCenterApi.DB;
 using System.Collections.Generic;
 
 namespace CallCenter.Utility