耗材等

RMYY_CallCenter_Api.Dal/T_FaultRepair_Base.cs

@@ -66,7 +66,7 @@ namespace RMYY_CallCenter_Api.DAL
 			strSql.Append("insert into T_FaultRepair_Base(");
 			strSql.Append("F_WorkOrderCode,F_Applicant,F_ApplicationDept,F_Applicantsphone,F_Phone,F_WorkOrderCategory,F_Content,F_PlaceOfRepair,F_WorkOrderState,F_Maintenancer,F_MaintenanceDept,F_AssignTime,F_Endtime,F_UpdateTime,F_Deadline,F_CreateUser,F_CreateTime,F_CreateUserDept,F_File,F_ReturnNum,F_InternalWorkOrderCode,F_ExternalWorkOrderCode,F_IsDelete,F_LeaveRecordId,F_CallRecordId,F_CallId,F_IsStop,F_AssignUser,F_ReplayCount)");
 			strSql.Append(" values (");
-			strSql.Append("@F_WorkOrderCode,@F_Applicant,@F_ApplicationDept,@F_Applicantsphone,@F_Phone,@F_WorkOrderCategory,@F_Content,@F_PlaceOfRepair,@F_WorkOrderState,@F_Maintenancer,@F_MaintenanceDept,@F_AssignTime,@F_Endtime,@F_UpdateTime,@F_Deadline,@F_CreateUser,@F_CreateTime,@F_CreateUserDept,@F_File,@F_ReturnNum,@F_InternalWorkOrderCode,@F_ExternalWorkOrderCode,@F_IsDelete,@F_LeaveRecordId,@F_CallRecordId,@F_CallId,@F_IsStop,@F_AssignUser,F_ReplayCount)");
+			strSql.Append("@F_WorkOrderCode,@F_Applicant,@F_ApplicationDept,@F_Applicantsphone,@F_Phone,@F_WorkOrderCategory,@F_Content,@F_PlaceOfRepair,@F_WorkOrderState,@F_Maintenancer,@F_MaintenanceDept,@F_AssignTime,@F_Endtime,@F_UpdateTime,@F_Deadline,@F_CreateUser,@F_CreateTime,@F_CreateUserDept,@F_File,@F_ReturnNum,@F_InternalWorkOrderCode,@F_ExternalWorkOrderCode,@F_IsDelete,@F_LeaveRecordId,@F_CallRecordId,@F_CallId,@F_IsStop,@F_AssignUser,@F_ReplayCount)");
 			strSql.Append(";select @@IDENTITY");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
@@ -185,8 +185,11 @@ namespace RMYY_CallCenter_Api.DAL
             strSql.Append("F_ArriveTime=@F_ArriveTime,");
             strSql.Append("F_AssignUser=@F_AssignUser,");
             strSql.Append("F_ReplayCount=@F_ReplayCount,");
+            strSql.Append("F_ConfirmEquip=@F_ConfirmEquip");
             
 
+
+
             strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
 			SqlParameter[] parameters = {
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,50),
@@ -222,8 +225,10 @@ namespace RMYY_CallCenter_Api.DAL
                   new SqlParameter("@F_StopTime", SqlDbType.DateTime),
                  new SqlParameter("@F_ArriveTime", SqlDbType.DateTime),
                     new SqlParameter("@F_AssignUser", SqlDbType.NVarChar,100) ,
-                  new SqlParameter("@F_ReplayCount", SqlDbType.Int,4)
+                  new SqlParameter("@F_ReplayCount", SqlDbType.Int,4),
+                  
 
+                  new SqlParameter("@F_ConfirmEquip", SqlDbType.Int,4)
 
 
             };
@@ -264,8 +269,9 @@ namespace RMYY_CallCenter_Api.DAL
 
             parameters[31].Value = model.F_AssignUser;
             parameters[32].Value = model.F_ReplayCount;
-            
+            parameters[33].Value = model.F_ConfirmEquip;
 
+            
             int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
 			if (rows > 0)
 			{

RMYY_CallCenter_Api.Model/T_FaultRepair_Base.cs

@@ -60,6 +60,19 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_assignuser;
         private int f_replaycount = 0;
 
+        private int f_confirmequip = 0;
+
+        
+        /// <summary>
+        /// 默认=0，需要确认耗材=1 ，已确认耗材=2
+        /// </summary>
+        public int F_ConfirmEquip
+        {
+            set { f_confirmequip = value; }
+            get { return f_confirmequip; }
+        }
+
+
         public int F_ReplayCount
         {
             set { f_replaycount = value; }

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -359,6 +359,7 @@ namespace RMYY_CallCenter_Api
                     case 3000:
                         categoryType= Convert.ToInt32(dr["F_WorkOrderCategory"].ToString());                      
 
+
                         break;
                     case 1000:
                         categoryType = Convert.ToInt32(dr["F_type2"].ToString());
@@ -373,12 +374,16 @@ namespace RMYY_CallCenter_Api
                     var hasButton = allButtons.Where(p => p.value == "延期").FirstOrDefault();
 
                     allButtons.Remove(hasButton);
+                }
 
+                if (type==3000 && dr["F_ConfirmEquip"].ToString() != "1")
+                {
+                    //移除确认耗材按钮                   
+                    var hasButton = allButtons.Where(p => p.value == "确认耗材").FirstOrDefault();
 
+                    allButtons.Remove(hasButton);
 
                 }
-
-
                 dr["Buttons"] = allButtons;
                 #endregion
 

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -462,6 +462,8 @@ namespace RMYY_CallCenter_Api.Controllers
                             }
                             Model.T_FaultRepair_Process promodelnew = dealBll.GetModel(procid);
 
+
+                            model.F_ConfirmEquip = 1;
                             promodelnew.F_EquipDetail = ids.Substring(0, ids.LastIndexOf(','));
                             dealBll.Update(promodelnew);
 
@@ -509,6 +511,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                             ids += equipid + ",";
                         }
+                        model.F_ConfirmEquip = 1;
                         Model.T_FaultRepair_Process promodelnew = dealBll.GetModel(id);
 
                         promodelnew.F_EquipDetail = ids.Substring(0, ids.LastIndexOf(','));
@@ -1771,6 +1774,8 @@ namespace RMYY_CallCenter_Api.Controllers
                     {
                         model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
                         model.F_UpdateTime = DateTime.Now;
+                        //评价=自动确认耗材
+                        model.F_ConfirmEquip = 2;
                         model.F_Score = Attitude + Quality + Efficiency;
                         baseBll.Update(model);
                         AddOperatorLog("评价了工单", (int)EnumOperatorType.evaluate, model.F_WorkOrderCode);
@@ -2262,11 +2267,15 @@ namespace RMYY_CallCenter_Api.Controllers
         //延期
         //接单人在接单之后，如果该工单类型上设置的“可延期次数”大于0显示“延期”按钮；点击延期按钮进行验证是否超过设定的延期次数，超过提醒“已超过规定延迟次数”
         //操作流程记录延期
-        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory)
+        public ActionResult frReplay(string workordercode, string days, string type, string workordercategory,string reason)
         {
             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;
+            }
 
             if (gdmodel.F_CanReplayCount > 0)
             {
@@ -2281,8 +2290,9 @@ namespace RMYY_CallCenter_Api.Controllers
 
                         cwmodel.F_ReplayCount = cwmodel.F_ReplayCount + 1;
                         cwbll.Update(cwmodel);
+                       
 
-                        var itemid = Addlogbll.AddLog(cwmodel.F_ID, 0, 0, User.F_UserName + "(" + User.F_UserCode + ")" + "给工单延期" + days, (int)EnumItemType.Delay, 14, "", 0, User.F_UserCode);
+                        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);
                     }
                     //故障报工单延期修
                     if (type == "3000")
@@ -2291,7 +2301,7 @@ namespace RMYY_CallCenter_Api.Controllers
                         fbmodel.F_ReplayCount = fbmodel.F_ReplayCount + 1;
                         baseBll.Update(fbmodel);
 
-                        AddOperatorLog("给工单延期" + days, (int)EnumOperatorType.replay, workordercode);
+                        AddOperatorLog("给工单延期" + days+"h"+ strreason, (int)EnumOperatorType.replay, workordercode);
                     }
 
                     return Success("成功延期");
@@ -2308,6 +2318,33 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
 
+        /// <summary>
+        /// 申请人确认耗材
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ConfirmEquips(string workordercode,int confirmtype,string reason)
+        {
+            Model.T_FaultRepair_Base model = baseBll.GetModel(workordercode);
+            if (confirmtype == 0)
+            {
+                string logs = "";
+                if (!string.IsNullOrEmpty(reason)) {
+                    logs = "，原因：" + reason;
+                }
+                model.F_ConfirmEquip = 0;
+                model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.dealing;
+                AddOperatorLog("耗材确认有误"+logs, (int)EnumOperatorType.confirm, workordercode);
+            }
+            else
+            {
+                model.F_ConfirmEquip = 2;
+                AddOperatorLog("确认耗材无误", (int)EnumOperatorType.confirm, workordercode);
+            }
+            baseBll.Update(model);           
+
+            return Success("确认耗材接口");
+
+        }
 
 
 

RMYY_CallCenter_Api/Models/Enum/EnumOperatorType.cs

@@ -49,7 +49,10 @@ namespace RMYY_CallCenter_Api.Models.Enum
         [Description("挂起")]
         hangup,
         [Description("延期")]
-        replay
+        replay,
+
+        [Description("确认耗材")]
+        confirm
 
 
     }