工单修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -1,11 +1,14 @@
 using CallCenter.Utility;
+using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using CallCenterApi.Interface.Models.Enum;
 using CallCenterApi.Interface.Models.Input;
+using CallCenterApi.Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Web;
@@ -30,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         public ActionResult GetList(string code, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int source=0,int type = 0, int state=0, int pageindex = 1,int pagesize = 10)
+            string country, string township, string touser, int source=0,int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
            
               int userId = CurrentUser.UserData.F_UserId;
@@ -75,7 +78,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             uwhere = "";
                         }
-                        sql += $" and F_State=" + (int)EnumWorkOrderState.neworder + " " + uwhere;
+                        sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign +")"+ " " + uwhere;
+                    //    sql +=  "and T_Wo_WorkOrder.F_ID in (" + GetBackWorkOrderID(ua.F_UserCode) + ") ";
                         break;
                     case 1://待接单的
                       if (GetDJDWorkOrderID(ua.F_UserCode)!="")
@@ -234,6 +238,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
         }
         /// <summary>
+        /// 获取异常
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public string GetBackWorkOrderID(string user)
+        {
+            string str = string.Empty;
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_NextUser='" + user + "' " + " and  F_WoState=" + (int)EnumWorkOrderState.reback + " " + " and isnull(F_IsUsed,'0')='0' "; ;
+              
+            return str;
+        }
+        /// <summary>
         /// 获取我参与的工单编号
         /// </summary>
         /// <param name="user"></param>
@@ -334,7 +350,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_IsDelete=0";
                     list = workOrder.GetModelList(sql);
                 }
-                var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
+                var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
 
                 if (list.Count > 0)
                 {
@@ -366,10 +382,45 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
         }
         /// <summary>
+        /// 查询工单记录列表
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public ActionResult GetItemList(int id, int type=1)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                  if (id <=0)
+                    return Error("请输入正确的id");
+                var itemlasts = itembll.GetModelList("  F_ItemType=" + type + " and  F_WoID=" + id + " ");
+                if (itemlasts != null)
+                {
+                        var obj = new
+                        {
+                            state = "success",
+                            message = "成功",
+                            rows = itemlasts,
+                            total = itemlasts.Count,
+                        };
+                        return Content(obj.ToJson());
+                }
+                else
+                {
+                    return Error("暂无工单记录");
+                }
+            }
+            {
+                return Error("无操作权限！");
+            }
+
+        }
+        /// <summary>
         ///综合查询列表
         /// </summary>
         public ActionResult GetComprehensive(string code, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int source = 0, int type = 0, int pageindex = 1, int pagesize = 10)
+            string country, string township, string touser, int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -379,8 +430,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 筛选条件
                 if (type > 0 && type < 4)//工单类型
                     sql += $" and F_Type=" + type;
-            //    if (state >= 0)//工单状态
-           //         sql += $" and F_State=" + state;
+              if (state >= 0)//工单状态
+                   sql += $" and F_State=" + state;
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
@@ -405,53 +456,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY")
                 {
-                    sql +=  " and F_DealBy = '" + ua.F_UserCode + "' ";
-                }
-                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")";
-                sql += $" and F_IsOver=" + 1;
-                #endregion
-                int recordCount = 0;
-                if (!string.IsNullOrWhiteSpace(sql))
-                {
-
-                    dt = BLL.PagerBLL.GetListPager(
-                        "T_Wo_WorkOrder",
-                        "F_ID",
-                        "*",
-                        sql,
-                        "ORDER BY T_Wo_WorkOrder.F_ID desc",
-                        pagesize,
-                        pageindex,
-                        true,
-                        out recordCount);
-                }
-                int total = 0;
-                List<long> woid = new List<long>();
-                List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
-                List<Model.T_Wo_WorkOrder> list = new List<Model.T_Wo_WorkOrder>();
-             
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" )
-                {
-                    if (modlelist.Count > 0)
-                    {
-                        foreach (var it in modlelist)
-                        {
-                            if (it.F_DealBy == ua.F_UserCode)
-                            {
-                                    list.Add(it);
-                                    total++;
-                            }
-                        }
-                    }
+                    sql += " and F_DealBy = '" + ua.F_UserCode + "' ";
                 }
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG")
                 {
-                    List<int> detpid = new List<int>();
+                    string detpid = "";
                     var deparmentlist = new List<Model.T_Sys_Department>();
                     Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
                     if (dModel != null)
                     {
-
                         if (dModel.F_Layer == 1)
                         {
                             deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
@@ -459,43 +472,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 foreach (var it in deparmentlist)
                                 {
-                                    detpid.Add(it.F_DeptId);
-
-                                }
-                            }
-                        }
-                        detpid.Add(dModel.F_DeptId);
-                        var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' " + " ");
-                        if (itemlast.Count > 0)
-                        {
-                            foreach (var it in itemlast)
-                            {
-                                for (int i = 0; i < detpid.Count; i++)
-                                {
-                                    if (it.F_NextDept == detpid[i])
+                                    if (detpid != "")
                                     {
-                                        woid.Add(it.F_WoID);
+                                        detpid += "," + it.F_DeptId;
                                     }
                                 }
                             }
                         }
-                        if (modlelist.Count > 0 && woid.Count > 0)
+                        else
                         {
-                            foreach (var it in modlelist)
-                            {
-                                for (int i = 0; i < woid.Count; i++)
-                                {
-                                    if (it.F_ID == woid[i])
-                                    {
-                                        if (it.F_IsOver == 1)
-                                        {
-                                            list.Add(it);
-                                            total++;
-                                        }
-                                    }
-                                }
-                            }
+                            detpid = ua.F_DeptId.ToString();
                         }
+                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
 
                     }
                     else
@@ -503,37 +491,38 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("加载失败");
                     }
                 }
-                else if (ro.F_RoleCode == "QTJS")
-                {
-                    return Error("无操作权限！");
-                }
-                else
+                #endregion
+                int recordCount = 0;
+                if (!string.IsNullOrWhiteSpace(sql))
                 {
-                    if (modlelist.Count > 0)
-                    {
-                        foreach (var it in modlelist)
-                        {
-                                list.Add(it);
-                                total++;
-                        }
-                    }
+
+                    dt = BLL.PagerBLL.GetListPager(
+                        "T_Wo_WorkOrder",
+                        "F_ID",
+                        "*",
+                        sql,
+                        "ORDER BY T_Wo_WorkOrder.F_ID desc",
+                        pagesize,
+                        pageindex,
+                        true,
+                        out recordCount);
                 }
-                if (list.Count > 0)
+                List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
+                if (modlelist.Count > 0)
                 {
-                    List<WorkOrderNewInput> Input = modeltooip(list);
+                    List<WorkOrderNewInput> Input = modeltooip(modlelist);
                     var obj = new
                     {
                         state = "success",
                         message = "成功",
                         rows = Input,
-                        total = total
+                        total = recordCount
                     };
 
                     return Content(obj.ToJson()); ;
                 }
                 else
                 {
-
                     return Success("暂无工单"); ;
                 }
             }
@@ -666,9 +655,236 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 工单导入
         /// 导入excel
         /// </summary>
-        public ActionResult ImportExcel()
+        public ActionResult ImportExcel(int type)
         {
-            return null;
+            string usercode = CurrentUser.UserData.F_UserCode;
+            string ip = DTRequest.GetIP();
+            if (!string.IsNullOrWhiteSpace(usercode))
+            {
+                HttpPostedFile _upFile = RequestString.GetFile("upFile");
+                if (_upFile != null)
+                {
+                    int headrow = 0;
+                    #region 上传文件
+                    string filepath = "";
+                    string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+                    string aLastName = Path.GetExtension(_upFile.FileName);
+                    string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+                    if (aLastName != ".xls" && aLastName != ".xlsx")
+                    {
+                        return Error("文件类型错误，请选择Excel文件");
+                    }
+                    string newpath = datepath + "_" + _upFile.FileName;
+                    if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+                    {
+                        Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+                    }
+                    filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+                    string PhysicalPath = Server.MapPath(filepath);
+                    _upFile.SaveAs(PhysicalPath);
+                    #endregion
+                    #region 添加附件日志
+                    Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                    model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                    model_T_Sys_Accessories.F_FileName = newpath;//附件名称
+                    model_T_Sys_Accessories.F_FileType = aLastName;//附件类型
+                    model_T_Sys_Accessories.F_FileUrl = filepath;//附件地址
+                    model_T_Sys_Accessories.F_UserCode = usercode;//上传人  
+                    model_T_Sys_Accessories.F_OriName = oriname;
+                    int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                    #endregion
+                    NPOIHelper np = new NPOIHelper();
+                    DataTable dt = np.ExcelToTable(_upFile, headrow);
+                    string msg = string.Empty;
+                    if (dt == null || dt.Rows.Count == 0)
+                        return Error("文件没有数据");
+                    else
+                    {
+                        Model.T_Wo_WorkOrder dModel = new Model.T_Wo_WorkOrder();
+                        dModel.F_State =13 ;
+                        dModel.F_CreateBy = usercode;
+                        dModel.F_IsDelete = 0;
+                        dModel.F_Source = "4";
+                        dModel.F_Files = fid.ToString ();
+                        dModel.F_WorkOrderCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");  //工单编号  
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            #region 数据入库
+                            headrow = headrow + 1;
+
+                            if (type>0)
+                            {
+                                #region 基本字段
+                                dModel.F_CusName = dr["客户姓名"].ToString();
+                                dModel.F_CusPhone = dr["客户电话"].ToString();
+                                dModel.F_CompanyName = dr["公司名称"].ToString();
+                                dModel.F_IncidentProvince = dr["省"].ToString();
+                                dModel.F_IncidentCity = dr["市"].ToString();
+                                dModel.F_IncidentCountry = dr["县"].ToString();
+                                dModel.F_IncidentTownship = dr["乡"].ToString();
+                                dModel.F_IncidentDetailed = dr["详细地址"].ToString();
+                                dModel.F_SalesBase = dr["销售基地"].ToString();
+                                dModel.F_Description = dr["问题描述"].ToString();
+                                dModel.F_QuestionType = dr["问题类别"].ToString();
+                                dModel.F_DealType = dr["处理方式"].ToString();
+                                dModel.F_DealBy = dr["处理人"].ToString();
+                                dModel.F_DealTime = DateTime.Parse(dr["处理时间"].ToString());
+                                dModel.F_DealContent = dr["处理内容"].ToString();
+                                dModel.F_DealResult = dr["处理结果"].ToString();
+                                dModel.F_DealReasons = dr["未处理原因"].ToString();
+                                dModel.F_CreateOn = DateTime.Parse(dr["创建时间"].ToString());
+                                #endregion
+                                #region
+                                if (type ==1)
+                                {
+                                    dModel.F_Type ="1";
+                                    dModel.F_ZX_ProName = dr["产品名称"].ToString();
+                                    dModel.F_ZX_Quantity = dr["问题数量"].ToString();
+                                    dModel.F_ZX_Area = dr["大区"].ToString();
+                                    dModel.F_ZX_Branch = dr["分公司"].ToString();
+                                }
+                                #region 
+                                else if (type == 2)
+                                {
+                                    dModel.F_Type = "2";
+                                  if (dr["客户编号"].ToString()!="")
+                                    {
+                                        if (valcode(dr["客户编号"].ToString(), 10))
+                                        {
+                                            dModel.F_CustomerID = int.Parse(dr["客户编号"].ToString());
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，客户编号为10位纯数字，未导入<br>";
+                                            return Error(msg);
+                                        }
+                                    }
+                                    if (dr["物料编码"].ToString() != "")
+                                    {
+                                        if (valcode(dr["物料编码"].ToString(), 11))
+                                        {
+                                            dModel.F_ZX_Quantity = dr["物料编码"].ToString();
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，物料编码为11位纯数字，未导入<br>";   
+                                            return Error(msg);
+                                        }
+                                    }
+                                    if (dr["生产批次号"].ToString() != "")
+                                    {
+                                        if (vaBatchNumber(dr["生产批次号"].ToString()))
+                                        {
+                                            dModel.F_BatchNumber = dr["生产批次号"].ToString();
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，生产批次号错误，未导入<br>";
+                                            return Error(msg);
+                                        }
+                                    }
+
+                                    dModel.F_TS_Formula = dr["配方"].ToString();
+                                    dModel.F_TS_Category = dr["产品种类"].ToString();
+                                    dModel.F_TS_Quantity = dr["问题数量"].ToString();
+                                    dModel.F_TS_Level = dr["重要级别"].ToString();
+                                    dModel.F_SC_ProductBase = dr["生产基地"].ToString();
+                                    dModel.F_SC_QualityMonth = dr["超出质保期限"].ToString();
+                                    dModel.F_SC_PreliminaryOpinion = dr["初审意见"].ToString();
+                                    dModel.F_ZL_QualityEventLevel = dr["质量事件等级"].ToString();
+                                    dModel.F_ZL_ClaimAmount = dr["索赔金额"].ToString();
+                                    dModel.F_ZL_ResponsibleUnit = dr["责任单位"].ToString();
+                                    dModel.F_ZL_ApprovalOpinions = dr["审批意见"].ToString();
+                                    dModel.F_ZL_ApprovalDisagree = dr["不同意意见"].ToString();
+                                    dModel.F_ZL_CompensationMethod = dr["补偿方式"].ToString();
+                                    dModel.F_ZL_CompensationMoney = dr["补偿钱款"].ToString();
+                                    dModel.F_ZL_CResponsibleUnits = dr["对应责任单位"].ToString();
+                                    dModel.F_ZL_Fquantity = dr["确认实收数量"].ToString();
+                                    dModel.F_ZL_ImprovementRequirements = dr["改进要求"].ToString();
+                                    dModel.F_ZL_CApprovalNo = dr["对应审批工作流单号"].ToString();
+                                }
+                                #endregion
+                                #region 
+                                else if (type == 3)
+                                {
+                                    dModel.F_Type = "3";
+                                    if (dr["客户编号"].ToString() != "")
+                                    {
+                                        if (valcode(dr["客户编号"].ToString(), 10))
+                                        {
+                                            dModel.F_CustomerID = int.Parse(dr["客户编号"].ToString());
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，客户编号为10位纯数字，未导入<br>";
+                                            return Error(msg);
+                                        }
+                                    }
+                                    if (dr["物料编码"].ToString() != "")
+                                    {
+                                        if (valcode(dr["物料编码"].ToString(), 11))
+                                        {
+                                            dModel.F_ZX_Quantity = dr["物料编码"].ToString();
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，物料编码为11位纯数字，未导入<br>";
+                                            return Error(msg);
+                                        }
+                                    }
+                                    if (dr["生产批次号"].ToString() != "")
+                                    {
+                                        if (vaBatchNumber(dr["生产批次号"].ToString()))
+                                        {
+                                            dModel.F_BatchNumber = dr["生产批次号"].ToString();
+                                        }
+                                        else
+                                        {
+                                            msg = msg + "第" + headrow + "行，生产批次号错误，未导入<br>";
+                                            return Error(msg);
+                                        }
+                                    }
+                                    dModel.F_CJ_Time =DateTime .Parse ( dr["抽检时间"].ToString());
+                                    dModel.F_CJ_Level = dr["抽检级别"].ToString();
+                                    dModel.F_CJ_Unit = dr["抽检单位"].ToString();
+                                    dModel.F_CJ_TestUnit = dr["化验单位"].ToString();
+                                    dModel.F_CJ_Tonnage = dr["抽检吨数"].ToString();
+                                    dModel.F_CJ_BagNo = dr["抽检袋数"].ToString();
+                                    dModel.F_SC_ProductBase = dr["生产基地"].ToString();
+                                    dModel.F_SC_CJ_SpotResult = dr["抽检结果"].ToString();
+                                    dModel.F_SC_CJ_SelfResult = dr["自检结果"].ToString();
+                                    dModel.F_SC_CJ_ApprovalNo = dr["对应审批工作流单号"].ToString();
+                                    dModel.F_SC_CJ_ReturnAccount = dr["确认返账金额"].ToString();
+                                    dModel.F_ZL_CJ_IsRecord = dr["是否备案"].ToString();
+                                }
+                                #endregion
+                                #endregion
+                                var res = workOrder .Add(dModel);
+                                    if (res > 0)
+                                    {
+                                    addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                                    }
+                                    else
+                                    {
+
+                                        msg = msg + "第" + headrow + "行，导入失败<br>";
+                                    }
+                             
+                                
+                            }
+                            else
+                                msg = msg + "第" + headrow + "行，未选择工单类型，未导入<br>";
+                            #endregion
+                        }
+                        if (string.IsNullOrEmpty(msg))
+                            return Success("导入成功 ");
+                        else
+                            return Error(msg);
+                    }
+                }
+                return Error("数据源上传失败");
+            }
+            return Error("用户登录失败，请重新登录");
         }
         /// <summary>
         /// 更新工单
@@ -788,6 +1004,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
         }
         /// <summary>
+        /// 操作日志
+        /// </summary>
+        /// <param name="usercode">操作人工号</param>
+        /// <param name="ip">操作人IP</param>
+        /// <param name="optcode">操作编号</param>
+        /// <param name="optid">操作id</param>
+        /// <param name="des">操作描述</param>
+        private void addoptlog(string usercode, string ip, string optcode, string optid, string des)
+        {
+            new BLL.T_Sys_OperateLogs().AddOptLog("客户管理", usercode, ip, des, optcode, "T_Cus_CustomerBaseNew", optid);
+        }
+        /// <summary>
         /// 添加工单
         /// </summary>
         /// <returns></returns>
@@ -800,7 +1028,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
 
                 #region 添加验证判断
-                if (!(input.F_Type > 0 && input.F_Type < 4))
+                if (!(input.F_Type> 0 && input.F_Type < 4))
                     return Error("工单类型错误！");
                 if (input .F_State ==2&&!vaBatchNumber(input .F_BatchNumber ))
                     return Error("请输入正确的工单批次号！");
@@ -899,9 +1127,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 添加验证判断
                 if (input.F_ID <= 0)
                     return Error("参数错误！");
-                if (!(input.F_Type > 0 && input.F_Type < 4))
+                if (!(input.F_Type> 0 && input.F_Type < 4))
                     return Error("工单类型错误！");
-                if (input.F_State == 2 && !vaBatchNumber(input.F_BatchNumber))
+                if (input.F_State== 2 && !vaBatchNumber(input.F_BatchNumber))
                     return Error("请输入正确的工单批次号！");
                 if (input.F_Type == 1 || input.F_Type == 3)
                 {
@@ -1025,8 +1253,84 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #region 基本字段
                     model.F_ID = model1[i].F_ID;//
                     model.F_WorkOrderCode = model1[i].F_WorkOrderCode;//工单编号
-                    model.F_Source =int .Parse (  model1[i].F_Source );//工单来源
-                    model.F_Type =int .Parse ( model1[i].F_Type ) ;//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    #region
+                    model.F_Source =int .Parse ( model1[i].F_Source);//工单来源
+                    if (model1[i].F_Source=="1")
+                    {
+                        model.F_SourceName = "电话";
+                    }
+                    else if (model1[i].F_Source == "2")
+                    {
+                        model.F_SourceName = "微信业务员";
+                    }
+                    else if (model1[i].F_Source == "3")
+                    {
+                        model.F_SourceName = "微信客户";
+                    }
+                    else
+                    {
+                        model.F_SourceName = "官网";
+                    }
+
+                    model.F_Type =int .Parse ( model1[i].F_Type);//工单来源
+                    if (model1[i].F_Type == "1")
+                    {
+                        model.F_TypeName = "咨询";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    else if (model1[i].F_Type == "2")
+                    {
+                        model.F_TypeName = "投诉";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    else
+                    {
+                        model.F_TypeName = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    model.F_State = model1[i].F_State;
+                    if (model1[i].F_State ==0)//工单状态
+                    {
+                        model.F_StateName = "待指派";
+                    }
+                    else if (model1[i].F_State == 1)
+                    {
+                        model.F_StateName = "待接单";
+                    }
+                    else if (model1[i].F_State == 2)
+                    {
+                        model.F_StateName = "待处理";
+                    }
+                    else if (model1[i].F_State == 3)
+                    {
+                        model.F_StateName = "已退回";
+                    }
+                    else if (model1[i].F_State == 4)
+                    {
+                        model.F_StateName = "异常退回";
+                    }
+                    else if (model1[i].F_State == 5)
+                    {
+                        model.F_StateName = "处理中";
+                    }
+                    else if (model1[i].F_State == 6)
+                    {
+                        model.F_StateName = "待回访";
+                    }
+                    else if (model1[i].F_State == 7)
+                    {
+                        model.F_StateName = "待完结";
+                    }
+                    else if (model1[i].F_State == 10)
+                    {
+                        model.F_StateName = "已完结";
+                    }
+                    else if (model1[i].F_State == 11)
+                    {
+                        model.F_StateName = "已评价";
+                    }
+                    else
+                    {
+                        model.F_StateName = "已退回";
+                    }
+                    #endregion
                     model.F_CusName = model1[i].F_CusName;//客户姓名
                     model.F_CusPhone = model1[i].F_CusPhone;//客户电话
                     model.F_CompanyName = model1[i].F_CompanyName;//公司名称
@@ -1062,7 +1366,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_CJ_Tonnage = model1[i].F_CJ_Tonnage;//抽检-抽检吨数
                     model.F_CJ_BagNo = model1[i].F_CJ_BagNo;//抽检-抽检袋数
                     model.F_CJ_Outlay = model1[i].F_CJ_Outlay;//抽检-公关费用金额：单位元
-                    model.F_State = model1[i].F_State;//工单状态
+                   
                     model.F_DealBy = model1[i].F_DealBy;//处理人
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
                     model.F_DealContent = model1[i].F_DealContent;//处理内容
@@ -1299,7 +1603,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_CJ_Outlay = input.F_CJ_Outlay;//抽检-公关费用金额：单位元】
             if (type ==1)
             {
-                model.F_State = input.F_State;//工单状态
+                model.F_State =input.F_State;//工单状态
                 model.F_CreateOn = input.F_CreateOn;//添加时间
                 model.F_CreateBy = input.F_CreateBy;//添加人
                 model.F_UpdateBy = usercode;//修改人工号
@@ -1806,7 +2110,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (itemid > 0)
             {
                 #region 处理工单
-                model.F_State  = wostate;
+                if (model .F_State == (int)EnumWorkOrderState.assign) 
+                {
+                    model.F_State = (int)EnumWorkOrderState.reassign;
+                }
+                else
+                {
+                    model.F_State = wostate;
+                }
                 workOrder  .Update(model);
                 #endregion
                 #region 推送消息

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -31,6 +31,10 @@ namespace CallCenterApi.Interface.Models.Enum
         finish=10,
         [Description("已评价")]
         evaluate,
+        [Description("已退回待指派")]
+        reassign,
+        [Description("导入工单")]
+        usedimport,
     }
     /// <summary>
     /// 工单记录类型枚举

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -21,21 +21,35 @@ namespace CallCenterApi.Interface.Models.Input
             /// <summary>
             /// 工单来源:电话、微信业务员、微信客户、官网
             /// </summary>
-            public int    F_Source
+            public int      F_Source
             {
                 get; set;
             }
-            /// <summary>
-            /// 工单类型:咨询及需求、投诉、抽检、其他
-            /// </summary>
-            public int  F_Type
+        /// <summary>
+        /// 工单来源:电话、微信业务员、微信客户、官网
+        /// </summary>
+         public string F_SourceName
+         {
+            get; set;
+        }
+        /// <summary>
+        /// 工单类型:咨询及需求、投诉、抽检、其他
+        /// </summary>
+        public int      F_Type
             {
                 get; set;
             }
-            /// <summary>
-            /// 客户姓名
-            /// </summary>
-            public string F_CusName
+        /// <summary>
+        /// 工单类型:咨询及需求、投诉、抽检、其他
+        /// </summary>
+        public string F_TypeName
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 客户姓名
+        /// </summary>
+        public string F_CusName
             {
                 get; set;
             }
@@ -328,7 +342,14 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 工单状态
         /// </summary>
-        public int? F_State
+        public int?  F_State
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public string F_StateName
         {
             get; set;
         }