111

RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -32,11 +32,11 @@ namespace RMYY_CallCenter_Api.Controllers.System
                 where += sql;
             }
             date = Bll.PagerBll.GetListPager
-                                ("T_Sys_Department",
+                                ("T_Sys_Department ",
                                   "F_DeptId",
                                   "*",
                                   where,
-                                  "order by F_DeptId desc",
+                                  "order by F_Sort",
                                   pagesize,
                                   pageindex,
                                   true,

RMYY_CallCenter_Api/Controllers/System/MenuController.cs

@@ -69,7 +69,6 @@ namespace RMYY_CallCenter_Api.Controllers.System
                     
                 }
             }
-
             return newList;
         }
 

RMYY_CallCenter_Api/Controllers/System/UserAccountController.cs

@@ -40,9 +40,9 @@ namespace RMYY_CallCenter_Api.Controllers.System
 
             int recordCount = 0;
             dt = Bll.PagerBll.GetListPager(
-                                    "T_Sys_UserAccount with(nolock)",
+                                    "T_Sys_UserAccount a with(nolock)",
                                     "F_UserId",
-                                    "*",
+                                    "*,(select F_DeptName from T_Sys_Department  where F_DeptId=a.F_DeptId)as F_DeptName,(select F_RoleName from T_Sys_Role where F_RoleId=a.F_RoleId)as F_RoleName",
                                     sql,
                                     "ORDER BY F_UserId desc",
                                     pagesize,

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dev_WorkOrderController.cs

@@ -154,7 +154,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         {
             string[] cel =
             {
-                "工单编号","类型","申请科室","工单内容","申请人","联系电话","调度人","上报时间","处理部门","配送转运人","接收运转人","备注"
+                "工单编号","类型","申请科室","工单内容","申请人","联系电话","调度人","上报时间","处理部门","配送转运人","接收转运人","备注"
             };
             return cel;
 

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Hos_WorkOrderController.cs

@@ -865,6 +865,34 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             return Error("操作失败,不存在此工单编号！");
         }
 
+
+
+        /// <summary>
+        /// 完结工单
+        /// </summary>
+        /// <param name="woid"></param>
+        /// <returns></returns>
+        public ActionResult OverWo(int woid)
+        {
+            string usercode = "8005";
+            var ua = userbll.GetModel(usercode);
+            if (woid == 0)
+                return Error("工单编号错误！");
+            var omodel = orderbll.GetModel(woid);
+            if (omodel != null)
+            {
+                //if (omodel.F_CreateCode != usercode)
+                //    return Error("无操作权限！");
+                if (omodel.F_State != (int)EnumHosWorkOrderState.installcomplete)
+                    return Error("此工单未安装结束不能完结！");
+                if (DealWO(ua, omodel, 7))
+                    return Success("操作成功！");
+                else return Error("操作失败！");
+            }
+            return Error("操作失败,不存在此工单编号！");
+        }
+
+
         /// <summary>
         ///处理工单
         /// </summary>
@@ -882,6 +910,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             int optbut = 0;
             int wostate = 0;
             string[] transcode = { };
+            int flag = 0;
             var fmodel = new Model.T_Hos_WorkOrder();
             if (type == 1)
             {
@@ -961,14 +990,17 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             if (type == 1)
                             {
                                 wostate = (int)EnumHosWorkOrderState.receive;//已查收待转运
+                                flag = 1;
                             }
                             else if (type == 2)
                             {
                                 wostate = (int)EnumHosWorkOrderState.transport;//转运中
+                                flag = 1;
                             }
                             else if (type == 3)
                             {
                                 wostate = (int)EnumHosWorkOrderState.transcomplete;//已完成
+                                flag = 1;
                             }
                         }
                         else
@@ -980,7 +1012,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 }
                 if (!string.IsNullOrEmpty(model.F_ActorCode) && type == 4 || type == 5 || type == 6)
                 {
-                    AddLog((int)model.F_WoID, (int)model.F_State, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+                    AddLog((int)model.F_WoID, (int)model.F_State, content, (int)EnumDevItemType.deal, 0, "", 0, nowUser);
                     int i = 0;
                     transcode = model.F_TransPersonCode.Split(',');
                     if (transcode.Count() > 0)
@@ -1008,14 +1040,17 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             if (type == 4)
                             {
                                 wostate = (int)EnumHosWorkOrderState.fetch;//待取配件
+                                flag = 1;
                             }
                             else if (type == 5)
                             {
                                 wostate = (int)EnumHosWorkOrderState.install;//待安装
+                                flag = 1;
                             }
                             else if (type == 6)
                             {
                                 wostate = (int)EnumHosWorkOrderState.installcomplete;//安装完成
+                                flag = 1;
                             }
                         }
                         else
@@ -1026,13 +1061,20 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
 
                 }
                 #endregion
-                #region 处理工单            
-                model.F_State = wostate;
+                #region 处理工单      
+                if (flag == 1)
+                {
+                    model.F_State = wostate;
+                    orderbll.Update(model);
+                    var oldmodel = orderbll.GetModel((int)model.F_WoID);
+                    oldmodel.F_State = wostate;
+                    orderbll.Update(oldmodel);
+                }
                 if (type == 6)
                 {
                     model.F_FinishTime = DateTime.Now;
-                }
-                orderbll.Update(model);
+                    orderbll.Update(model);
+                }              
                 #endregion
                 return true;
             }

RMYY_CallCenter_Api/Models/Enum/EnumHosWorkOrderState.cs

@@ -29,7 +29,7 @@ namespace RMYY_CallCenter_Api.Models.Enum
         awaitfetch,
         [Description("已取件待安装")]
         fetch,
-        [Description("已安装待完成")]
+        [Description("安装中")]
         install,
         [Description("安装完成")]
         installcomplete,