调度

RMYY_CallCenter_Api.Dal/T_Car_AssignWorkOrder.cs

@@ -53,7 +53,7 @@ namespace RMYY_CallCenter_Api.DAL
             strSql.Append("@F_WorkOrderID,@F_DriverCode,@F_DriverName,@F_CarId,@F_CarName,@F_DepartPlace,@F_Destination,@F_CreateTime,@F_CloseTime,@F_State,@F_CreateUser,@F_IsDelete)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_WorkOrderID", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_WorkOrderID", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_DriverCode", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_DriverName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_CarId", SqlDbType.Int,4),
@@ -109,7 +109,7 @@ namespace RMYY_CallCenter_Api.DAL
             strSql.Append("F_IsDelete=@F_IsDelete");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_WorkOrderID", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_WorkOrderID", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_DriverCode", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_DriverName", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_CarId", SqlDbType.Int,4),

RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -29,28 +29,25 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
         /// <param name="pagesize"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        public ActionResult GetList( string starttime = "", string endtime = "", int type = 0, int pageindex = 1, int pagesize = 10, int state = -1)
+        public ActionResult GetList( string starttime = "", string endtime = "", string WorkOrderCode = "", int type = 0, int pageindex = 1, int pagesize = 10, int state = -1)
 
         {
             if (User!=null)
             {
                 DataTable data = new DataTable();
                 string sql = "";
-                //if (User.F_UserCode != "8000")
-                //{
-                //    sql += $" and F_AssistMan=" + User.F_UserCode;
-                //}
                 if (type > 0)
                     sql += $" and F_Type=" + type;
                 if (starttime.Trim() != "" && starttime != "undefined")
                     sql += $" and datediff(day,F_CreateTime,'" + starttime + "')<=0";
                 if (endtime.Trim() != "" && endtime != "undefined")
                     sql += $" and datediff(day,F_CreateTime,'" + endtime + "')>=0";
+                if (WorkOrderCode.Trim() != "" && WorkOrderCode != "undefined")
+                    sql += $" and F_WorkOrderCode like '%{WorkOrderCode}%'";
+               
                 if (state >= 0)
                 {
-                    int[] arr = { 0, 2, 10 };
-                    if (arr.Contains(state))
-                        sql += $" and F_State=" + state;
+                    sql += $" and F_State=" + state;
                 }
                 sql += "and F_IsDel=0";
                 int recordCount = 0;
@@ -95,6 +92,72 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             return Error("无操作权限");
         }
 
+
+
+        /// <summary>
+        /// 获取司机列表
+        /// </summary>
+        /// <param name="starttime"></param>
+        /// <param name="endtime"></param>
+        /// <param name="type"></param>
+        /// <param name="pageindex"></param>
+        /// <param name="pagesize"></param>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public ActionResult GetCarList(string starttime = "", string endtime = "",string carname = "",string driverName="" ,string WorkOrderCode = "",int pageindex = 1, int pagesize = 10, int state = -1)
+
+        {
+            if (User != null)
+            {
+                DataTable data = new DataTable();
+                string sql = "";
+            
+                if (starttime.Trim() != "" && starttime != "undefined")
+                    sql += $" and datediff(day,F_CreateTime,'" + starttime + "')<=0";
+                if (endtime.Trim() != "" && endtime != "undefined")
+                    sql += $" and datediff(day,F_CreateTime,'" + endtime + "')>=0";
+                if (state >= 0)
+                {
+                   sql += $" and F_State=" + state;
+                }
+                if (carname.Trim() != "" && carname != "undefined")
+                    sql += $" and F_CarName like '%{carname}%'";
+
+                if (driverName.Trim() != "" && driverName != "undefined")
+                    sql += $" and F_DriverName like '%{driverName}%'";
+
+                if (WorkOrderCode.Trim() != "" && WorkOrderCode != "undefined")
+                    sql += $" and F_WorkOrderID like '%{WorkOrderCode}%'";
+                sql += "and F_IsDelete=0";
+                int recordCount = 0;
+                string where = "";
+                if (!string.IsNullOrEmpty(sql))
+                {
+                    where += sql;
+                }
+                data = Bll.PagerBll.GetListPager
+                                    (
+                                    "T_Car_AssignWorkOrder",
+                                    "F_ID",
+                                    "*",
+                                    where,
+                                    "order by F_ID desc",
+                                    pagesize,
+                                    pageindex,
+                                    true,
+                                    out recordCount
+                                    );
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = data,
+                    tatal = recordCount
+                };
+                return Content(obj.ToJson());
+            }
+            return Error("无操作权限");
+        }
         /// <summary>
         /// 报表
         /// </summary>
@@ -376,9 +439,10 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     var Assignmodel = new BLL.T_Car_AssignWorkOrder().GetModel(orderid);
                     if (Assignmodel != null)
                     {
+                      
                         var Carlist = DbHelperSQL.Query  
                             ($"select *,dbo.GetDictionaryName(F_CarType) F_CarTypeName" +
-                            $" from T_Car_WorkOrder where F_ID in({string.Join(",", Assignmodel.F_WorkOrderID.Split(','))}) and F_IsDel=0 ").Tables[0];
+                            $" from T_Car_WorkOrder where F_WorkOrderCode in({string.Join(",", Assignmodel.F_WorkOrderID.Split(','))}) and F_IsDel=0 ").Tables[0];
                         var obj = new
                         {
                             state = "success",
@@ -410,7 +474,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 return Error("请选择司机");
             if (string.IsNullOrEmpty(orderid))
                 return Error("请选择配送工单");
-            var modellist = orderbll.GetModelList($"F_ID in({string.Join(",", orderid.Split (','))}) and F_IsDel=0");
+            var modellist = orderbll.GetModelList($"F_WorkOrderCode in({string.Join(",", orderid.Split (','))}) and F_IsDel=0");
             
             if (modellist!=null && modellist.Count >0)
             {
@@ -500,7 +564,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                 if (new BLL.T_Car_AssignWorkOrder().Update(model))
                 {
                  
-                    var modellist = orderbll.GetModelList($"F_ID in({string.Join(",", model.F_WorkOrderID .Split(','))}) and F_IsDel=0");
+                    var modellist = orderbll.GetModelList($"F_WorkOrderCode in({string.Join(",", model.F_WorkOrderID .Split(','))}) and F_IsDel=0");
                     if (modellist!=null && modellist.Count >0)
                     {
                         string deptname = "";
@@ -546,7 +610,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     if (carbll != null)
                         carmodel.F_State = 0;
                     carbll.Update(carmodel);
-                    var modellist = orderbll.GetModelList($"F_ID in({string.Join(",", model.F_WorkOrderID.Split(','))}) and F_IsDel=0");
+                    var modellist = orderbll.GetModelList($"F_WorkOrderCode in({string.Join(",", model.F_WorkOrderID.Split(','))}) and F_IsDel=0");
                     if (modellist != null && modellist.Count > 0)
                     {
                         string deptname = "";
@@ -600,7 +664,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     if (carbll != null)
                         carmodel.F_State = 0;
                     carbll.Update(carmodel);
-                    var modellist = orderbll.GetModelList($"F_ID in({string.Join(",", model.F_WorkOrderID.Split(','))}) and F_IsDel=0");
+                    var modellist = orderbll.GetModelList($"F_WorkOrderCode in({string.Join(",", model.F_WorkOrderID.Split(','))}) and F_IsDel=0");
                     if (modellist != null && modellist.Count > 0)
                     {
                         string deptname = "";
@@ -649,7 +713,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             var carWorkOrder = orderbll.GetModelByCode(WorkOrderCode);
             if (carWorkOrder == null)
                 return Error("工单不存在！");
-            if(!model.F_WorkOrderID .Contains (carWorkOrder.F_ID.ToString () ))
+            if(!model.F_WorkOrderID .Contains (carWorkOrder.F_WorkOrderCode.ToString () ))
                 return Error("该工单不存在这条记录中！");
             carWorkOrder.F_StartTime = DateTime.Now;
             carWorkOrder.F_State = (int)EnumWorkOrderState.dealing;//处理中
@@ -691,7 +755,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
             var carWorkOrder = orderbll.GetModelByCode(WorkOrderCode);
             if (carWorkOrder == null)
                 return Error("工单不存在！");
-            if (!model.F_WorkOrderID.Contains(carWorkOrder.F_ID.ToString()))
+            if (!model.F_WorkOrderID.Contains(carWorkOrder.F_WorkOrderCode.ToString()))
                 return Error("该工单不存在这条记录中！");
             if (carWorkOrder.F_State !=2)
                 return Error("该工单未发车！");
@@ -706,7 +770,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
                     deptname = deptmodel.F_DeptName + "-";
                 AddOperation(deptname + User.F_UserName + "(" + User.F_UserCode + ")" + "到达目的地", User.F_UserCode, model.F_State.Value,
                          carWorkOrder.F_WorkOrderCode, model.F_ID);
-                var carsql = $"select count(1) from T_Car_WorkOrder where F_ID in({string.Join(",", model.F_WorkOrderID.Split(','))}) and F_State !=10 and F_IsDel=0";
+                var carsql = $"select count(1) from T_Car_WorkOrder where F_WorkOrderCode in({string.Join(",", model.F_WorkOrderID.Split(','))}) and F_State !=10 and F_IsDel=0";
                 var car = DbHelperSQL.GetSingle(carsql).ToString ();
                 if (int .Parse(car) <=0)
                 {