综合调度相关的修改

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -655,7 +655,7 @@ namespace RMYY_CallCenter_Api
             }
             else if (type == 2000)//综合调度
             {
-                typeIdArray = new List<int> { -1, 0, 1, 2, 3, 4 };
+                typeIdArray = new List<int> { -1, 0, 1, 2, 3, 4 ,5};
                  
             }
             else if (type == 4000)
@@ -679,19 +679,24 @@ namespace RMYY_CallCenter_Api
                         strArr = new List<string> { "待提交", "待分配", "待接单", "已接单", "处理中", "待评价", "已完成" };
                     else if (type == 3000)
                         strArr = new List<string> { "待提交", "待派单", "待接单", "已接单", "待评价", "已完成", "已完成", "已接单", "确认耗材中" };
+                    else if (type == 2000)
 
+                        strArr = new List<string> { "待提交", "待派单", "待接单", "已接单", "待评价", "已完成", "已撤销" };
                     else
                         strArr = new List<string> { "待提交", "待派单", "待接单", "已接单", "待评价", "已完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
                 case MENUENUM.工单列表:
                     if(type==3000)
                         strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "异常完结", "已完结", "待完成","确认耗材中" };
+                    else if (type == 2000)
+
+                        strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "已完成", "已撤销" };
                     else
                     strArr = new List<string> { "待提交", "待派单", "待接单", "待完成", "已处理", "已完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
                 case MENUENUM.报修列表:
                     strArr = new List<string> { "待提交", "-", "待接单", "已接单", "已完成", "已完成", "已完成", "待完成", "确认耗材中" }; break;         
 
                 case MENUENUM.调度工单列表:
-                    strArr = new List<string> { "待提交", "待指派", "待接单", "待完成", "待评价", "已完成" }; break;
+                    strArr = new List<string> { "待提交", "待指派", "待接单", "待完成", "待评价", "已完成","已撤销" }; break;
                 default: break;
             }
             int index = typeIdArray.IndexOf(state);

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -14,6 +14,8 @@ using System.Reflection;
 using System.Text;
 using System.Web;
 using System.Web.Mvc;
+using System.Diagnostics;
+using System.Security.Cryptography;
 
 namespace RMYY_CallCenter_Api.Controllers
 {
@@ -42,7 +44,7 @@ namespace RMYY_CallCenter_Api.Controllers
         private static InternalMessagesController msg = new InternalMessagesController();
 
         private static SchedulingController schcon = new SchedulingController();
-
+        private AjaxResult ajresult = new AjaxResult();
         #region 获取工单详情相关的接口
         public DataTable GetFileData(string ids,string prefix)
         {
@@ -3464,5 +3466,172 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
         #endregion
+
+
+        #region 对外提供的接口
+        public static bool ICodeValidates(string strParams, string ICode)
+        {
+            string SecurityCode = "wuyuan%#@6"; //ConfigurationManager.AppSettings["SecurityCode"];
+            string pwd = Md5(SecurityCode + strParams);
+            return pwd.Equals(ICode);
+            //return true;
+        }
+        public static string Md5(string txt)
+        {
+            byte[] sor = Encoding.UTF8.GetBytes(txt);
+            MD5 md5 = MD5.Create();
+            byte[] result = md5.ComputeHash(sor);
+            StringBuilder strbul = new StringBuilder(40);
+            for (int i = 0; i < result.Length; i++)
+            {
+                //加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位
+                strbul.Append(result[i].ToString("x2"));
+            }
+            return strbul.ToString().ToLower(); ;
+        }
+        /// <summary>
+        /// 提交工单接口
+        /// </summary>
+        /// <param name="timestamp"></param>
+        /// <returns></returns>
+        public ActionResult AddWorkOrder(long timestamp)
+        {
+            string port_password = HttpUtility.UrlDecode(RequestString.GetQueryString("port_password"));   //加密信息(安全验证用)
+            string uuid = HttpUtility.UrlDecode(RequestString.GetQueryString("uuid"));          //客户唯一标识（安全验证用）
+            string applicant = HttpUtility.UrlDecode(RequestString.GetQueryString("applicant"));
+            string ApplicationDeptCode = HttpUtility.UrlDecode(RequestString.GetQueryString("ApplicationDeptCode"));
+
+            string Phone = HttpUtility.UrlDecode(RequestString.GetQueryString("Phone"));
+            string Applicantsphone = HttpUtility.UrlDecode(RequestString.GetQueryString("Applicantsphone"));
+            string WorkOrderCategory = HttpUtility.UrlDecode(RequestString.GetQueryString("WorkOrderCategory"));
+            string Content = HttpUtility.UrlDecode(RequestString.GetQueryString("Content"));
+            string PlaceOfRepair = HttpUtility.UrlDecode(RequestString.GetQueryString("PlaceOfRepair"));
+            string EmergencyTypes = HttpUtility.UrlDecode(RequestString.GetQueryString("EmergencyTypes"));
+
+            if (string.IsNullOrEmpty(uuid))
+            {
+                ajresult.state = (int)CodeStatus.ID不存在;
+                ajresult.message = "客户唯一标识不能为空";
+                return Process();
+            }
+            else if (uuid.Length > 50)
+            {
+                ajresult.state = (int)CodeStatus.字符串超出长度;
+                ajresult.message = "客户唯一标识超出长度";
+            }
+            try
+            {
+                DateTime time = DateTimeConvert.FromTimetag(timestamp);
+            }
+            catch
+            {
+                var err = new
+                {
+                    code = "1",
+                    message = "时间戳错误"
+                };
+                return Error(err.ToJson());
+            }
+            if (! ICodeValidates(uuid + timestamp, port_password))
+            {
+                ajresult.state = (int)CodeStatus.安全验证未通过;
+                ajresult.message = "安全验证未通过";
+                return Process();
+            }
+            if (string.IsNullOrEmpty(ApplicationDeptCode))
+            {
+                ajresult.state = (int)CodeStatus.必填字段为空;
+                ajresult.message = "科室编码不能为空";
+                return Process();
+            }
+            if (string.IsNullOrEmpty(WorkOrderCategory))
+            {
+                ajresult.state = (int)CodeStatus.必填字段为空;
+                ajresult.message = "工单类别不能为空";
+                return Process();
+            }
+            Model.T_FaultRepair_Base model = new Model.T_FaultRepair_Base();      
+
+            string sql = "select F_DeptId from T_Sys_Department where F_DeptCode='" + ApplicationDeptCode + "' ";
+            string deptid = DbHelperSQL.GetSingle(sql).ToString();
+
+            if (string.IsNullOrEmpty(deptid))
+            {
+                model.F_ApplicationDept = deptid;
+            }
+            else
+            {
+                ajresult.state = (int)CodeStatus.必填字段为空;
+                ajresult.message = "科室编码不能为空";
+                return Process();
+            }
+            model.F_Phone = Phone;
+            model.F_Applicantsphone = Applicantsphone;
+            
+            model.F_WorkOrderCategory = WorkOrderCategory;
+            model.F_Content = Content;
+            model.F_PlaceOfRepair = PlaceOfRepair;//报修地点       
+
+
+         
+            model.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");//工单编号
+            model.F_EmergencyTypes = EmergencyTypes;
+         
+            string message = "";
+            var dicvalue = new Model.T_Sys_GongDan();
+            dicvalue = new Bll.T_Sys_GongDan().GetModel(Convert.ToInt32(model.F_WorkOrderCategory));
+            if (dicvalue != null)
+            {
+                message = "\n工单类型:故障报修/" + dicvalue.F_Name;
+            }
+            model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.neworder;
+            model.F_CreateTime = DateTime.Now;
+            model.F_ReplayCount = 0;
+            int returnid = baseBll.Add(model);
+            if (returnid > 0)
+            {
+                AddAddlog(model.F_WorkOrderCode);
+                AddOperatorLog(applicant + "创建报修工单", (int)EnumOperatorType.add, model.F_WorkOrderCode);
+                return Success("添加成功！", returnid);
+            }
+             return Error("添加失败！");
+            
+        }
+             /// <summary>
+             /// 成功的消息格式化
+             /// </summary>
+             /// <param name="message"></param>
+             /// <returns></returns>
+        protected virtual ActionResult Process()
+        {
+            string methodName = new StackTrace(true).GetFrame(1).GetMethod().Name;   //事件源
+            LogHelper.Info(this.GetType().ToString() + " -- " + methodName + "\r\n" + ajresult.state + "|" + ajresult.data + ajresult.message); //日志
+            var jsonMsg = new AjaxResult { state = ajresult.state, message = ajresult.message, data = ajresult.data }.ToJson();
+            return Content(jsonMsg);
+        }
+        /// <summary>
+        /// 状态枚举
+        /// </summary>
+        enum CodeStatus
+        {
+            SUCCESS = 200,
+            安全验证未通过 = 400,
+            无法预测的程序错误 = 501,
+            参数格式错误 = 100,
+            必填字段为空 = 101,
+            字符串超出长度 = 102,
+            数据库错误 = 103,
+            执行超时 = 104,
+            参数逻辑错误 = 105,
+            ID不存在 = 106,
+            无可上传文件 = 107,
+            执行失败 = 108,
+            用户已禁用 = 120,
+
+            异常结果类型 = 500
+
+        }
+
+        #endregion
     }
 }

RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -690,41 +690,42 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
         //综合保障中心 撤回（已指派未接单的可进行撤回，工单状态为“待指派”）
-        public ActionResult Retract(string workordercode)
+
+        //综合保障中心 撤回;综合调度类工单在撤单的时候增加下拉框选择对应撤单原因（已接单撤单，等用字典维护），也可输入文本原因（接单没接单都能撤单，）（加一个工单状态，工单状态显示已撤销）
+        public ActionResult Retract(string workordercode,   string BackReason, int key, string value)
         {
+            string str = "";
 
             Model.T_IntegratedScheduling_Base model = baseBll.GetModel(workordercode);
             if (model == null)
             {
                 return Error("没有获取到工单号");
             }
-            if (model.F_WorkOrderState == (int)EnumSchedullingWorkOrderState.receive)
+            if (!string.IsNullOrEmpty(BackReason))
             {
-                model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.neworder;
+                str = "，" + BackReason;
+            }
+            if (model.F_WorkOrderState == (int)EnumSchedullingWorkOrderState.revoked)
+            {
+                return Error("工单已经撤回");
+            }
+
+            model.F_WorkOrderState = (int)EnumSchedullingWorkOrderState.revoked;
                 model.F_DealDept = "";
                 model.F_DealMan = "";
                 model.F_Deadline = null;
                 model.F_AssignTime = null;
                 model.F_AssignUser = "";
                 model.F_UpdateTime = DateTime.Now;
+                model.F_Endtime = DateTime.Now;
 
+            baseBll.Update(model);
 
-                baseBll.Update(model);
-
-                ////催办次数改成0 
-                //BLL.T_Wo_CommonBase wcbll = new BLL.T_Wo_CommonBase();
-                //Model.T_Wo_CommonBase wcmodel = wcbll.GetModel(workordercode);
-                //wcmodel.F_UrgeCount = 0;
-                //wcmodel.F_UpdateTime = DateTime.Now;
-                //wcbll.Update(wcmodel);
+            string s = "\n原因:" + value + str;
 
-                AddOperatorLog("撤回了工单", (int)EnumOperatorType.retract, model.F_WorkOrderCode);
+            AddOperatorLogAboutKey("撤回了工单"+s, (int)EnumOperatorType.retract, model.F_WorkOrderCode,key,value, BackReason);
                 return Success("撤回操作成功");
-            }
-            else
-            {
-                return Error("只能撤回未接单的工单");
-            }
+             
         }
 
 
@@ -947,25 +948,36 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
         //chuliren收取急查标本
-        public ActionResult CollectSpecimens(string WorkOrderCode, string file ,string remark)
+        public ActionResult CollectSpecimens(string WorkOrderCode, string file ,string remark,int jcnum=0,int fjcnum=0)
         {
-            if (string.IsNullOrEmpty(file))
-            {
-                return Error("急查类型必须上传附件");
-            }
+            //if (string.IsNullOrEmpty(file))
+            //{
+            //    return Error("急查类型必须上传附件");
+            //}
 
             Model.T_IntegratedScheduling_Base model = baseBll.GetModel(WorkOrderCode);
+            
+
             if (model != null)
             {
+                //判断工单类型是否是急查标本
+                string sql = "select  F_GDId FROM  T_Sys_GongDan  where F_Name ='急查标本'";
+                string jctype = DbHelperSQL.GetSingle(sql).ToString();
+                if (model.F_WorkOrderCategory == jctype && jcnum == 0)
+                {
+                    return Error("急查标本数量需要大于0");
+                }
+
                 model.F_CollectFile = file;
                 model.F_CollectTime = DateTime.Now;
                 baseBll.Update(model);
-                string stradd = "";
+                string stradd = "收取急查标本：" + jcnum+",非急查标本："+fjcnum;
                 if (!string.IsNullOrEmpty(remark))
                 {
-                    stradd = "," + remark;
+                    stradd += "," + remark;
                 }
-                AddOperatorLog("收取标本"+stradd, (int)EnumOperatorType.collect, model.F_WorkOrderCode);
+
+                AddOperatorLog(stradd, (int)EnumOperatorType.collect, model.F_WorkOrderCode);
 
                 return Success("收取标本成功！");
             }
@@ -1009,7 +1021,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
 
-            return Success("");
+            return Success("送达成功");
 
         }
 

RMYY_CallCenter_Api/Models/Enum/EnumSchedullingWorkOrderState.cs

@@ -24,8 +24,10 @@ namespace RMYY_CallCenter_Api.Models.Enum
         dealed,      
 
         [Description("已完结")]
-        finish
-        
+        finish,
+        [Description("已撤销")]
+        revoked
+
 
 
     }