加字段 1、返修 2、挂起、3、退单、延时 相关的原因

RMYY_CallCenter_Api.Bll/AddLogBll.cs

@@ -52,7 +52,50 @@ namespace RMYY_CallCenter_Api.Bll
             }
             return res;
         }
+        public long AddLogAboutKey(int woid, int wostate, int type, string content, int itemtype, int opttype, string nextuser, int nextdept, string usercode,int key,string value,string reason ,int F_IsUsed = 0)
+        {
+
+            Model.T_Dis_WorkOrderItem itemModel = new Model.T_Dis_WorkOrderItem();
+            #region 
+            long res = 0;
+            //处理当前工单的记录之前的记录过期
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " and  (F_CreateUser=" + usercode + " or F_NextUser like '%" + usercode + "%')");
+            using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
+            {
+                if (F_IsUsed == 0)
+                {
 
+                    if (itemlast.Count > 0)
+                    {
+                        foreach (var it in itemlast)
+                        {
+                            it.F_IsUsed = 1;
+                            itembll.Update(it);
+                        }
+                    }
+                }
+                #endregion
+                itemModel.F_WoID = woid;
+                itemModel.F_WoState = wostate;
+                itemModel.F_WoType = type;
+                itemModel.F_ItemType = itemtype;
+                itemModel.F_OptType = opttype;
+                itemModel.F_OptContent = content;
+                itemModel.F_NextUser = nextuser;
+                itemModel.F_NextDept = nextdept;
+                itemModel.F_IsUsed = F_IsUsed;
+                itemModel.F_CreateTime = DateTime.Now;
+                itemModel.F_CreateUser = usercode;
+
+                itemModel.F_AboutKey = key;
+                itemModel.F_AboutReason = value;
+                itemModel.F_EnterReason = reason;
+
+                res = itembll.Add(itemModel);
+                trans.Complete();
+            }
+            return res;
+        }
 
     }
 }

RMYY_CallCenter_Api.Dal/T_Car_Operation.cs

@@ -47,9 +47,9 @@ namespace RMYY_CallCenter_Api.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Car_Operation(");
-            strSql.Append("F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete)");
+            strSql.Append("F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderCode,@F_Message,@F_AssignID,@F_CreateTime,@F_State,@F_CreateUser,@F_IsDelete)");
+            strSql.Append("@F_WorkOrderCode,@F_Message,@F_AssignID,@F_CreateTime,@F_State,@F_CreateUser,@F_IsDelete,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderCode", SqlDbType.VarChar,50),
@@ -58,7 +58,10 @@ namespace RMYY_CallCenter_Api.DAL
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4)};
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_WorkOrderCode;
             parameters[1].Value = model.F_Message;
             parameters[2].Value = model.F_AssignID;
@@ -67,6 +70,10 @@ namespace RMYY_CallCenter_Api.DAL
             parameters[5].Value = model.F_CreateUser;
             parameters[6].Value = model.F_IsDelete;
 
+            parameters[7].Value = model.F_AboutReason;
+            parameters[8].Value = model.F_AboutKey;
+            parameters[9].Value = model.F_EnterReason;
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -172,7 +179,7 @@ namespace RMYY_CallCenter_Api.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete from T_Car_Operation ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderCode,F_Message,F_AssignID,F_CreateTime,F_State,F_CreateUser,F_IsDelete,F_AboutReason ,F_AboutKey,F_EnterReason from T_Car_Operation ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -232,6 +239,19 @@ namespace RMYY_CallCenter_Api.DAL
                 {
                     model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
                 }
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
             }
             return model;
         }

RMYY_CallCenter_Api.Dal/T_Dis_WorkOrderItem.cs

@@ -41,9 +41,9 @@ namespace RMYY_CallCenter_Api.Dal
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Dis_WorkOrderItem(");
-            strSql.Append("F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime)");
+            strSql.Append("F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime,F_AboutReason ,F_AboutKey,F_EnterReason)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoType,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextUserName,@F_NexUserPhon,@F_NextUserTalkie,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime)");
+            strSql.Append("@F_WoID,@F_WoType,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextUserName,@F_NexUserPhon,@F_NextUserTalkie,@F_NextDept,@F_IsUsed,@F_CreateUser,@F_CreateTime,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -59,7 +59,10 @@ namespace RMYY_CallCenter_Api.Dal
                     new SqlParameter("@F_NextDept", SqlDbType.Int,4),
                     new SqlParameter("@F_IsUsed", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+             new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoType;
             parameters[2].Value = model.F_WoState;
@@ -75,6 +78,11 @@ namespace RMYY_CallCenter_Api.Dal
             parameters[12].Value = model.F_CreateUser;
             parameters[13].Value = model.F_CreateTime;
 
+
+            parameters[14].Value = model.F_AboutReason;
+            parameters[15].Value = model.F_AboutKey;
+            parameters[16].Value = model.F_EnterReason;
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -201,7 +209,7 @@ namespace RMYY_CallCenter_Api.Dal
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime from T_Dis_WorkOrderItem ");
+            strSql.Append("select  top 1 F_ID,F_WoID,F_WoType,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextUserName,F_NexUserPhon,F_NextUserTalkie,F_NextDept,F_IsUsed,F_CreateUser,F_CreateTime, F_AboutReason ,F_AboutKey,F_EnterReason from T_Dis_WorkOrderItem ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.BigInt)
@@ -229,6 +237,19 @@ namespace RMYY_CallCenter_Api.Dal
             RMYY_CallCenter_Api.Model.T_Dis_WorkOrderItem model = new RMYY_CallCenter_Api.Model.T_Dis_WorkOrderItem();
             if (row != null)
             {
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
                 if (row["F_ID"] != null && row["F_ID"].ToString() != "")
                 {
                     model.F_ID = long.Parse(row["F_ID"].ToString());

RMYY_CallCenter_Api.Dal/T_FaultRepair_OperationLog.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_FaultRepair_OperationLog(");
-			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete)");
+			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,  F_AboutReason ,F_AboutKey,F_EnterReason)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete)");
+			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete,  @F_AboutReason ,@F_AboutKey,@F_EnterReason)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -74,7 +74,13 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_OperationType", SqlDbType.Int,4),
 					new SqlParameter("@F_OperationTime", SqlDbType.DateTime),
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
-					new SqlParameter("@F_Isdelete", SqlDbType.Int,4)};
+					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
+
+    
+                    new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)
+            };
 			parameters[0].Value = model.F_WorkOrderCode;
 			parameters[1].Value = model.F_Operator;
 			parameters[2].Value = model.F_LogContent;
@@ -83,7 +89,10 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[5].Value = model.F_UpdateTime;
 			parameters[6].Value = model.F_Isdelete;
 
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
+            parameters[7].Value = model.F_AboutReason;
+            parameters[8].Value = model.F_AboutKey;
+            parameters[9].Value = model.F_EnterReason;
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)
 			{
 				return 0;
@@ -188,7 +197,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_FaultRepair_OperationLog ");
+			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_FaultRepair_OperationLog, F_AboutReason ,F_AboutKey,F_EnterReason ");
 			strSql.Append(" where F_OperationId=@F_OperationId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_OperationId", SqlDbType.Int,4)
@@ -245,10 +254,24 @@ namespace RMYY_CallCenter_Api.DAL
 					model.F_UpdateTime=DateTime.Parse(row["F_UpdateTime"].ToString());
 				}
 				if(row["F_Isdelete"]!=null && row["F_Isdelete"].ToString()!="")
-				{
-					model.F_Isdelete=int.Parse(row["F_Isdelete"].ToString());
-				}
-			}
+                {
+                    model.F_Isdelete = int.Parse(row["F_Isdelete"].ToString());
+                }
+
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
+
+            }
 			return model;
 		}
 

RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_OperationLog.cs

@@ -63,9 +63,9 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			StringBuilder strSql=new StringBuilder();
 			strSql.Append("insert into T_IntegratedScheduling_OperationLog(");
-			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete)");
+			strSql.Append("F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,   F_AboutReason ,F_AboutKey,F_EnterReason)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete)");
+			strSql.Append("@F_WorkOrderCode,@F_Operator,@F_LogContent,@F_OperationType,@F_OperationTime,@F_UpdateTime,@F_Isdelete,@F_AboutReason ,@F_AboutKey,@F_EnterReason)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -74,7 +74,11 @@ namespace RMYY_CallCenter_Api.DAL
 					new SqlParameter("@F_OperationType", SqlDbType.Int,4),
 					new SqlParameter("@F_OperationTime", SqlDbType.DateTime),
 					new SqlParameter("@F_UpdateTime", SqlDbType.DateTime),
-					new SqlParameter("@F_Isdelete", SqlDbType.Int,4)};
+					new SqlParameter("@F_Isdelete", SqlDbType.Int,4),
+
+    new SqlParameter("@F_AboutReason", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_AboutKey", SqlDbType.Int,4),
+                    new SqlParameter("@F_EnterReason", SqlDbType.NVarChar,50)};
 			parameters[0].Value = model.F_WorkOrderCode;
 			parameters[1].Value = model.F_Operator;
 			parameters[2].Value = model.F_LogContent;
@@ -82,8 +86,11 @@ namespace RMYY_CallCenter_Api.DAL
 			parameters[4].Value = model.F_OperationTime;
 			parameters[5].Value = model.F_UpdateTime;
 			parameters[6].Value = model.F_Isdelete;
+            parameters[7].Value = model.F_AboutReason;
+            parameters[8].Value = model.F_AboutKey;
+            parameters[9].Value = model.F_EnterReason;
 
-			object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
 			if (obj == null)
 			{
 				return 0;
@@ -188,7 +195,7 @@ namespace RMYY_CallCenter_Api.DAL
 		{
 			
 			StringBuilder strSql=new StringBuilder();
-			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete from T_IntegratedScheduling_OperationLog ");
+			strSql.Append("select  top 1 F_OperationId,F_WorkOrderCode,F_Operator,F_LogContent,F_OperationType,F_OperationTime,F_UpdateTime,F_Isdelete,    F_AboutReason ,F_AboutKey,F_EnterReason from T_IntegratedScheduling_OperationLog ");
 			strSql.Append(" where F_OperationId=@F_OperationId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_OperationId", SqlDbType.Int,4)
@@ -248,7 +255,20 @@ namespace RMYY_CallCenter_Api.DAL
 				{
 					model.F_Isdelete=int.Parse(row["F_Isdelete"].ToString());
 				}
-			}
+                if (row["F_EnterReason"] != null)
+                {
+                    model.F_EnterReason = row["F_EnterReason"].ToString();
+                }
+
+                if (row["F_AboutReason"] != null)
+                {
+                    model.F_AboutReason = row["F_AboutReason"].ToString();
+                }
+                if (row["F_AboutKey"] != null && row["F_AboutKey"].ToString() != "")
+                {
+                    model.F_AboutKey = int.Parse(row["F_AboutKey"].ToString());
+                }
+            }
 			return model;
 		}
 

RMYY_CallCenter_Api.Model/T_Car_Operation.cs

@@ -18,6 +18,28 @@ namespace RMYY_CallCenter_Api.Model
         private int? _f_state;
         private string _f_createuser;
         private int? _f_isdelete;
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+        //1、返修 2、挂起、3、退单、延时 相关的原因
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
         /// <summary>
         /// 
         /// </summary>

RMYY_CallCenter_Api.Model/T_Dis_WorkOrderItem.cs

@@ -30,6 +30,33 @@ namespace RMYY_CallCenter_Api.Model
         private int? _f_isused = 0;
         private string _f_createuser;
         private DateTime? _f_createtime;
+
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+
+
+
+        //1、返修 2、挂起、3、退单、延时 相关的原因
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
+
         /// <summary>
         /// 工单记录ID
         /// </summary>

RMYY_CallCenter_Api.Model/T_FaultRepair_OperationLog.cs

@@ -34,10 +34,41 @@ namespace RMYY_CallCenter_Api.Model
 		private DateTime? _f_operationtime= DateTime.Now;
 		private DateTime? _f_updatetime;
 		private int? _f_isdelete=0;
-		/// <summary>
-		/// 
-		/// </summary>
-		public int F_OperationId
+
+
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+
+       
+
+        //1、返修 2、挂起、3、退单、延时 相关的原因
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
+
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_OperationId
 		{
 			set{ _f_operationid=value;}
 			get{return _f_operationid;}

RMYY_CallCenter_Api.Model/T_IntegratedScheduling_OperationLog.cs

@@ -34,10 +34,42 @@ namespace RMYY_CallCenter_Api.Model
 		private DateTime? _f_operationtime;
 		private DateTime? _f_updatetime;
 		private int? _f_isdelete;
-		/// <summary>
-		/// 
-		/// </summary>
-		public int F_OperationId
+
+        private string _f_aboutreason;
+        private int? _f_aboutkey;
+        private string _f_enterreason;
+
+
+
+        //1、返修 2、挂起、3、退单、延时 相关的原因的value
+        public string F_AboutReason
+        {
+            set { _f_aboutreason = value; }
+            get { return _f_aboutreason; }
+        }
+        /// <summary>
+        /// 返修 2、挂起、3、退单、延时 原因的 key,这个是字典的key
+        /// </summary>
+        public int? F_AboutKey
+        {
+            set { _f_aboutkey = value; }
+            get { return _f_aboutkey; }
+        }
+        /// <summary>
+        /// 手动输入的 选了其他输入的
+        /// </summary>
+        public string F_EnterReason
+        {
+            set { _f_enterreason = value; }
+            get { return _f_enterreason; }
+        }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_OperationId
 		{
 			set{ _f_operationid=value;}
 			get{return _f_operationid;}

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -837,7 +837,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// </summary>
         /// <param name="orderid"></param>
         /// <returns></returns>
-        public ActionResult BackWorkOrder(int orderid,string reason)
+        public ActionResult BackWorkOrder(int orderid,string reason,int key,string value)
         {
             if (User != null)
             {
@@ -848,8 +848,11 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     return Error("无此操作权限！");
                 model.F_State = (int)EnumWorkOrderState.reback;//已退回
                 string reasonmessage = "";
-                if (!string.IsNullOrEmpty(reason))
-                    reasonmessage = ",原因:" + reason;
+                reasonmessage = ",原因:" + value;
+                if (!string.IsNullOrEmpty(reason)) { 
+
+                    reasonmessage = reasonmessage +","+ reason;
+                }
                 if (new BLL.T_Car_AssignWorkOrder().Update(model))
                 {
                     var carmodel = carbll.GetModel(model.F_CarId.Value);
@@ -874,11 +877,11 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                             it.F_ControlManName = "";
                             it.F_State = (int)EnumWorkOrderState.neworder;//退回待分配
                             it.F_AcceptTime = null;
-                            AddOperation(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "退单"+ reasonmessage, User.F_UserCode, model.F_State.Value,
-                        it.F_WorkOrderCode, model.F_ID);
+                            AddOperationAboutKey(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "退单"+ reasonmessage, User.F_UserCode, model.F_State.Value,
+                        it.F_WorkOrderCode, model.F_ID,key,value,reason);
                           if (  orderbll.Update(it))
                             {
-                                msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回"+"工单编号:" + it.F_WorkOrderCode, model.F_CreateUser 
+                                msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回"+"工单编号:" + it.F_WorkOrderCode+ reasonmessage, model.F_CreateUser 
                                     , User.F_UserCode, EnumSmsType.car
                       , 0, it.F_WorkOrderCode );
                             }
@@ -1362,5 +1365,31 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             return n;
         }
 
+           /// <summary>
+        /// 添加操作记录
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="user"></param>
+        /// <param name="state"></param>
+        /// <param name="WorkOrderCode"></param>
+        /// <param name="assignid"></param>
+        /// <returns></returns>
+        public int  AddOperationAboutKey(string message,string user,int state,string WorkOrderCode,int assignid,int key,string value,string reason)
+        {
+            Model.T_Car_Operation oper = new Model.T_Car_Operation();
+            oper.F_Message = message;
+            oper.F_CreateUser = user;
+            oper.F_IsDelete = 0;
+            oper.F_State = state;
+            oper.F_WorkOrderCode = WorkOrderCode;
+            oper.F_AssignID = assignid;
+            oper.F_CreateTime = DateTime.Now;
+            oper.F_AboutKey = key;
+            oper.F_AboutReason = value;
+            oper.F_EnterReason = reason;
+            int n = new BLL.T_Car_Operation().Add(oper);
+            return n;
+        }
+
     }
 }

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -436,9 +436,15 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
         //处理人退单  
-        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason)
+        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason ,int key, string value)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
+            string s = ",退回原因:" + value  ;
+            if (!string.IsNullOrEmpty(BackReason))
+            {
+                s =s+ "，" + BackReason;
+            }
+
             if (model != null)
             {
                 if (model.F_MaintenanceDept == User.F_DeptId.ToString())
@@ -453,12 +459,10 @@ namespace RMYY_CallCenter_Api.Controllers
                     model.F_Deadline = null;
                     model.F_AcceptTime = null;
                     baseBll.Update(model);
-                    string s = "";
-                    if (!string.IsNullOrEmpty(BackReason))
-                    {
-                        s += ",退回原因:" + BackReason;
-                    }
-                    AddOperatorLog("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode);
+                    
+
+                    
+                    AddOperatorLogAboutKey("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode,value,key,BackReason);
                     msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回" + "工单编号:" + model.F_WorkOrderCode+s, assignuser
                                  , User.F_UserCode, EnumSmsType.repair
                    , 0, model.F_WorkOrderCode);
@@ -1808,9 +1812,15 @@ namespace RMYY_CallCenter_Api.Controllers
 
         // 返修 是申请人提交的返修
         //退回至维修部门班组长（角色），如果没有该角色退回到原来的处理人
-        public ActionResult ReturnWorkOrder(string WorkOrderCode, string ReturnReason)
+        public ActionResult ReturnWorkOrder(string WorkOrderCode, string ReturnReason,int key,string value)
         {
             Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
+
+            string str = "";
+            if (!string.IsNullOrEmpty(ReturnReason))
+            {
+                str = "," + ReturnReason;
+            }
             if (model != null && model.F_ApplicationDept.Trim() == User.F_DeptId.ToString())
             {
                 //判断返工是不是规定的时间内，工单状态是已完结的工单
@@ -1823,11 +1833,12 @@ namespace RMYY_CallCenter_Api.Controllers
                     promodel.F_Isdelete = 0;
                     promodel.F_MaintenanceDept = User.F_DeptId.ToString();// model.F_MaintenanceDept;
                     promodel.F_Maintenancer = User.F_UserCode;// model.F_Maintenancer;
-                    promodel.F_ReturnReason = ReturnReason;
+                    promodel.F_ReturnReason =value+ ReturnReason;
                     promodel.F_WorkOrderCode = WorkOrderCode;
                     if (dealBll.Add(promodel) > 0)
                     {
-                        AddOperatorLog("提交了返工", (int)EnumOperatorType.submitreturn, WorkOrderCode);
+                       
+                        AddOperatorLogAboutKey("提交了返工,原因："+value+ str, (int)EnumOperatorType.submitreturn, WorkOrderCode,value,key,ReturnReason);
 
                         string sql = " select top 1 F_UserCode from T_Sys_UserAccount where F_RoleId in (select F_RoleId from T_Sys_Role where F_RoleCode = 'WXBZZ')";
 
@@ -1837,11 +1848,8 @@ namespace RMYY_CallCenter_Api.Controllers
                             model.F_Maintenancer = usercode;
                         }
 
-                        string s = "";
-                        if (!string.IsNullOrEmpty(ReturnReason))
-                        {
-                            s = "，返修原因：" + ReturnReason;
-                        }
+                        string s  = "，返修原因：" +value+ str;
+                         
 
                         model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
                         model.F_ReturnNum += model.F_ReturnNum + 1;
@@ -2027,6 +2035,23 @@ namespace RMYY_CallCenter_Api.Controllers
             return true;
         }
 
+
+        public bool AddOperatorLogAboutKey(string content, int type, string workordercode,string value,int key,string enterreason)
+        {
+            Model.T_FaultRepair_OperationLog model = new Model.T_FaultRepair_OperationLog();
+            model.F_LogContent = content;
+            model.F_OperationTime = DateTime.Now;
+            model.F_OperationType = type;
+            model.F_Operator = User.F_UserCode;
+            model.F_WorkOrderCode = workordercode;
+            model.F_AboutKey = key;
+            model.F_AboutReason = value;
+            model.F_EnterReason = enterreason;
+            logBll.Add(model);
+            return true;
+        }
+
+
         public void AddAddlog(string workordercode)
         {
             AddOperatorLog("创建报修工单", (int)EnumOperatorType.add, workordercode);
@@ -2273,7 +2298,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
         //挂起
-        public ActionResult HangUp(string workordercode)
+        public ActionResult HangUp(string workordercode, int key, string value,  string reason)
         {
 
             Model.T_FaultRepair_Base model = baseBll.GetModel(workordercode);
@@ -2285,7 +2310,12 @@ namespace RMYY_CallCenter_Api.Controllers
             model.F_StopTime = DateTime.Now;
             model.F_Endtime = DateTime.Now;
             baseBll.Update(model);
-            AddOperatorLog(User.F_UserCode + "挂起了工单", (int)EnumOperatorType.hangup, model.F_WorkOrderCode);
+            string str = "";
+            if (!string.IsNullOrEmpty(reason))
+            {
+                str = "," + reason;
+            }
+            AddOperatorLogAboutKey(User.F_UserCode + "挂起了工单,原因:"+value+ str, (int)EnumOperatorType.hangup, model.F_WorkOrderCode,value,key, reason);
             return Success("挂起成功");
         }
 
@@ -2474,15 +2504,17 @@ namespace RMYY_CallCenter_Api.Controllers
         //延期
         //接单人在接单之后，如果该工单类型上设置的“可延期次数”大于0显示“延期”按钮；点击延期按钮进行验证是否超过设定的延期次数，超过提醒“已超过规定延迟次数”
         //操作流程记录延期
-        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason)
+        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason,int key, string value)
         {
             Model.T_Sys_GongDan gdmodel = gdbll.GetModel(Convert.ToInt32(workordercategory));
             Model.T_Wo_CommonBase model = cbbll.GetModel(workordercode);
-            string strreason = "";
+
             if (!string.IsNullOrEmpty(reason))
             {
-                strreason = ",原因：" + reason;
+                reason = "," + reason;
             }
+            string strreason  = ",原因："+value+  reason;
+            
 
             if (gdmodel.F_CanReplayCount > 0)
             {
@@ -2499,7 +2531,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         cwbll.Update(cwmodel);
                        
 
-                        var itemid = Addlogbll.AddLog(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days + "h"+ strreason, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode);
+                        var itemid = Addlogbll.AddLogAboutKey(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days + "h"+ strreason, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode,key,value, reason);
                     }
                     //故障报工单延期修
                     if (type == "3000")

RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -716,10 +716,16 @@ namespace RMYY_CallCenter_Api.Controllers
             return Error("工单不存在！");
         }
 
-        //退单  
-        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason)
+        //处理人退单  
+        public ActionResult BackWorkOrder(string WorkOrderCode, string BackReason,int key,string value)
         {
             Model.T_IntegratedScheduling_Base model = baseBll.GetModel(WorkOrderCode);
+            string str = "";
+            if (!string.IsNullOrEmpty(BackReason))
+            {
+                str = "，" + BackReason;
+            }
+
             if (model != null)
             {
                 if (model.F_DealMan == User.F_UserCode)
@@ -734,13 +740,9 @@ namespace RMYY_CallCenter_Api.Controllers
                     model.F_Deadline = null;
                     model.F_AcceptTime = null;
                     baseBll.Update(model);
-                    string s = "";
-                    if (!string.IsNullOrEmpty(BackReason))
-                    {
-                        s += ",退回原因:" + BackReason;
-                    }
-                    AddOperatorLog("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode);
-                    msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回" + "工单编号:" + model.F_WorkOrderCode, assignuser
+                    string s = ",退回原因:" + value + str;
+                    AddOperatorLogAboutKey("退回了工单" + s, (int)EnumOperatorType.back, model.F_WorkOrderCode,key,value,BackReason);
+                    msg.AddInternalMessagesInfo("您有工单被退回", "您有工单被退回" + "工单编号:" + model.F_WorkOrderCode+s, assignuser
                                , User.F_UserCode, EnumSmsType.comprehensive
                  , 0, model.F_WorkOrderCode);
 
@@ -1077,7 +1079,23 @@ namespace RMYY_CallCenter_Api.Controllers
             logBll.Add(model);
             return true;
         }
-        
+
+        public bool AddOperatorLogAboutKey(string content, int type, string workordercode,int key,string value,string reason)
+        {
+            Model.T_IntegratedScheduling_OperationLog model = new Model.T_IntegratedScheduling_OperationLog();
+            model.F_LogContent = content;
+            model.F_OperationTime = DateTime.Now;
+            model.F_OperationType = type;
+            model.F_Operator = User.F_UserCode;
+            model.F_WorkOrderCode = workordercode;
+            model.F_AboutKey = key;
+            model.F_AboutReason = value;
+            model.F_EnterReason = reason;
+            logBll.Add(model);
+            return true;
+        }
+
+
         public void AddAddlog(string workordercode)
         {
             AddOperatorLog("创建综合调度工单", (int)EnumOperatorType.add, workordercode);

RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -1719,7 +1719,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// </summary>
         /// <param name="WorkOrderCode"></param>
         /// <returns></returns>
-        public ActionResult BackWorkOrder(string WorkOrderCode,string reason)
+        public ActionResult BackWorkOrder(string WorkOrderCode,string reason,int key,string value)
         {
             if (User != null)
             {
@@ -1748,7 +1748,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                     }
 
-                    var res = BackWO(User, wmodel, reason);
+                    var res = BackWO(User, wmodel, reason,key,value);
                     if (res)
                         return Success("退单成功");
                     else
@@ -1764,7 +1764,7 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <summary>
         /// 退回工单
         /// </summary>
-        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason)
+        public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Con_WorkOrder model,string reason,int key, string value)
         {
             #region 工单处理
             var opt = "退单";
@@ -1785,7 +1785,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 reasonmessage = ",原因:" + reason;
             }
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt+ reasonmessage;
-            var itemid = logbll.AddLog((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode);
+            var itemid = logbll.AddLogAboutKey((int)model.F_ID, (int)model.F_type1, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser.F_UserCode,key,value,reason);
             if (itemid > 0)
             {
                 #region 处理工单

RMYY_CallCenter_Api/Models/Enum/EnumOperatorType.cs

@@ -32,7 +32,7 @@ namespace RMYY_CallCenter_Api.Models.Enum
         [Description("异常完结")]
         exceptionended,
 
-        [Description("异常完结")]
+        [Description("返修")]
         submitreturn,
             [Description("转派")]
          transfer ,