更新

RMYY_CallCenter_Api.Model/T_Dev_WorkOrder.cs

@@ -17,6 +17,7 @@ namespace RMYY_CallCenter_Api.Model
         #region Model
         private int _f_id;
         private int? _f_type;
+        private int? _f_type1;
         private string _f_workordercode;
         private int? _f_proposerdeptid;
         private string _f_proposercode;
@@ -46,6 +47,12 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_controlmancode;
         private string _f_controlmanname;
         private int? _f_devoutstate = 0;
+        private int? _f_woflag = 0;
+        private int? _f_devoutnum = 0;
+        private int? _f_devinnum = 0;
+        private string _f_devname;
+        private DateTime? _f_devstoragetime;
+        private int _f_woid = 0;
         /// <summary>
         /// 
         /// </summary>
@@ -62,6 +69,11 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_type = value; }
             get { return _f_type; }
         }
+        public int? F_Type1
+        {
+            set { _f_type1 = value; }
+            get { return _f_type1; }
+        }
         /// <summary>
         /// 工单编号
         /// </summary>
@@ -294,6 +306,54 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_devoutstate = value; }
             get { return _f_devoutstate; }
         }
+        /// <summary>
+        /// 工单标记：0原工单，1新工单(派生)
+        /// </summary>
+        public int? F_WoFlag
+        {
+            set { _f_woflag = value; }
+            get { return _f_woflag; }
+        }
+        /// <summary>
+        /// 设备入库数量
+        /// </summary>
+        public int? F_DevOutNum
+        {
+            set { _f_devoutnum = value; }
+            get { return _f_devoutnum; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_DevInNum
+        {
+            set { _f_devinnum = value; }
+            get { return _f_devinnum; }
+        }
+        /// <summary>
+        /// 入库设备名称
+        /// </summary>
+        public string F_DevName
+        {
+            set { _f_devname = value; }
+            get { return _f_devname; }
+        }
+        /// <summary>
+        /// 设备入库时间
+        /// </summary>
+        public DateTime? F_DevStorageTime
+        {
+            set { _f_devstoragetime = value; }
+            get { return _f_devstoragetime; }
+        }
+        /// <summary>
+        /// 原工单ID
+        /// </summary>
+        public int F_WoID
+        {
+            set { _f_woid = value; }
+            get { return _f_woid; }
+        }
         #endregion Model
 
 

RMYY_CallCenter_Api.Model/T_Sys_Menu.cs

@@ -130,7 +130,7 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_createtime; }
         }
 
-        public List<T_Sys_Menu> children { get; set; }
+        public List<T_Sys_Menu> button { get; set; }
         #endregion Model
 
     }

RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -62,7 +62,7 @@ namespace RMYY_CallCenter_Api.Controllers
             {
                 foreach (Model.T_Sys_Menu entity in item)
                 {
-                    entity.children = TreeRecursion(data, entity.F_MenuId.ToString());
+                    entity.button = TreeRecursion(data, entity.F_MenuId.ToString());
                     newList.Add(entity);
                 }
             }

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dev_WorkOrderController.cs

@@ -233,7 +233,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 model.F_Type = type;//工单类型  1设备租赁
                 model.F_Source = "PC端";
                 model.F_CallID = callid;
-                model.F_State = (int)EnumWorkOrderState.assign;//已转派
+                model.F_State = (int)EnumDevWorkOrderState.assign;//已转派
                 model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
                 model.F_ProposerDeptId = deptid;
                 model.F_ProposerCode = usercode;//申请人
@@ -243,7 +243,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 model.F_Remark = remark;
                 model.F_CreateTime = DateTime.Now;
                 model.F_CreateCode = User1.F_UserCode;
-                model.F_CreateCode = User1.F_UserName;
+                model.F_CreateName = User1.F_UserName;
                 model.F_CarryContents = devmessages.TrimEnd(',');//设备信息
                 model.F_IsDel = 0;
                 model.F_ControlManCode = User1.F_UserCode;
@@ -253,7 +253,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             {
                 int clbm = 2002;//设备科
                 var wmodel = orderbll.GetModel(n);
-                AddLog(n, 0, User1.F_UserName + "(" + User1.F_UserCode + ")" + "创建工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User1);
+                AddLog(n, 0, User1.F_UserName + "(" + User1.F_UserCode + ")" + "创建新工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User1);
                 AssignWO(User1, wmodel, "", "", clbm);
                 string[] _list = devmessages.TrimEnd(',').Split(',');
                 for (int i = 0; i < _list.Length; i++)
@@ -302,7 +302,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             model.F_Type = type;//工单类型  1设备租赁
             model.F_Source = "PC端";
             model.F_CallID = callid;
-            model.F_State = (int)EnumWorkOrderState.assign;//已转派
+            model.F_State = (int)EnumDevWorkOrderState.assign;//已转派
             model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
             model.F_ProposerDeptId = User1.F_DeptId;
             model.F_ProposerCode = User1.F_UserCode;//申请人
@@ -319,7 +319,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             {
                 int clbm = 2002;//设备科
                 var wmodel = orderbll.GetModel(n);
-                AddLog(n, 0, User1.F_UserName + "(" + User1.F_UserCode + ")" + "创建工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User1);
+                AddLog(n, 0, User1.F_UserName + "(" + User1.F_UserCode + ")" + "创建新工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, User1);
                 string[] _list = devmessages.TrimEnd(',').Split(',');
                 for (int i = 0; i < _list.Length; i++)
                 {
@@ -560,7 +560,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         /// <summary>
         /// 转派工单-设备配送
         /// </summary>
-        private bool AssignTrans(Model.T_Sys_UserAccount nowUser, Model.T_Dev_WorkOrder wokerModel, string cont, string usercode, string username, string userphon, string usertalkie, int type)
+        private bool AssignTrans(Model.T_Sys_UserAccount nowUser, Model.T_Dev_WorkOrder wokerModel, string cont, string usercode, string username, string userphon, string usertalkie)
         {
             string touser = ""; string tousername = "";
             int clbm = 0;
@@ -585,19 +585,31 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
-            if (type == 1)
-            {
-                optbut = (int)EnumDevItemOpt.assign;
-                wostate = (int)EnumDevWorkOrderState.work;//已指派待转运
-                content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-                itemid = AddLogTrans(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie,  clbm, nowUser);
-            }
-            else if (type == 2)
+            //if (type == 1)
+            //{
+            //    optbut = (int)EnumDevItemOpt.assign;
+            //    wostate = (int)EnumDevWorkOrderState.work;//已指派待转运
+            //    content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
+            //    itemid = AddLogTrans(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie,  clbm, nowUser);
+            //}
+            //else if (type == 2)
+            //{
+            //    optbut = (int)EnumDevItemOpt.assign;
+            //    wostate = (int)EnumDevWorkOrderState.work;//已指派待转运
+            //    content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
+            //    itemid = AddLogTrans(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie, clbm, nowUser);
+            //    if (wokerModel.F_WoID > 0)
+            //    {
+            //      AddLogTrans(wokerModel.F_WoID, wostate, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie, clbm, nowUser);
+            //    }
+            //}
+            optbut = (int)EnumDevItemOpt.assign;
+            wostate = (int)EnumDevWorkOrderState.work;//已指派待转运
+            content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
+            itemid = AddLogTrans(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie, clbm, nowUser);
+            if (wokerModel.F_WoID > 0)
             {
-                optbut = (int)EnumDevItemOpt.assign;
-                wostate = (int)EnumDevWorkOrderState.assreback;//已指派待返还
-                content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-                itemid = AddLogTrans(wokerModel.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie, clbm, nowUser);
+                AddLogTrans(wokerModel.F_WoID, (int)EnumDevWorkOrderState.receive, content, (int)EnumDevItemType.deal, optbut, touser, username, userphon, usertalkie, clbm, nowUser);
             }
             #endregion
             if (itemid > 0)
@@ -627,6 +639,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             //设备管理科操作
             string usercode = "8004";
             int state = 0;
+            string DevoutCounts = "";
             var ua = userbll.GetModel(usercode);
             if (woid == 0)
                 return Error("工单编号错误！");
@@ -647,7 +660,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     string code = _temp[2];
                     if (name != "" && num > 0)
                     {
-                        string sql = $"F_DeviceName='" + name+ "' and F_WoId="+ woid;
+                        string sql = $"F_DeviceName='" + name + "' and F_WoId=" + woid;
                         var optmodel = optbll.GetModelList(sql).FirstOrDefault();
                         optmodel.F_GiveNum = num;
                         optmodel.F_DeviceCode = code;
@@ -662,7 +675,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             optmodel.F_State = 1;
                         else return Error("出库设备数量大于需求数量！");
                         var n = optbll.Update(optmodel);
-                        if (n) continue;
+                        if (n)
+                        {
+                            DevoutCounts += name + ":" + num + ",";
+                            continue;
+                        }
                     }
                     else return Error("设备信息不正确！");
                 }
@@ -681,10 +698,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 omodel.F_HandleByName = ua.F_UserName;
                 omodel.F_HandleTime = DateTime.Now;//出库时间
                 omodel.F_State = (int)EnumDevWorkOrderState.checkout;//已出库待指派
+                omodel.F_HandleContents = DevoutCounts;
                 if (orderbll.Update(omodel))
                 {
                     #region 写入工单操作记录
-                    AddLog(woid, (int)EnumDevWorkOrderState.checkout, ua.F_UserName + "(" + ua.F_UserCode + ")" + "反馈设备已出库", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.assign, "", 0, ua);
+                    AddLog(woid, (int)EnumDevWorkOrderState.checkout, ua.F_UserName + "(" + ua.F_UserCode + ")" + "反馈设备已出库", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.checkout, "", 0, ua);
                     #endregion
                     return Success("出库成功！");
                 }
@@ -746,7 +764,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                bool n = AssignTrans(ua, omodel, remark, usercode, username, phon, talkie, 1);
+                bool n = AssignTrans(ua, omodel, remark, usercode, username, phon, talkie);
                 if (n)
                 {
                     return Success("转派成功！");
@@ -781,9 +799,11 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             var omodel = orderbll.GetModel(woid);
             if (omodel != null)
             {
-                bool n = AssignTrans(ua, omodel, remark, usercode, username, phon, talkie, 2);
+                bool n = AssignTrans(ua, omodel, remark, usercode, username, phon, talkie);
                 if (n)
                 {
+                    omodel.F_ControlManCode = ua.F_UserCode;//调度人
+                    omodel.F_ControlManName = ua.F_UserName;
                     return Success("转派成功！");
                 }
                 return Error("转派失败！");
@@ -869,12 +889,42 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             if (woid == 0)
                 return Error("工单编号错误！");
             var omodel = orderbll.GetModel(woid);
-            if (omodel != null)
+            Model.T_Dev_WorkOrder dmodel = new Model.T_Dev_WorkOrder();
+            #region 返还发起新工单
+            dmodel.F_Type = omodel.F_Type;//工单类型  1设备租赁
+            dmodel.F_Source = "PC端";
+            dmodel.F_CallID = omodel.F_CallID;
+            dmodel.F_State = (int)EnumDevWorkOrderState.reassign;//已返还待指派
+            dmodel.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
+            dmodel.F_ProposerDeptId = omodel.F_ProposerDeptId;
+            dmodel.F_ProposerCode = omodel.F_ProposerCode;//申请人
+            dmodel.F_ProposerName = omodel.F_ProposerName;
+            dmodel.F_ProposerPhon = omodel.F_ProposerPhon;
+            dmodel.F_DealType = "转派";
+            dmodel.F_Remark = omodel.F_Remark;
+            dmodel.F_CreateTime = DateTime.Now;
+            dmodel.F_CreateCode = ua.F_UserCode;
+            dmodel.F_CreateCode = ua.F_UserName;
+            dmodel.F_CarryContents = omodel.F_CarryContents;//设备信息
+            dmodel.F_IsDel = 0;
+            dmodel.F_DevOutState = omodel.F_DevOutState;
+            dmodel.F_DevOutNum = omodel.F_DevOutNum;
+            dmodel.F_WoFlag = 1;
+            dmodel.F_WoID = omodel.F_Id;
+            int n = orderbll.Add(dmodel);
+            if (n > 0)
             {
-                if (DealWO(ua, omodel, "", "", 4))
-                    return Success("操作成功！");
-                else return Error("操作失败！");
+              AddLog(n, (int)EnumDevWorkOrderState.reassign, ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建返还工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, ua);
+              AddLog(woid, (int)EnumDevWorkOrderState.receive, ua.F_UserName + "(" + ua.F_UserCode + ")" + "创建返还工单", (int)EnumDevItemType.deal, (int)EnumDevItemOpt.create, "", 0, ua);
+              return Success("操作成功！");
             }
+            #endregion
+            //if (omodel != null)
+            //{
+            //    if (DealWO(ua, omodel, "", "", 4))
+            //        return Success("操作成功！");
+            //    else return Error("操作失败！");
+            //}
             return Error("操作失败,不存在此工单编号！");
         }
         /// <summary>
@@ -911,7 +961,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             {
                 opt = "返还运转设备";
                 optbut = (int)EnumDevItemOpt.work;
-                wostate = (int)EnumDevWorkOrderState.reback;//返还转运中
+                wostate = (int)EnumDevWorkOrderState.transport;//返还转运中
                 if (!string.IsNullOrEmpty(model.F_TransOutPerson))
                 {
                     model.F_TransOutPerson += ',' + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")";
@@ -958,6 +1008,10 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 optcont = "，说明：" + cont;
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + optcont;
             var itemid = AddLog(model.F_Id, wostate, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+            if (type == 2 && model.F_WoID>0)
+            {
+                AddLog(model.F_WoID, (int)EnumDevWorkOrderState.receive, content, (int)EnumDevItemType.deal, optbut, "", 0, nowUser);
+            }
             if (itemid > 0)
             {
                 #region 处理工单            
@@ -989,6 +1043,8 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
             int workstate = 0;
             string opt="";
             var optcont = "";
+            int totalnum = 0;
+            string storContents = "";
             var ua = userbll.GetModel(usercode);
             if (woid == 0)
                 return Error("工单编号错误！");
@@ -1027,7 +1083,19 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         else if (getnum == givenum)
                             optmodel.F_State = 3;
                         var n = optbll.Update(optmodel);
-                        if (n) continue;
+                        if (n)
+                        {
+                            if (!string.IsNullOrEmpty(storContents))
+                            {
+                                storContents +=","+ name +" "+ num +"个";
+                            }
+                            else
+                            {
+                                storContents= name + " " + num +"个";
+                            }
+                            totalnum += num;
+                            continue;
+                        }
                     }
                     else return Error("设备信息不正确！");
                 }
@@ -1051,15 +1119,22 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                     }
                 }               
                 omodel.F_DevOutState = state;
-                //omodel.F_HandleByCode = usercode;//经办人
-                //omodel.F_HandleByName = ua.F_UserName;
+                omodel.F_HandleByCode = usercode;//经办人
+                omodel.F_HandleByName = ua.F_UserName;
                 omodel.F_State = workstate;
+                omodel.F_DevInNum = totalnum;
+                omodel.F_DevName = storContents;
+                omodel.F_DevStorageTime = DateTime.Now;
                 if (orderbll.Update(omodel))
                 {
-                    if (!string.IsNullOrEmpty(remark))
-                        optcont = "，说明：" + remark;
+                    if (!string.IsNullOrEmpty(storContents))
+                        optcont = "，说明：" + storContents;
                     #region 写入工单操作记录
                     AddLog(woid, workstate, ua.F_UserName + "(" + ua.F_UserCode + ")" + opt+ optcont, (int)EnumDevItemType.deal, (int)EnumDevItemOpt.storage, "", 0, ua);
+                    if (omodel.F_WoID > 0)
+                    {
+                        AddLog(omodel.F_WoID, workstate, ua.F_UserName + "(" + ua.F_UserCode + ")" + opt + optcont, (int)EnumDevItemType.deal, (int)EnumDevItemOpt.storage, "", 0, ua);
+                    }
                     string str = "update ";
                     #endregion
                     return Success("入库成功！");

RMYY_CallCenter_Api/Models/Enum/EnumDevWorkOrderState.cs

@@ -19,16 +19,16 @@ namespace RMYY_CallCenter_Api.Models.Enum
         checkout,
         [Description("已指派待转运")]
         work,
-        [Description("接收转运中")]
+        [Description("转运中")]
         transport,
         [Description("已接收待返还")]
         receive,
         [Description("已返还待指派")]
         reassign,
-        [Description("已指派待返还")]
-        assreback,
-        [Description("返还转运中")]
-        reback,
+        //[Description("已指派待转运")]
+        //assreback,
+        //[Description("返还转运中")]
+        //reback,
         [Description("已返还待入库")]
         storage,
         [Description("已入库待完结")]