工单修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -129,6 +129,37 @@ namespace CallCenterApi.Interface.Controllers.customer
 
         }
         /// <summary>
+        ///根据客户编码获取客户信息
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetCodeCustomer(string  code)
+        {
+            var list = new List<Model.T_Cus_CustomerBaseNew>(); DataTable dt = new DataTable();
+            string sql = "  F_IsDelete=0";
+            if (!string.IsNullOrWhiteSpace(code))//客户编号
+            {
+                if (valcode(code))
+                    sql += " and F_CustomerCode=" + code.Trim() + " ";
+                list = cusbll.GetModelList(sql);
+                if (list.Count > 0)
+                {
+                    List<CustomerBaseNewInput> Input = modeltooip(list);
+                    if (Input != null)
+                        return Success("获取成功", Input.FirstOrDefault());
+                    else
+                        return Error("没有获取到客户信息，请检查客户编号");
+                }
+                else
+                {
+                    return Error("没有获取到客户信息，请检查客户编号");
+                }
+            }
+            else
+            {
+                return Error("参数传输失败");
+            }
+        }
+        /// <summary>
         /// 获取客户信息
         /// </summary>
         /// <returns></returns>

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

@@ -56,6 +56,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             return Content(obj.ToJson());
         }
+        //根据物料编码获取物料信息
+        public ActionResult GetCodeModel(string code)
+        {
+            if (code != null && code.Trim() != "")
+            {
+                Model.T_Wo_MaterialManage dModel = mmBLL.GetModel(code.Trim());
+                if (dModel != null)
+                {
+                    var dvList = dvBLL.GetModelList(" F_DictionaryFlag in ('WLPP','WLFHFFX','WLCPX') ");
+                    var createusername = userBLL.GetModel(dModel.F_CreateBy);
+                    var obj = new
+                    {
+                        model = dModel,
+                        CreateByName = createusername
+                    };
+
+                    return Success("获取物料信息成功", obj);
+                }
+                else
+                {
+                    return Error("获取物料信息失败");
+                }
+            }
+            else
+            {
+                return Error("获取参数失败");
+            }
+        }
 
         //获取物料
         public ActionResult GetModel(string id)

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

@@ -32,7 +32,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code, string cusname, string cusphone, string companyname, string province, string city,
+        public ActionResult GetList(string code, string cusname, string cusphone,string keywords, string companyname, string province, string city,
             string country, string township, string touser, int source=0,int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
            
@@ -48,6 +48,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
+                    sql += $"  and F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
@@ -286,12 +288,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetDeptWorkOrderID(string user)
         {
             string str = string.Empty;
-
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType in(" + (int)EnumItemType.deal + "," + (int)EnumItemType.urge +")"
-                + " and ("
-                    + "(F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")"
-                     + "(F_NextDept in(" + user+ ")"
+           
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType in(" + (int)EnumItemType.deal + "," + (int)EnumItemType.urge + ")"
+                + " and "
+                    + "F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")"+ " and  "
+                     + "F_NextDept in(" + user+ ")"
                 + " and isnull(F_IsUsed,'0')='0' ";
 
             return str;
@@ -419,7 +421,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         ///综合查询列表
         /// </summary>
-        public ActionResult GetComprehensive(string code, string cusname, string cusphone, string companyname, string province, string city,
+        public ActionResult GetComprehensive(string code, string cusname,string keywords, string cusphone, string companyname, string province, string city,
             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;
@@ -438,6 +440,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
+                    sql += $"  and F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -456,7 +460,7 @@ 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_DealBy like '%" + ua.F_UserCode.Trim() + "%'";
                 }
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG")
                 {
@@ -476,6 +480,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     {
                                         detpid += "," + it.F_DeptId;
                                     }
+                                    else
+                                    {
+                                        detpid="" + it.F_DeptId;
+                                    }
                                 }
                             }
                         }
@@ -483,8 +491,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             detpid = ua.F_DeptId.ToString();
                         }
-                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
+                        if (GetDeptWorkOrderID(detpid) != "")
+                        {
+                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
+                        }
+                        else
+                        {
 
+                            return Success("暂无工单"); ;
+                        }
                     }
                     else
                     {
@@ -534,7 +549,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 查询超时工单列表
         /// </summary>
-        public ActionResult GetOvertime(string code, string cusname, string cusphone, string companyname, string province, string city,
+        public ActionResult GetOvertime(string code,string keywords, 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)
         {
             int userId = CurrentUser.UserData.F_UserId;
@@ -555,6 +570,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
+                    sql += $"  and F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
@@ -576,7 +593,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
                 {
-                    sql += " and F_DealBy = '" + ua.F_UserCode;
+                    sql += $" and F_DealBy like '%" + ua.F_UserCode.Trim() + "%'";
                 }
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
                 {
@@ -596,6 +613,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     {
                                         detpid += "," + it.F_DeptId;
                                     }
+                                    else
+                                    {
+                                        detpid= ""+it.F_DeptId; ;
+                                    }
                                 }
                             }
                         }
@@ -603,7 +624,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             detpid = ua.F_DeptId.ToString ();
                         }
-                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") ";
+                        if (GetDeptWorkOrderID(detpid) != "")
+                        {
+                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid) + ") "; ;
+                        }
+                        else
+                        {
+
+                            return Success("暂无工单"); ;
+                        }
+                       
                     }
                     else
                     {
@@ -926,8 +956,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取催办工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetUrgeList(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 = -1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetUrgeList(string code, string cusname,string keywords, string cusphone, string companyname, string province, string city,
+            string country, string township, string touser,int source=-1, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10)
         {
            
             int userId = CurrentUser.UserData.F_UserId;
@@ -949,6 +979,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
                     sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
+                    sql += $"  and F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
                 if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
                     sql += $" and F_CusPhone like '%" + cusphone.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(companyname))//公司名称
@@ -982,15 +1014,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         var list = itembll.GetList(" F_WoID ='" + dr["ID"].ToString() + "' and F_ItemType=" + (int)EnumItemType.urge).Tables[0];
                         dr["CBCount"] = list.Rows.Count;
                     }
-
-                    var obj = new
+                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
+                    List<WorkOrderNewInput> Input = modeltooip(modlelist);
+                    if (Input != null )
                     {
-                        state = "success",
-                        message = "成功",
-                        rows = dt,
-                        total = recordCount
-                    };
-                    return  Content(obj.ToJson());
+                        var obj = new
+                        {
+                            state = "success",
+                            message = "成功",
+                            rows = Input,
+                            total = recordCount
+                        };
+                        return Content(obj.ToJson());
+                    }
+                    else
+                    {
+                        return Success("暂无工单"); ;
+                    }
+
                 }
                 else
                 {
@@ -1409,11 +1450,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        private int  TimeToOver(int id)
+        private float TimeToOver(int id)
         {
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
             string time1 = "", time2 = ""; int x = 0, y = 0;
-            int time = 0;
+            float  time = 0;
             if (itemlasts.Count > 0)
             {
                 for (int i = 0; i < itemlasts.Count; i++)
@@ -1424,7 +1465,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             x = i;
                             time1 = itemlasts[i].F_CreateTime.ToString();
-                            time = int.Parse(itemlasts[i].F_LimitTime);
+                            time = float .Parse(itemlasts[i].F_LimitTime);
                         }
                         if (itemlasts[i].F_WoState == 10)
                         {
@@ -1439,14 +1480,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (x > y)
                         {
-                            int a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            int b = time - a;
+                            float a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
+                            float  b = time - a;
                             return b;
                         }
                         else
                         {
-                            int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            int b = time - a;
+                            float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
+                            float b = time - a;
                             return b;
                         }
                     }
@@ -1457,8 +1498,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else if (time1 != "")
                 {
-                    int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    int b = time - a;
+                    float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
+                    float b = time - a;
                     return b;
                 }
                 else
@@ -1481,7 +1522,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
             string  time1="", time2="" ;int x=0, y=0;
-            int time = 0;
+            float  time = 0;
             if (itemlasts.Count > 0)
             {
                 for (int i=0;i < itemlasts.Count;i++)
@@ -1492,7 +1533,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             x = i;
                             time1 = itemlasts[i].F_CreateTime.ToString();
-                            time = int.Parse(itemlasts[i].F_LimitTime);
+                            time = float .Parse(itemlasts[i].F_LimitTime);
                         }
                         if (itemlasts[i].F_WoState == 10)
                         {
@@ -1919,7 +1960,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult DelayWorkOrder(long orderid, string cont, int limit = 0)
+        public ActionResult DelayWorkOrder(long orderid, string cont, float  limit = 0)
         {
             //办理人员和监管可以延期工单
             int userId = CurrentUser.UserData.F_UserId;
@@ -2022,10 +2063,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 延期工单
         /// </summary>
-        public bool DeWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, int limit)
+        public bool DeWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, float  limit)
         {
             #region 工单处理
-          int  sms = 0; int wostate = 0; int optbut = 0;int time = 0;
+          int  sms = 0; int wostate = 0; int optbut = 0;float  time = 0;
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -2034,7 +2075,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (it.F_WoState == 1)
                     {
                         sms = int.Parse(it.F_IsSMS.ToString());
-                        time = int.Parse(it.F_LimitTime);
+                        time = float .Parse(it.F_LimitTime);
                     }
                     itembll.Update(it);
                     wostate = int.Parse(it.F_WoState.ToString());