Browse Source

故障报修

liyuanyuan 3 years ago
parent
commit
803fd1d4b0

+ 1 - 1
RMYY_CallCenter_Api.Dal/T_Sys_Menu.cs

103
             strSql.Append("F_ParentId=@F_ParentId,");
103
             strSql.Append("F_ParentId=@F_ParentId,");
104
             strSql.Append("F_MenuType=@F_MenuType");
104
             strSql.Append("F_MenuType=@F_MenuType");
105
             strSql.Append(" where F_MenuId=@F_MenuId");
105
             strSql.Append(" where F_MenuId=@F_MenuId");
106
-            strSql.Append(" where F_WorkState=@F_WorkState");
106
+          //  strSql.Append("  and  F_WorkState=@F_WorkState");
107
             SqlParameter[] parameters = {
107
             SqlParameter[] parameters = {
108
                     new SqlParameter("@F_MenuCode", SqlDbType.VarChar,50),
108
                     new SqlParameter("@F_MenuCode", SqlDbType.VarChar,50),
109
                     new SqlParameter("@F_MenuName", SqlDbType.VarChar,50),
109
                     new SqlParameter("@F_MenuName", SqlDbType.VarChar,50),

+ 2 - 0
RMYY_CallCenter_Api/Common/WorkOrderButton.cs

82
         我的提交,
82
         我的提交,
83
         [Description("orderList")]
83
         [Description("orderList")]
84
         工单列表,
84
         工单列表,
85
+        [Description("repairWorkOrder")]       
86
+        报修列表
85
     }
87
     }
86
 
88
 
87
 
89
 

+ 57 - 39
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

596
             DataTable   datatable = Bll.PagerBll.GetListPager
596
             DataTable   datatable = Bll.PagerBll.GetListPager
597
                                             ("T_FaultRepair_Base ",
597
                                             ("T_FaultRepair_Base ",
598
                                               "F_WorkOrderId",
598
                                               "F_WorkOrderId",
599
-                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer,[dbo].[GetUserName](F_Applicant) Applicant",
599
+                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer,[dbo].[GetUserName](F_Applicant) Applicant,[dbo].[GetAssistanceState](F_WorkOrderCode) AssistanceState",
600
                                               sql,
600
                                               sql,
601
                                               "order by F_WorkOrderId desc",
601
                                               "order by F_WorkOrderId desc",
602
                                               pagesize,
602
                                               pagesize,
606
                                             );
606
                                             );
607
             datatable.Columns.Add("GapTime", typeof(string));//执行时限
607
             datatable.Columns.Add("GapTime", typeof(string));//执行时限
608
 
608
 
609
-            datatable.Columns.Add("AssistanceState", typeof(string));//协作工单的状态
609
+          //  datatable.Columns.Add("AssistanceState", typeof(string));//协作工单的状态
610
+            datatable.Columns.Add("Buttons", typeof(object));//操作按钮
611
+
612
+            datatable.Columns.Add("StateName", typeof(string));// 
613
+
614
+           
615
+
616
+            //datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.报修列表);
610
 
617
 
611
-            datatable.Columns.Add("StateName", typeof(string));//协作工单的状态
612
 
618
 
613
-            datatable.Columns.Add("Buttons", typeof(object));//操作按钮
614
             foreach (DataRow dr in datatable.Rows)
619
             foreach (DataRow dr in datatable.Rows)
615
             {
620
             {
616
                 #region 执行时限 不是已完成的工单 展示这个字段 
621
                 #region 执行时限 不是已完成的工单 展示这个字段 
638
                 }
643
                 }
639
                 #endregion
644
                 #endregion
640
 
645
 
641
-                #region 协作工单的状态
642
-                if (!string.IsNullOrEmpty(dr["F_InternalWorkOrderCode"].ToString()) || !string.IsNullOrEmpty(dr["F_ExternalWorkOrderCode"].ToString()))
643
-                {
644
-                    List<Model.T_FaultRepair_Base> modellist = baseBll.GetModelList("F_WorkOrderCode in " +
645
-                        "(select col from [dbo].[SplitToNvarchar]('" + dr["F_InternalWorkOrderCode"].ToString() + "',',' )) or F_WorkOrderCode in(select col from [dbo].[SplitToNvarchar]('" + dr["F_ExternalWorkOrderCode"].ToString() + "',',' ) )");
646
-
647
-                    if (modellist.Count != 0)  
648
-                    { 
649
-                    List<Model.T_FaultRepair_Base> modellistnew = modellist.Where(x => x.F_WorkOrderState < 3).ToList();
650
-
651
-                    if (modellistnew != null && modellistnew.Count > 0)
652
-                    {
653
-                        dr["AssistanceState"] = "未完成";
654
-                    }
655
-                    else
656
-                    {
657
-                        dr["AssistanceState"] = "已完成";
658
-                    }
659
-                    }
646
+                //#region 协作工单的状态
647
+                //if (!string.IsNullOrEmpty(dr["F_InternalWorkOrderCode"].ToString()) || !string.IsNullOrEmpty(dr["F_ExternalWorkOrderCode"].ToString()))
648
+                //{
649
+                //    List<Model.T_FaultRepair_Base> modellist = baseBll.GetModelList("F_WorkOrderCode in " +
650
+                //        "(select col from [dbo].[SplitToNvarchar]('" + dr["F_InternalWorkOrderCode"].ToString() + "',',' )) or F_WorkOrderCode in(select col from [dbo].[SplitToNvarchar]('" + dr["F_ExternalWorkOrderCode"].ToString() + "',',' ) )");
651
+
652
+                //    if (modellist.Count != 0)
653
+                //    {
654
+                //        List<Model.T_FaultRepair_Base> modellistnew = modellist.Where(x => x.F_WorkOrderState < 3).ToList();
655
+
656
+                //        if (modellistnew != null && modellistnew.Count > 0)
657
+                //        {
658
+                //            dr["AssistanceState"] = "未完成";
659
+                //        }
660
+                //        else
661
+                //        {
662
+                //            dr["AssistanceState"] = "已完成";
663
+                //        }
664
+                //    }
660
 
665
 
661
-                }
662
-                #endregion
666
+                //}
667
+                //#endregion
663
 
668
 
664
                 #region  展示的工单状态
669
                 #region  展示的工单状态
665
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) ==(int) EnumFaultRepairWorkOrderState.receive || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
670
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) ==(int) EnumFaultRepairWorkOrderState.receive || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
676
                 }
681
                 }
677
                 #endregion
682
                 #endregion
678
 
683
 
679
-                #region 操作按钮
684
+                //#region 操作按钮
680
 
685
 
681
-               
682
-                    var btns = new List<FaultButtonGroup.button>();
686
+
687
+                var btns = new List<FaultButtonGroup.button>();
683
 
688
 
684
                 //创建完工单没有转派到部门的话,只有调度中心可以转派
689
                 //创建完工单没有转派到部门的话,只有调度中心可以转派
685
                 //if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
690
                 //if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
686
                 //{
691
                 //{
687
                 //    btns.Add(FaultButtonGroup.assign());
692
                 //    btns.Add(FaultButtonGroup.assign());
688
-                    
693
+
689
                 //}
694
                 //}
690
                 //待查收 -查收 退回
695
                 //待查收 -查收 退回
691
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive)
696
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive)
692
-                    {
693
-                        btns.Add(FaultButtonGroup.check());
694
-                        btns.Add(FaultButtonGroup.back());
695
-                    }
697
+                {
698
+                    btns.Add(FaultButtonGroup.check());
699
+                    btns.Add(FaultButtonGroup.back());
700
+                }
696
                 if (dr["F_Maintenancer"].ToString() == User.F_UserCode)
701
                 if (dr["F_Maintenancer"].ToString() == User.F_UserCode)
697
                 {
702
                 {
698
                     //待完成 -协作 完成
703
                     //待完成 -协作 完成
719
 
724
 
720
 
725
 
721
                     }
726
                     }
722
-                   
727
+
723
                 }
728
                 }
724
                 dr["Buttons"] = btns;
729
                 dr["Buttons"] = btns;
725
-                #endregion
730
+                //#endregion
726
             }
731
             }
727
             var obj = new
732
             var obj = new
728
             {
733
             {
893
                     )
898
                     )
894
                 {
899
                 {
895
                     btns.Add(FaultButtonGroup.solve());
900
                     btns.Add(FaultButtonGroup.solve());
896
-
897
                 }
901
                 }
898
                 //待评价  评价
902
                 //待评价  评价
899
               else  if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
903
               else  if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
1252
 
1256
 
1253
         }
1257
         }
1254
 
1258
 
1259
+        //删除工单
1260
+        public ActionResult DeleteWorkOrder(string WorkOrderCode)
1261
+        {
1262
+            Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
1263
+            model.F_IsDelete = 1;
1264
+            if (baseBll.Update(model))
1265
+            {
1266
+                AddOperatorLog("删除了工单", (int)EnumOperatorType.delete, WorkOrderCode);
1267
+                return Success("删除成功");
1268
+            }
1269
+          
1270
+            else
1271
+                return Error("删除失败");
1272
+        }
1255
 
1273
 
1256
 
1274
 
1257
         // 返修
1275
         // 返修
1388
         #endregion
1406
         #endregion
1389
 
1407
 
1390
 
1408
 
1391
-        public string GetDeptModel( string deptcode = "")
1409
+        public string GetDeptModel( string deptId = "")
1392
         {
1410
         {
1393
             string sql = " 1=1 ";
1411
             string sql = " 1=1 ";
1394
           
1412
           
1395
-            if (!string.IsNullOrWhiteSpace(deptcode))
1413
+            if (!string.IsNullOrWhiteSpace(deptId))
1396
             {
1414
             {
1397
-                sql += " and F_DeptCode='" + deptcode + "'";
1415
+                sql += " and F_DeptId='" + deptId + "'";
1398
             }
1416
             }
1399
             if (string.IsNullOrWhiteSpace(sql))
1417
             if (string.IsNullOrWhiteSpace(sql))
1400
                 return "";
1418
                 return "";