更新

RMYY_CallCenter_Api.Bll/T_Dis_WorkOrder.cs

@@ -141,7 +141,14 @@ namespace RMYY_CallCenter_Api.Bll
 
         #endregion  BasicMethod
         #region  ExtensionMethod
-
+        public DataSet GetListExpt(string strWhere)
+        {
+            return dal.GetListExpt(strWhere);
+        }
+        public bool CustomDelete(string idlist, string usercode)
+        {
+            return dal.CustomDelete(idlist, usercode);
+        }
         #endregion  ExtensionMethod
     }
 }

RMYY_CallCenter_Api.Model/T_Dis_WorkOrder.cs

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 
 namespace RMYY_CallCenter_Api.Model
 {
-
     /// <summary>
     /// T_Dis_WorkOrder:实体类(属性说明自动提取数据库字段的描述信息)
     /// </summary>
@@ -46,6 +45,15 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_deleteby;
         private DateTime? _f_deletetime;
         private DateTime? _f_finishtime;
+        private int? _f_isthird = 0;
+        private int? _f_islarge = 0;
+        private DateTime? _f_carrytime;
+        private string _f_finishman;
+        private string _f_finishmanname;
+        private string _f_finishmanphon;
+        private string _f_finishmantalkie;
+        private int? _f_senddeptid;
+        private string _f_senddeptname;
         /// <summary>
         /// 
         /// </summary>
@@ -127,7 +135,7 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_callid; }
         }
         /// <summary>
-        /// 红处方数量
+        /// 配送数量
         /// </summary>
         public int? F_DisNum
         {
@@ -286,6 +294,78 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_finishtime = value; }
             get { return _f_finishtime; }
         }
+        /// <summary>
+        /// 是否第三方
+        /// </summary>
+        public int? F_IsThird
+        {
+            set { _f_isthird = value; }
+            get { return _f_isthird; }
+        }
+        /// <summary>
+        /// 是否大件
+        /// </summary>
+        public int? F_Islarge
+        {
+            set { _f_islarge = value; }
+            get { return _f_islarge; }
+        }
+        /// <summary>
+        /// 搬运时间
+        /// </summary>
+        public DateTime? F_CarryTime
+        {
+            set { _f_carrytime = value; }
+            get { return _f_carrytime; }
+        }
+        /// <summary>
+        /// 工单确认人
+        /// </summary>
+        public string F_FinishMan
+        {
+            set { _f_finishman = value; }
+            get { return _f_finishman; }
+        }
+        /// <summary>
+        /// 确认人姓名
+        /// </summary>
+        public string F_FinishManName
+        {
+            set { _f_finishmanname = value; }
+            get { return _f_finishmanname; }
+        }
+        /// <summary>
+        /// 确认人电话
+        /// </summary>
+        public string F_FinishManPhon
+        {
+            set { _f_finishmanphon = value; }
+            get { return _f_finishmanphon; }
+        }
+        /// <summary>
+        /// 对讲机
+        /// </summary>
+        public string F_FinishManTalkie
+        {
+            set { _f_finishmantalkie = value; }
+            get { return _f_finishmantalkie; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_SendDeptId
+        {
+            set { _f_senddeptid = value; }
+            get { return _f_senddeptid; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_SendDeptName
+        {
+            set { _f_senddeptname = value; }
+            get { return _f_senddeptname; }
+        }
         #endregion Model
 
     }

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -0,0 +1,29 @@
+using RMYY_CallCenter_Api.Models.Enum;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using RMYY_CallCenter_Api.Utility;
+
+namespace RMYY_CallCenter_Api
+{
+    public static class WorkOrderBase
+    {
+
+
+        private static Bll.T_Dis_WorkOrderItem itembll = new Bll.T_Dis_WorkOrderItem();
+
+        public delegate string TranslationDelegate(int F_Id, string F_UserCode);
+
+        public static string GetDisStateName(int F_Id, string F_UserCode)
+        {
+            return EnumHelper.GetDescription((EnumDisWorkOrderState)itembll.GetModelList("F_WoID=" + F_Id + " and (F_CreateUser=" + F_UserCode + " or F_NextUser=" + F_UserCode + ")").OrderByDescending(pp => pp.F_ID).FirstOrDefault().F_OptType);
+        }
+        public static string GetStateName(TranslationDelegate delegats, int F_Id, string F_UserCode)
+        {
+            return delegats.Invoke(F_Id, F_UserCode);
+        }
+
+
+    }
+}

RMYY_CallCenter_Api/Controllers/CallTel/CallOutOptController.cs

@@ -50,7 +50,10 @@ namespace RMYY_CallCenter_Api.Controllers
                     //{//外地固话前加9 比如：9037188888517
                     //    fix = wfix;
                     //}
-                    fix = bfix;
+                    if (zip > 0)
+                    {
+                        fix = bfix;
+                    }
                 }
                 #endregion
                 var obj = new

RMYY_CallCenter_Api/Controllers/System/AddressBookController.cs

@@ -95,17 +95,17 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// 添加/修改通讯录
         /// </summary>
         /// <returns></returns>
-        public ActionResult SaveInfo(string name,string sex,string address,string email,string phone,string mobile,string elsemobile, string company,string depart,string positon,string remark,int id=0)
+        public ActionResult SaveInfo(string name, string sex, string mobile,string remark, string positon="", string depart="", string company="", string elsemobile="", string phone="", string email="", string address="", int id=0)
         {
             Model.T_Cus_AddressBook model = new Model.T_Cus_AddressBook();        
             if (string.IsNullOrEmpty(name))
             {
                 return Error("姓名不能为空");
             }
-            if (string.IsNullOrEmpty(depart))
-            {
-                return Error("单位不能为空");
-            }
+            //if (string.IsNullOrEmpty(depart))
+            //{
+            //    return Error("单位不能为空");
+            //}
             if (string.IsNullOrEmpty(mobile))
             {
                 return Error("手机号不能为空");
@@ -204,8 +204,6 @@ namespace RMYY_CallCenter_Api.Controllers.System
             }
         }
 
-
-
         /// <summary>
         /// 导入通讯录
         /// </summary>

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Mat_WorkOrderController.cs

@@ -6,7 +6,6 @@ using System.Data;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-
 namespace RMYY_CallCenter_Api.Controllers.WorkOrder
 {
     public class T_Mat_WorkOrderController : BaseController
@@ -106,7 +105,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             rows = modellist.Where(p => wokerlist.Contains(p.F_Id.ToString())).Select(p =>
                             new
                             {
-                                Wostate = EnumHelper.GetDescription((EnumMatWorkOrderState)itembll.GetModelList("F_WoID=" + p.F_Id + " and (F_CreateUser="+ua.F_UserCode+ " or F_NextUser="+ ua.F_UserCode + ")").OrderByDescending(pp => pp.F_ID).FirstOrDefault().F_OptType),
+                                Wostate = WorkOrderBase.GetStateName(GetMatStateName, p.F_Id,ua.F_UserCode),
                                 SitMan = p.F_ControlManName + '(' + p.F_ControlManName + ')',
                                 modellist = p
                             }),
@@ -180,6 +179,29 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
         }
 
 
+        //private string GetStateName(int type, int F_Id, string F_UserCode)
+        //{
+        //    string statename="";
+        //    switch (type)
+        //    {
+        //        case 1:
+
+        //            statename= EnumHelper.GetDescription((EnumMatWorkOrderState)itembll.GetModelList("F_WoID=" + F_Id + " and (F_CreateUser=" + F_UserCode + " or F_NextUser=" +F_UserCode + ")").OrderByDescending(pp => pp.F_ID).FirstOrDefault().F_OptType);
+        //            break;
+        //        case 2:
+
+        //            statename= EnumHelper.GetDescription((EnumMatWorkOrderState)itembll.GetModelList("F_WoID=" + F_Id + " and (F_CreateUser=" + F_UserCode + " or F_NextUser=" + F_UserCode + ")").OrderByDescending(pp => pp.F_ID).FirstOrDefault().F_OptType);
+        //            break;
+        //        default:
+        //            break;
+
+        //    }
+        //    return statename;
+        //}
+        public string GetMatStateName(int F_Id, string F_UserCode)
+        {
+            return EnumHelper.GetDescription((EnumMatWorkOrderState)itembll.GetModelList("F_WoID=" + F_Id + " and (F_CreateUser=" + F_UserCode + " or F_NextUser=" + F_UserCode + ")").OrderByDescending(pp => pp.F_ID).FirstOrDefault().F_OptType);
+        }
         /// <summary>
         /// 获取工单详情
         /// </summary>

RMYY_CallCenter_Api/Models/Enum/EnumDisWorkOrderState.cs

@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web;
+
+namespace RMYY_CallCenter_Api.Models.Enum
+{
+
+    /// <summary>
+    /// 工单状态枚举
+    /// </summary>
+    public enum EnumDisWorkOrderState
+    {
+        [Description("新工单待指派")]
+        neworder,
+        [Description("已指派待查收")]
+        assign,
+        [Description("已查收待处理")]
+        receive,
+        //[Description("已退回待处理")]
+        //reback,
+        //[Description("异常退回待接单")]
+        //abreback,
+        [Description("处理中")]
+        dealing,
+        [Description("已取红处方待取药")]
+        stayred,
+        [Description("已取药待完成")]
+        staydrug,
+        [Description("已取血待送达")]
+        takeblood,
+        [Description("已送达待完成")]
+        send,
+        [Description("已完成")]
+        end,
+        [Description("已处理待回访")]
+        dealed,
+        [Description("已回访待完结")]
+        visit,
+        [Description("已完结")]
+        finish = 10,
+        [Description("已评价")]
+        evaluate,
+        //[Description("已退回待指派")]
+        //reassign,
+    }
+
+    /// <summary>
+    /// 工单记录类型枚举
+    /// </summary>
+    public enum EnumDisItemType
+    {
+        [Description("办理")]
+        deal = 1,
+        [Description("催办")]
+        urge = 2,
+        [Description("评价")]
+        evaluate = 3,
+        [Description("修改")]
+        update = 4,
+        [Description("删除")]
+        delete = 5,
+        [Description("回访")]
+        visit = 6,
+        [Description("审批")]
+        audit = 7,
+        [Description("延期")]
+        Delay = 8,
+    }
+    /// <summary>
+    /// 工单记录操作
+    /// </summary>
+    public enum EnumDisItemOpt
+    {
+        [Description("添加")]
+        create,
+        [Description("指派")]
+        assign,
+        [Description("查收")]
+        receive,
+        [Description("处理")]
+        deal,
+        [Description("取红处方")]
+        stayred,
+        [Description("取药")]
+        staydrug,
+        [Description("取血")]
+        takeblood,
+        [Description("送达")]
+        send,
+        [Description("完成")]
+        end,
+        [Description("处理完结")]
+        over,
+        [Description("评价")]
+        evaluate,
+        [Description("修改")]
+        update,
+        [Description("删除")]
+        delete
+
+    }
+
+}