From 239ccfc7325cfc83e72a4ff1e7375a772017e936 Mon Sep 17 00:00:00 2001
From: clovejunti <CloveJunti@outlook.com>
Date: Mon, 5 Aug 2024 17:21:06 +0800
Subject: [PATCH] 17

---
 DeviceRepair.Api/Web.config                   |   2 +-
 .../CheckForm/CheckFormDa.cs                  |  16 +
 DeviceRepair.DataAccess/Device/DeviceDa.cs    | 154 +----
 .../DeviceRepair.DataAccess.csproj            |   6 +-
 DeviceRepair.DataAccess/PLAN/PlanDa.cs        | 183 ++----
 .../Preserve/PreserveDa.cs                    |  35 +-
 DeviceRepair.DataAccess/SFC/BatchDa.cs        |   8 +-
 .../Script/5.0/Func/SplitIn.sql               |   6 +-
 .../func_GetDailyPlanProccScheduleDetail.sql  | 116 ++++
 ...Proc_AnnualEquipmentMaintenanceProgram.sql |   8 +-
 .../Script/5.0/Proc/Proc_DeviceTreeViews.sql  | 242 ++++----
 .../5.0/Proc/proc_EquipmentPlanIsComplete.sql | 211 +++++++
 DeviceRepair.DataAccess/Tag/TagDa.cs          |  47 +-
 .../page_DriveTypeTree.Designer.cs            |  14 +-
 TsSFCDevice.Client.Biz/Impl/DevRepository.cs  |   4 +-
 TsSFCDevice.Client.Biz/Impl/PlanRepository.cs |  24 +
 TsSFCDevice.Client.Biz/Scheduler.cs           |  62 ++
 .../TsSFCDevice.Client.Biz.csproj             |   1 +
 .../Web References/DeviceSvc/MainService.wsdl |  49 ++
 .../Web References/DeviceSvc/Reference.cs     |  64 ++
 .../page_AssignDriveTree.Designer.cs          |   3 +
 .../CheckForm/page_AssignDriveTree.resx       | 168 ++---
 .../Device/Page_DriveInfoEdit.Designer.cs     |  87 +--
 .../Device/Page_DriveInfoEdit.cs              |  20 +-
 .../Device/Page_DriveInfoEdit.resx            |   2 +-
 .../Device/Page_FormVersionDialog.cs          |  13 +-
 .../Device/pageDeviceTreeView.Designer.cs     | 578 ++++++++++++++++++
 .../Device/pageDeviceTreeView.cs              | 236 +++++++
 .../Device/pageDeviceTreeView.resx            | 393 ++++++++++++
 .../Device/pageDeviceView.Designer.cs         |  24 +-
 .../OperationAuthConstValue.cs                |   7 +
 .../TsSFCDevice.Client.Launch.csproj          |  18 +
 .../frm_Launch.Designer.cs                    |  47 +-
 TsSFCDevice.Client.Launch/frm_Launch.cs       |  66 +-
 TsSFCDevice.Client.Launch/frm_Launch.resx     |  83 ++-
 TsSFCDevice.Client.Launch/page_PlanDialog.cs  |  19 +-
 .../sysConfig/pageJumpCheckView.Designer.cs   | 103 ++++
 .../sysConfig/pageJumpCheckView.cs            |  21 +
 .../sysConfig/pageJumpCheckView.resx          | 120 ++++
 TsSFCDeviceSvc/MainService.asmx.cs            |  31 +
 40 files changed, 2651 insertions(+), 640 deletions(-)
 create mode 100644 DeviceRepair.DataAccess/Script/5.0/Func/func_GetDailyPlanProccScheduleDetail.sql
 create mode 100644 DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql
 create mode 100644 TsSFCDevice.Client.Biz/Scheduler.cs
 create mode 100644 TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs
 create mode 100644 TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs
 create mode 100644 TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.resx
 create mode 100644 TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs
 create mode 100644 TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs
 create mode 100644 TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx

diff --git a/DeviceRepair.Api/Web.config b/DeviceRepair.Api/Web.config
index 5b9001c..ac55795 100644
--- a/DeviceRepair.Api/Web.config
+++ b/DeviceRepair.Api/Web.config
@@ -15,7 +15,7 @@
 		<!--<add key="DbConnection" value="BDE8F7885304F971652793A26A78C05A5037D6280601C6774ABFD7F44C1B873A2A79F9D088CF6FD89C227AE0B44A5226DF3BE8D7136A5584B9EF82EF17111DCEFC50467AA2016C983E4A2C388348CD579F2B752522430413AEFDD1725A61A7BE042E02FA82F17FB1F0DC3CC9534BD3625DC8F12EC361EAE5074C4DE21294D7D3" />-->
 		<!--<add key="LogConnection" value="BDE8F7885304F971652793A26A78C05A5037D6280601C6774ABFD7F44C1B873A2A79F9D088CF6FD89C227AE0B44A5226A45982935AAA969DD2083D0C4490A626EF86FF5F3AADCC8AA52F594871B5ECE9280C276380BF31EA4C41A3AFF6AB004294F4CE90472421ADEBC6A8DA326A81AF2C73F29625645A8F0FA12CC730F693B6CD892ED6CA2D5BA4" />-->
 		<add key="DbConnection" value="BDE8F7885304F971652793A26A78C05A5037D6280601C6774ABFD7F44C1B873A2A79F9D088CF6FD89C227AE0B44A5226DF3BE8D7136A5584B9EF82EF17111DCEFC50467AA2016C983E4A2C388348CD579F2B752522430413AEFDD1725A61A7BE042E02FA82F17FB1F0DC3CC9534BD362252A2165A62B1D4AD3557A3F7F37B29F" />
-		<add key="LogConnection" value="BDE8F7885304F971652793A26A78C05A5037D6280601C6774ABFD7F44C1B873A2A79F9D088CF6FD89C227AE0B44A5226DF3BE8D7136A5584B9EF82EF17111DCEFC50467AA2016C983E4A2C388348CD579F2B752522430413AEFDD1725A61A7BE042E02FA82F17FB1F0DC3CC9534BD362252A2165A62B1D4AD3557A3F7F37B29F" />
+		<add key="LogConnection" value="BDE8F7885304F971652793A26A78C05A5037D6280601C6774ABFD7F44C1B873A2A79F9D088CF6FD89C227AE0B44A5226A45982935AAA969DD2083D0C4490A626EF86FF5F3AADCC8AA52F594871B5ECE9280C276380BF31EA4C41A3AFF6AB004294F4CE90472421ADEBC6A8DA326A81AF2C73F29625645A8F48F87233DF6E35C5F0FFB32E4CE24270" />
 		<add key="SfcConnection" value="BDE8F7885304F971652793A26A78C05A5037D6280601C6774ABFD7F44C1B873A2A79F9D088CF6FD89C227AE0B44A5226DF3BE8D7136A5584B9EF82EF17111DCEFC50467AA2016C983E4A2C388348CD579F2B752522430413AEFDD1725A61A7BE042E02FA82F17FB1F0DC3CC9534BD362252A2165A62B1D4AD3557A3F7F37B29F" />
 		<add key="SecureKey" value="A4E3uxwPTQ8Jpi7Sp4" />
 		<add key="AttachmentDirectory" value="D:\WorkStation\设备维护管理软件\DeviceRepairAPI\Attachment" />
diff --git a/DeviceRepair.DataAccess/CheckForm/CheckFormDa.cs b/DeviceRepair.DataAccess/CheckForm/CheckFormDa.cs
index 4a72622..eab1976 100644
--- a/DeviceRepair.DataAccess/CheckForm/CheckFormDa.cs
+++ b/DeviceRepair.DataAccess/CheckForm/CheckFormDa.cs
@@ -88,6 +88,10 @@ FROM dbo.MaintenanceRecord WHERE PlanPrimaryID = @PlanPrimaryID";
                     if (item != null)
                     {
                         MaintenanceFormVersionInfo formData = devMain.Queryable<MaintenanceFormVersionInfo>().First(x => x.AutoID == item.FormPrimaryID);
+                        if (formData == null)
+                        {
+                            throw new ArgumentException("当前设备的点检表不存在！");
+                        }
                         DataTable table2 = new List<MaintenanceFormVersionInfo> { formData }.ToDataTable();
                         dsDatas.Tables.Add(table2);
                     }
@@ -95,6 +99,10 @@ FROM dbo.MaintenanceRecord WHERE PlanPrimaryID = @PlanPrimaryID";
                     {
                         MaintenanceFormVersionInfo formData = devMain.Queryable<DeviceInformationInfo, MaintenanceFormVersionInfo>((t1, t2) => new object[] { JoinType.Inner, t1.MaintenanceAMFormVersion == t2.AutoID })
                             .Where((t1, t2) => t1.AutoID == plan.EquipmentID).Select((t1, t2) => t2).First();
+                        if (formData == null)
+                        {
+                            throw new ArgumentException("当前设备的点检表不存在！");
+                        }
                         DataTable table2 = new List<MaintenanceFormVersionInfo> { formData }.ToDataTable();
                         dsDatas.Tables.Add(table2);
                     }
@@ -106,6 +114,10 @@ FROM dbo.MaintenanceRecord WHERE PlanPrimaryID = @PlanPrimaryID";
                     {
                         MaintenanceFormVersionInfo formData = devMain.Queryable<MaintenanceRecordInfo, MaintenanceFormVersionInfo>((t1, t2) => new object[] { JoinType.Inner, t1.FormPrimaryID == t2.AutoID })
                               .Where((t1, t2) => t1.EquipmentPrimaryID == plan.EquipmentID).Select((t1, t2) => t2).First();
+                        if (formData == null)
+                        {
+                            throw new ArgumentException("当前设备的点检表不存在！");
+                        }
                         DataTable table2 = new List<MaintenanceFormVersionInfo> { formData }.ToDataTable();
                         dsDatas.Tables.Add(table2);
                     }
@@ -113,6 +125,10 @@ FROM dbo.MaintenanceRecord WHERE PlanPrimaryID = @PlanPrimaryID";
                     {
                         MaintenanceFormVersionInfo formData = devMain.Queryable<DeviceInformationInfo, MaintenanceFormVersionInfo>((t1, t2) => new object[] { JoinType.Inner, t1.MaintenanceFormVersion == t2.AutoID })
                             .Where((t1, t2) => t1.AutoID == plan.EquipmentID).Select((t1, t2) => t2).First();
+                        if (formData == null)
+                        {
+                            throw new ArgumentException("当前设备的点检表不存在！");
+                        }
                         DataTable table2 = new List<MaintenanceFormVersionInfo> { formData }.ToDataTable();
                         dsDatas.Tables.Add(table2);
                     }
diff --git a/DeviceRepair.DataAccess/Device/DeviceDa.cs b/DeviceRepair.DataAccess/Device/DeviceDa.cs
index b430065..e126ee4 100644
--- a/DeviceRepair.DataAccess/Device/DeviceDa.cs
+++ b/DeviceRepair.DataAccess/Device/DeviceDa.cs
@@ -15,10 +15,9 @@ namespace DeviceRepair.DataAccess.Device
     public class DeviceDa : BaseDa
     {
         private static readonly Logger log = LogManager.GetCurrentClassLogger();
-        
+
         public DeviceDa(IDictionary<string, string> apiParams) : base(apiParams)
         {
-
         }
 
         /// <summary>
@@ -38,7 +37,9 @@ namespace DeviceRepair.DataAccess.Device
                 var AuthString = GetParamString("Auths", "权限");
                 var auths = AuthString.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
-                var devIds = devMain.Ado.SqlQuery<int>("SELECT AutoID FROM dbo.View_DeviceRoot WHERE RootName IN (@RootName)", new { RootName = auths }).ToArray();
+                var devIds = devMain.Ado
+                    .SqlQuery<int>("SELECT AutoID FROM dbo.View_DeviceRoot WHERE RootName IN (@RootName)",
+                        new { RootName = auths }).ToArray();
                 var Datas = devMain.Queryable<DeviceInformationInfo>()
                     .Where(x => SqlFunc.ContainsArray(devIds, x.AutoID)).ToList();
 
@@ -66,143 +67,26 @@ namespace DeviceRepair.DataAccess.Device
             dsDatas = new DataSet("Datas");
             try
             {
-                
                 if (!ApiParameters.ContainsKey("Auths"))
                 {
                     return new APIResponseData { Code = -1, Message = "没有设备信息查看权限！" };
                 }
 
                 var AuthString = GetParamString("Auths", "权限");
-                var auths = AuthString.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                
+
                 var FilterValue = string.Empty;
                 if (ApiParameters.ContainsKey("FilterValue"))
+                    FilterValue = GetParamString("FilterValue", "检索条件");
+
+                var Datas2 = devMain.Ado.UseStoredProcedure().GetDataTable("Proc_DeviceTreeViews", new { RootName = AuthString });
+                var Datas = Datas2.ToList<DeviceInformationInfoTree>();
+
+                if (!FilterValue.IsNull())
                 {
-                    FilterValue = ApiParameters["FilterValue"];
+                    Datas = Datas.Where(x => x.EquipmentID == FilterValue).ToList();
                 }
 
-                /* 获取权限分组 */
-                var route = devMain.Ado.SqlQuery<DeviceRouteInfo>(@";WITH cte
-                                AS (SELECT AutoID,
-                                           Name
-                                    FROM dbo.DeviceRoute
-                                    WHERE (ParentID = 0)
-                                    UNION ALL
-                                    SELECT dr.AutoID,
-                                           cte_1.Name
-                                    FROM dbo.DeviceRoute AS dr
-                                        INNER JOIN cte AS cte_1
-                                            ON dr.ParentID = cte_1.AutoID)
-                                SELECT DeviceRoute.*
-                                FROM dbo.DeviceRoute
-								INNER JOIN cte ON cte.AutoID = DeviceRoute.AutoID WHERE cte.Name IN (@Name) AND Status = 1", new { Name = auths }).ToList();
-
-                var aid = 0;
-                int.TryParse(FilterValue, out aid);
-                var Root = route.ToDictionary(x => x.AutoID, x => x);
-
-                var Menus = new List<DeviceInformationInfoTree>();
-
-                foreach (KeyValuePair<int, DeviceRouteInfo> item in Root)
-                {
-                    var dev = item.Value;
-                    Menus.Add(new DeviceInformationInfoTree
-                    {
-                        EquipmentName = dev.Name,
-                        RouteAutoId = dev.GUID,
-                        ParentRouteId = dev.ParentID != 0 ? Root[dev.ParentID].GUID : Guid.Empty
-                    });
-                }
-
-                var RouteIds = Root.Keys.ToArray();
-
-                var exp = Expressionable.Create<DeviceInformationInfoTree>()
-                      .OrIF(aid > 0, t1 => t1.AutoID == aid)
-                      .OrIF(!string.IsNullOrEmpty(FilterValue),
-                        t1 => t1.EquipmentID.Equals(FilterValue, StringComparison.CurrentCultureIgnoreCase)
-                        || t1.EquipmentName.Contains(FilterValue)
-                        || t1.Remarks.Contains(FilterValue)
-                        || t1.Specification.Contains(FilterValue))
-                      .And(t1 => SqlFunc.ContainsArray(RouteIds, t1.Route)).ToExpression();//拼接表达式
-
-
-                var Datas = devMain.Queryable<DeviceInformationInfo, MaintenanceFormVersionInfo, DeviceRouteInfo, MaintenanceFormVersionInfo>(
-                        (t1, t2, t3, t4) => new object[] {
-                            JoinType.Left, t1.MaintenanceFormVersion == t2.AutoID,
-                            JoinType.Left, t1.Route == t3.AutoID,
-                            JoinType.Left,t1.MaintenanceAMFormVersion == t4.AutoID
-                        }
-                        ).With(SqlWith.NoLock).Select((t1, t2, t3, t4) => new DeviceInformationInfoTree
-                        {
-                            AutoID = t1.AutoID,
-                            ChangeDate = t1.ChangeDate,
-                            ChangeUser = t1.ChangeUser,
-                            CreatDate = t1.CreatDate,
-                            CreatUser = t1.CreatUser,
-                            EquipmentCategory = t1.EquipmentCategory,
-                            EquipmentID = t1.EquipmentID,
-                            EquipmentName = t1.EquipmentName,
-                            EquipmentOriginalvalue = t1.EquipmentOriginalvalue,
-                            EquipmentStatus = t1.EquipmentStatus,
-                            InstallationLocation = t1.InstallationLocation,
-                            MaintenanceFormVersion = t1.MaintenanceFormVersion,
-                            MaintenanceFormVersionName = t2.FormName,
-                            MaintenanceAMFormVersion = t1.MaintenanceAMFormVersion,
-                            MaintenanceAMFormVersionName = t4.FormName,
-                            Manufacturer = t1.Manufacturer,
-                            OperatingParameters = t1.OperatingParameters,
-                            OwningUnit = t1.OwningUnit,
-                            Remarks = t1.Remarks,
-                            SerialNumber = t1.SerialNumber,
-                            Specification = t1.Specification,
-                            Totalcapacity = t1.Totalcapacity,
-                            UsingDate = t1.UsingDate,
-                            VersionCode = t2.VersionCode,
-                            VersionRev = t2.VersionRev,
-                            WarrantyPeriod = t1.WarrantyPeriod,
-                            Weight = t1.Weight,
-                            Route = t3.AutoID,
-                            RouteAutoId = t1.GUID,
-                            //ParentRouteId =  SqlFunc.ContainsArray(RouteIds, t1.Route) ? Root[t1.Route].Guid : Guid.Empty
-                        }).Where(exp)
-                        .ToList();
-
-                var hasEmpty = Menus.Any(x => x.RouteAutoId == Guid.Empty);
-
-                foreach (DeviceInformationInfoTree item in Datas)
-                {
-                    item.ParentRouteId = RouteIds.Contains(item.Route) ? Root[item.Route].GUID : Guid.Empty;
-                }
-
-               var HasValues = new List<Guid>();
-               var gids = Datas.Select(x => x.ParentRouteId).Distinct().ToArray();
-
-                do
-                {
-                    if (HasValues.Count == 0)
-                        HasValues.AddRange(gids);
-
-                    gids = Menus.Where(x => gids.Contains(x.RouteAutoId)).Select(s => s.ParentRouteId).Distinct().ToArray();
-                    HasValues.AddRange(gids);
-                } while (gids.All(x => x == Guid.Empty));
-
-                Menus.RemoveAll(x => !HasValues.Contains(x.RouteAutoId) && x.ParentRouteId != Guid.Empty);
-                Menus.AddRange(Datas);
-
-
-                foreach (DeviceRouteInfo item in route)
-                {
-                    DeviceInformationInfoTree Node = Menus.FirstOrDefault(x => x.RouteAutoId == item.GUID);
-                    List<DeviceInformationInfoTree> Child = Menus.Where(x => x.Route == item.AutoID).ToList();
-                    if (Node != null && Child.Count > 0)
-                    {
-                        Node.Totalcapacity = Child.Sum(x => x.Totalcapacity);
-                        Node.Weight = Child.Sum(x => x.Weight);
-                        Node.EquipmentOriginalvalue = Child.Sum(x => x.EquipmentOriginalvalue);
-                    }
-                }
-
-                var table = Menus.ToDataTable();
+                var table = Datas.ToDataTable();
                 dsDatas.Tables.Add(table);
 
                 return new APIResponseData { Code = 1, Message = "操作成功！" };
@@ -256,10 +140,12 @@ namespace DeviceRepair.DataAccess.Device
                                             ON dr.ParentID = cte_1.AutoID)
                                 SELECT DeviceRoute.*
                                 FROM dbo.DeviceRoute
-								INNER JOIN cte ON cte.AutoID = DeviceRoute.AutoID WHERE cte.Name IN (@Name) AND Status = 1", new { Name = auths }).ToList();
+								INNER JOIN cte ON cte.AutoID = DeviceRoute.AutoID WHERE cte.Name IN (@Name) AND Status = 1",
+                    new { Name = auths }).ToList();
 
                 int[] routeIds = route.Select(x => x.AutoID).ToArray();
-                List<DeviceRouteInfo> Data = devMain.Queryable<DeviceRouteInfo>().Where(x => x.Status && SqlFunc.ContainsArray(routeIds, x.AutoID)).ToList();
+                List<DeviceRouteInfo> Data = devMain.Queryable<DeviceRouteInfo>()
+                    .Where(x => x.Status && SqlFunc.ContainsArray(routeIds, x.AutoID)).ToList();
 
                 DataTable table = Data.ToDataTable();
                 dsDatas.Tables.Add(table);
@@ -377,7 +263,8 @@ namespace DeviceRepair.DataAccess.Device
                     throw new ArgumentException("传入的操作员对象参数不正确！");
 
                 devMain.BeginTran();
-                DeviceInformationInfo Item = devMain.Queryable<DeviceInformationInfo>().First(x => x.AutoID == Data.AutoID);
+                DeviceInformationInfo Item = devMain.Queryable<DeviceInformationInfo>()
+                    .First(x => x.AutoID == Data.AutoID);
                 if (Item == null)
                     throw new ArgumentException($"没有获取到设备编号为：【{Data.EquipmentID}】的设备信息！");
 
@@ -397,6 +284,7 @@ namespace DeviceRepair.DataAccess.Device
                 Item.OwningUnit = Data.OwningUnit;
                 Item.OperatingParameters = Data.OperatingParameters;
                 Item.MaintenanceFormVersion = Data.MaintenanceFormVersion;
+                Item.MaintenanceAMFormVersion = Data.MaintenanceAMFormVersion;
                 Item.Route = Data.Route;
                 Data.ChangeDate = CurrentDate;
                 Data.ChangeUser = Operation;
@@ -480,4 +368,4 @@ namespace DeviceRepair.DataAccess.Device
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj b/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj
index 29f9ae5..ee40dc3 100644
--- a/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj
+++ b/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj
@@ -99,9 +99,11 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Script\5.0\Datas\Auths.sql" />
+    <Content Include="Script\5.0\Func\func_GetDailyPlanProccScheduleDetail.sql" />
     <Content Include="Script\5.0\Func\SplitIn.sql" />
     <Content Include="Script\5.0\Proc\Proc_AnnualEquipmentMaintenanceProgram.sql" />
     <Content Include="Script\5.0\Proc\Proc_DeviceTreeViews.sql" />
+    <Content Include="Script\5.0\Proc\proc_EquipmentPlanIsComplete.sql" />
     <Content Include="Script\5.0\Table\DriveMaintencePlanDaily.sql" />
     <Content Include="Script\5.0\Table\UserConfirmHistory.sql" />
     <Content Include="Script\5.0\Views\View_AMYearsMaintenancePlansExport.sql" />
@@ -110,9 +112,7 @@
     <Content Include="Script\5.0\Views\View_PM_Plan_Progress.sql" />
     <Content Include="Script\5.0\Views\View_YearsMaintenancePlansExport.sql" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="User\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/DeviceRepair.DataAccess/PLAN/PlanDa.cs b/DeviceRepair.DataAccess/PLAN/PlanDa.cs
index 7d97db6..71565cc 100644
--- a/DeviceRepair.DataAccess/PLAN/PlanDa.cs
+++ b/DeviceRepair.DataAccess/PLAN/PlanDa.cs
@@ -163,33 +163,16 @@ namespace DeviceRepair.DataAccess.PLAN
 
             try
             {
-                if (!ApiParameters.ContainsKey("EquipmentID"))
-                {
-                    throw new ArgumentException("传入的设备编号不能为空！");
-                }
-
                 if (!ApiParameters.ContainsKey("Year"))
                 {
                     throw new ArgumentException("传入的计划年不能为空！");
                 }
 
-                int EquipmentAutoID = 0;
-                if (!int.TryParse(ApiParameters["EquipmentID"], out EquipmentAutoID))
-                {
-                    throw new ArgumentException("传入的设备编号格式不正确！");
-                }
+                int EquipmentAutoID = base.GetParamInt("EquipmentID", "设备编号");
 
-                int Year = DateTime.Today.Year;
-                if (!int.TryParse(ApiParameters["Year"], out Year))
-                {
-                    throw new ArgumentException("传入的计划年格式不正确！");
-                }
+                int Year = base.GetParamInt("Year", "计划年");
 
-                if (!ApiParameters.ContainsKey("Belong"))
-                {
-                    throw new ArgumentException("传入的计划类型不能为空！");
-                }
-                string Belong = ApiParameters["Belong"]?.Trim();
+                string Belong = base.GetParamString("Belong", "计划类型");
                 if (Belong.ToUpper() != "AM" && Belong.ToUpper() != "PM")
                     throw new ArgumentException("传入的计划类型值不正确！");
 
@@ -394,17 +377,10 @@ namespace DeviceRepair.DataAccess.PLAN
                     throw new ArgumentException("传入的计划编号格式不正确！");
                 }
 
-                string sql = @"SELECT CONVERT(VARCHAR(15), DATEADD(DAY, number, DATEFROMPARTS(t1.MaintenanceYear, t1.MaintenanceMonth, 1)), 23) AS MaintenanceDay,
-       0 AS IsComplete
-FROM dbo.DriveMaintencePlan t1
-    CROSS APPLY master.dbo.spt_values t2
-WHERE t2.type = 'p'
-      AND t2.number <= DATEDIFF(
-                                   DAY,
-                                   DATEFROMPARTS(t1.MaintenanceYear, t1.MaintenanceMonth, 1),
-                                   EOMONTH(DATEFROMPARTS(t1.MaintenanceYear, t1.MaintenanceMonth, 1))
-                               )
-      AND t1.AutoID = @PlanAutoID;";
+                string sql = @"SELECT MaintenanceDay,
+       IIF(COUNT(Banci) = SUM(IsComplete), 1, 0) AS IsComplete
+FROM dbo.func_GetDailyPlanProccScheduleDetail(@PlanAutoID)
+GROUP BY MaintenanceDay;";
 
                 return devMain.Ado.GetDataTable(sql, new { PlanAutoID }).DataSet;
             }
@@ -433,33 +409,10 @@ WHERE t2.type = 'p'
             DataSet dsDatas = new DataSet("Datas");
             try
             {
-                if (!ApiParameters.ContainsKey("EquipmentID"))
-                {
-                    throw new ArgumentException("传入的设备编号不能为空！");
-                }
+                int EquipmentAutoID = base.GetParamInt("EquipmentID", "设备编号");
+                int Year = base.GetParamInt("Year", "计划年");
+                string Belong = base.GetParamString("Belong", "计划类型");
 
-                if (!ApiParameters.ContainsKey("Year"))
-                {
-                    throw new ArgumentException("传入的计划年不能为空！");
-                }
-
-                int EquipmentAutoID = 0;
-                if (!int.TryParse(ApiParameters["EquipmentID"], out EquipmentAutoID))
-                {
-                    throw new ArgumentException("传入的设备编号格式不正确！");
-                }
-
-                int Year = DateTime.Today.Year;
-                if (!int.TryParse(ApiParameters["Year"], out Year))
-                {
-                    throw new ArgumentException("传入的计划年格式不正确！");
-                }
-
-                if (!ApiParameters.ContainsKey("Belong"))
-                {
-                    throw new ArgumentException("传入的计划类型不能为空！");
-                }
-                string Belong = ApiParameters["Belong"]?.Trim();
                 if (Belong.ToUpper() != "AM" && Belong.ToUpper() != "PM")
                     throw new ArgumentException("传入的计划类型值不正确！");
 
@@ -522,33 +475,10 @@ WHERE t2.type = 'p'
 
             try
             {
-                if (!ApiParameters.ContainsKey("EquipmentID"))
-                {
-                    throw new ArgumentException("传入的设备编号不能为空！");
-                }
+                int EquipmentAutoID = base.GetParamInt("EquipmentID", "设备编号");
+                int Year = base.GetParamInt("Year", "计划年");
+                string Belong = base.GetParamString("Belong", "计划类型");
 
-                if (!ApiParameters.ContainsKey("Year"))
-                {
-                    throw new ArgumentException("传入的计划年不能为空！");
-                }
-
-                int EquipmentAutoID = 0;
-                if (!int.TryParse(ApiParameters["EquipmentID"], out EquipmentAutoID))
-                {
-                    throw new ArgumentException("传入的设备编号格式不正确！");
-                }
-
-                int Year = DateTime.Today.Year;
-                if (!int.TryParse(ApiParameters["Year"], out Year))
-                {
-                    throw new ArgumentException("传入的计划年格式不正确！");
-                }
-
-                if (!ApiParameters.ContainsKey("Belong"))
-                {
-                    throw new ArgumentException("传入的计划类型不能为空！");
-                }
-                string Belong = ApiParameters["Belong"]?.Trim();
                 if (Belong.ToUpper() != "AM" && Belong.ToUpper() != "PM")
                     throw new ArgumentException("传入的计划类型值不正确！");
 
@@ -588,34 +518,10 @@ WHERE t2.type = 'p'
         {
             try
             {
-                if (!ApiParameters.ContainsKey("EquipmentID"))
-                {
-                    throw new ArgumentException("传入的设备编号不能为空！");
-                }
+                int EquipmentAutoID = base.GetParamInt("EquipmentID", "设备编号");
+                int Year = base.GetParamInt("Year", "计划年");
+                string Belong = base.GetParamString("Belong", "计划类型");
 
-                if (!ApiParameters.ContainsKey("Year"))
-                {
-                    throw new ArgumentException("传入的计划年不能为空！");
-                }
-
-                string EquipmentID = ApiParameters["EquipmentID"];
-                int EquipmentAutoID = 0;
-                if (!int.TryParse(ApiParameters["EquipmentID"], out EquipmentAutoID))
-                {
-                    throw new ArgumentException("传入的设备编号格式不正确！");
-                }
-
-                int Year = DateTime.Today.Year;
-                if (!int.TryParse(ApiParameters["Year"], out Year))
-                {
-                    throw new ArgumentException("传入的计划年格式不正确！");
-                }
-
-                if (!ApiParameters.ContainsKey("Belong"))
-                {
-                    throw new ArgumentException("传入的计划类型不能为空！");
-                }
-                string Belong = ApiParameters["Belong"]?.Trim();
                 if (Belong.ToUpper() != "AM" && Belong.ToUpper() != "PM")
                     throw new ArgumentException("传入的计划类型值不正确！");
 
@@ -671,28 +577,8 @@ WHERE t2.type = 'p'
 
             try
             {
-                if (!ApiParameters.ContainsKey("EquipmentID"))
-                {
-                    throw new ArgumentException("传入的设备编号不能为空！");
-                }
-
-                if (!ApiParameters.ContainsKey("Year"))
-                {
-                    throw new ArgumentException("传入的计划年不能为空！");
-                }
-
-                string EquipmentID = ApiParameters["EquipmentID"];
-                int EquipmentAutoID = 0;
-                if (!int.TryParse(ApiParameters["EquipmentID"], out EquipmentAutoID))
-                {
-                    throw new ArgumentException("传入的设备编号格式不正确！");
-                }
-
-                int Year = DateTime.Today.Year;
-                if (!int.TryParse(ApiParameters["Year"], out Year))
-                {
-                    throw new ArgumentException("传入的计划年格式不正确！");
-                }
+                int EquipmentAutoID = base.GetParamInt("EquipmentID", "设备编号");
+                int Year = base.GetParamInt("Year", "计划年");
 
                 List<View_PM_Plan_ProgressInfo> Datas = devMain.Queryable<View_PM_Plan_ProgressInfo>().Where(x => x.PlanYear == Year && x.EquipmentID == EquipmentAutoID).ToList();
                 if ((Datas?.Count ?? 0) == 0)
@@ -819,6 +705,10 @@ WHERE t2.type = 'p'
                         item.Remarks = t.Remarks;
                         OperationList[EnumOperationType.Change].Add(item);
                     }
+                    else
+                    {
+                        OperationList[EnumOperationType.Change].Add(item);
+                    }
                 }
 
                 // 新增的计划
@@ -944,5 +834,34 @@ WHERE t2.type = 'p'
             }
         }
 
+        /// <summary>
+        /// 判断当前开工设备是否存在未完成的保养计划
+        /// </summary>
+        /// <param name="EquipmentID"></param>
+        /// <returns></returns>
+        public APIResponseData Get_EquipmentPlanIsComplete(string EquipmentID)
+        {
+            try
+            {
+                if (EquipmentID.IsNull())
+                {
+                    throw new ArgumentNullException("输入的设备编号参数不能为空！");
+                }
+
+                if (!devMain.Queryable<DeviceInformationInfo>().Any(x => x.EquipmentID == EquipmentID))
+                {
+                    throw new ArgumentNullException("输入的设备编号错误或不存在！");
+                }
+
+                devMain.Ado.UseStoredProcedure().ExecuteCommand("proc_EquipmentPlanIsComplete", new { EquipmentDisplayID = EquipmentID });
+
+                return new APIResponseData { Code = 1 };
+            }
+            catch (Exception ex)
+            {
+                return new APIResponseData { Code = -1, Message = ex.Message };
+            }
+        }
+
     }
 }
diff --git a/DeviceRepair.DataAccess/Preserve/PreserveDa.cs b/DeviceRepair.DataAccess/Preserve/PreserveDa.cs
index ce0465e..8866a20 100644
--- a/DeviceRepair.DataAccess/Preserve/PreserveDa.cs
+++ b/DeviceRepair.DataAccess/Preserve/PreserveDa.cs
@@ -36,17 +36,7 @@ namespace DeviceRepair.DataAccess.Preserve
             dsDatas = new DataSet("Datas");
             try
             {
-                if (!ApiParameters.ContainsKey("AutoID"))
-                {
-                    throw new ArgumentException("传入的保养记录编号不能为空！");
-                }
-
-                int AutoID = 0;
-                if (!int.TryParse(ApiParameters["AutoID"], out AutoID))
-                {
-                    throw new ArgumentException("传入的保养记录编号格式不正确！");
-                }
-
+                int AutoID = base.GetParamInt("AutoID", "保养记录编号");
                 MaintenanceRecordInfo Data = devMain.Queryable<MaintenanceRecordInfo>().First(x => x.AutoID == AutoID);
                 if (Data == null)
                 {
@@ -227,17 +217,9 @@ namespace DeviceRepair.DataAccess.Preserve
                 string OperationType = "新增";
                 DateTime CurrentDate = DateTime.Now;
                 int Identity = 0;
-                if (!ApiParameters.ContainsKey("OPERATORAUTOID"))
-                {
-                    throw new ArgumentException("非法的操作,当前操作人参数不正确！");
-                }
-                int OperationID = Convert.ToInt32(ApiParameters["OPERATORAUTOID"] + "");
+                int OperationID = base.GetParamInt("OPERATORAUTOID", "当前操作人");
+                string Belong = base.GetParamString("Belong", "计划类型");
 
-                if (!ApiParameters.ContainsKey("Belong"))
-                {
-                    throw new ArgumentException("传入的计划类型不能为空！");
-                }
-                string Belong = ApiParameters["Belong"]?.Trim();
                 if (Belong.ToUpper() != "AM" && Belong.ToUpper() != "PM")
                     throw new ArgumentException("传入的计划类型值不正确！");
 
@@ -460,16 +442,7 @@ namespace DeviceRepair.DataAccess.Preserve
             dsDatas = new DataSet("Datas");
             try
             {
-                if (!ApiParameters.ContainsKey("AutoID"))
-                {
-                    throw new ArgumentException("传入的保养记录编号不能为空！");
-                }
-
-                int PlanPrimaryKey = 0;
-                if (!int.TryParse(ApiParameters["AutoID"], out PlanPrimaryKey))
-                {
-                    throw new ArgumentException("传入的保养记录编号格式不正确！");
-                }
+                int PlanPrimaryKey = base.GetParamInt("AutoID", "保养记录编号");
 
                 if (PlanPrimaryKey == 0)
                     throw new ArgumentException("未能获取到查询条件:保养计划主键ID等于0的数据");
diff --git a/DeviceRepair.DataAccess/SFC/BatchDa.cs b/DeviceRepair.DataAccess/SFC/BatchDa.cs
index be381be..2bbf41c 100644
--- a/DeviceRepair.DataAccess/SFC/BatchDa.cs
+++ b/DeviceRepair.DataAccess/SFC/BatchDa.cs
@@ -27,13 +27,7 @@ namespace DeviceRepair.DataAccess.SFC
             BatchExists = false;
             try
             {
-                string Batch = string.Empty;
-                if (!ApiParameters.ContainsKey("Batch"))
-                {
-                    throw new ArgumentException("参数批次号不能为空！");
-                }
-
-                Batch = ApiParameters["Batch"].Trim();
+                string Batch = base.GetParamString("Batch", "批次号");
                 int Count = sfcData.Queryable<InspBatchInfo>().Count(x => x.Batch.ToUpper().Equals(Batch.ToUpper()));
                 BatchExists = Count > 0;
                 return new APIResponseData { Code = 1 };
diff --git a/DeviceRepair.DataAccess/Script/5.0/Func/SplitIn.sql b/DeviceRepair.DataAccess/Script/5.0/Func/SplitIn.sql
index 42665ff..7b37a99 100644
--- a/DeviceRepair.DataAccess/Script/5.0/Func/SplitIn.sql
+++ b/DeviceRepair.DataAccess/Script/5.0/Func/SplitIn.sql
@@ -1,14 +1,14 @@
 USE [DriveMaintenance]
 GO
 
-DECLARE @functionName NVARCHAR(128) = N'SplitIn'; -- 替换为您要查找的函数名称
+DECLARE @functionName NVARCHAR(128) = N'SplitIn';
 
 IF EXISTS (
     SELECT 1 
     FROM sys.objects AS o
     WHERE o.name = @functionName
-      AND o.type IN ('FN', 'TF') -- 表值函数的类型是 FN 或 TF
-      AND o.is_ms_shipped = 0 -- 排除系统提供的函数
+      AND o.type IN ('FN', 'TF')
+      AND o.is_ms_shipped = 0
 )
 BEGIN
     DROP FUNCTION [dbo].[SplitIn]
diff --git a/DeviceRepair.DataAccess/Script/5.0/Func/func_GetDailyPlanProccScheduleDetail.sql b/DeviceRepair.DataAccess/Script/5.0/Func/func_GetDailyPlanProccScheduleDetail.sql
new file mode 100644
index 0000000..79bd430
--- /dev/null
+++ b/DeviceRepair.DataAccess/Script/5.0/Func/func_GetDailyPlanProccScheduleDetail.sql
@@ -0,0 +1,116 @@
+USE [DriveMaintenance]
+GO
+
+DECLARE @functionName NVARCHAR(128) = N'func_GetDailyPlanProccScheduleDetail';
+
+IF EXISTS (
+    SELECT 1 
+    FROM sys.objects AS o
+    WHERE o.name = @functionName
+      AND o.type IN ('FN', 'TF')
+      AND o.is_ms_shipped = 0
+)
+BEGIN
+    DROP FUNCTION [dbo].[func_GetDailyPlanProccScheduleDetail]
+END
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		蔡峰
+-- Create date: 2024-08-05
+-- Description:	获取当前AM保养计划的计划进度
+-- =============================================
+CREATE FUNCTION [dbo].[func_GetDailyPlanProccScheduleDetail]
+(
+    @PlanID INT
+)
+RETURNS @CompleteStausView TABLE
+(
+    MaintenanceDay DATETIME,
+    Banci INT,
+    IsComplete INT
+)
+AS
+BEGIN
+    DECLARE @FormID INT,
+            @TemplateJson VARCHAR(MAX),
+            @PlanStartDate DATETIME;
+
+    SELECT @PlanStartDate = DATEFROMPARTS(MaintenanceYear, MaintenanceMonth, 1)
+    FROM dbo.DriveMaintencePlan
+    WHERE AutoID = @PlanID;
+
+	/* 是否存在历史点检表 */
+    IF EXISTS
+    (
+        SELECT 1
+        FROM DeviceMaintenanceLog.dbo.DeviceLog
+            INNER JOIN dbo.DriveMaintencePlan
+                ON DriveMaintencePlan.EquipmentID = DeviceLog.EquipmentAutoID
+        WHERE DriveMaintencePlan.AutoID = @PlanID
+    )
+    BEGIN
+        SELECT @FormID = FormAutoID
+        FROM DeviceMaintenanceLog.dbo.DeviceLog
+            INNER JOIN dbo.DriveMaintencePlan
+                ON DriveMaintencePlan.EquipmentID = DeviceLog.EquipmentAutoID
+        WHERE DriveMaintencePlan.AutoID = @PlanID
+        ORDER BY OperationDate ASC;
+    END;
+    ELSE
+    BEGIN
+        SELECT @FormID = MaintenanceAMFormVersion
+        FROM dbo.DriveInformation
+            INNER JOIN dbo.DriveMaintencePlan
+                ON DriveMaintencePlan.EquipmentID = DriveInformation.AutoID
+        WHERE DriveMaintencePlan.AutoID = @PlanID;
+    END;
+
+    /* 模板信息 */
+    SELECT @TemplateJson = ContentData
+    FROM dbo.MaintenanceFormVersion
+    WHERE AutoID = @FormID;
+
+	IF	(@TemplateJson IS NULL OR @TemplateJson = '')
+	BEGIN
+		RETURN;
+	END
+
+    /* 进度信息 */
+    INSERT INTO @CompleteStausView
+    (
+        MaintenanceDay,
+        Banci,
+        IsComplete
+    )
+    SELECT CONVERT(VARCHAR(15), DATEADD(DAY, t1.number, @PlanStartDate), 23) AS MaintenanceDay,
+           t2.Banci,
+           ISNULL(t3.IsComplete, 0) AS IsComplete
+    FROM master.dbo.spt_values t1
+        CROSS APPLY
+        OPENJSON((JSON_QUERY(@TemplateJson, '$.Operation')))
+        WITH
+        (
+            MaintenanceDay VARCHAR(50) '$.MaintenanceTypeValue',
+            Banci INT '$.BanciType',
+            Value VARCHAR(50) '$.Value'
+        ) AS t2
+        LEFT JOIN
+        (
+            SELECT JSON_VALUE(ContentData, '$.Operation[0].BanciType') AS Banci,
+                   JSON_VALUE(ContentData, '$.Operation[0].MaintenanceTypeValue') AS [Day],
+                   1 AS IsComplete
+            FROM dbo.MaintenanceRecord
+            WHERE PlanPrimaryID = @PlanID
+        ) t3
+            ON (t1.number + 1) = t3.Day
+               AND t3.Banci = t2.Banci 
+    WHERE t1.type = 'p'
+          AND t1.number <= DATEDIFF(DAY, @PlanStartDate, EOMONTH(@PlanStartDate))
+          AND (t1.number + 1) = t2.MaintenanceDay;
+	RETURN;
+END;
+
diff --git a/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_AnnualEquipmentMaintenanceProgram.sql b/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_AnnualEquipmentMaintenanceProgram.sql
index 83a9c6a..b148042 100644
--- a/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_AnnualEquipmentMaintenanceProgram.sql
+++ b/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_AnnualEquipmentMaintenanceProgram.sql
@@ -1,5 +1,11 @@
 USE [DriveMaintenance]
 GO
+
+IF OBJECT_ID('Proc_AnnualEquipmentMaintenanceProgram', 'P') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Proc_AnnualEquipmentMaintenanceProgram];
+END;
+
 /****** Object:  StoredProcedure [dbo].[Proc_AnnualEquipmentMaintenanceProgram]    Script Date: 2024/7/29 13:42:15 ******/
 SET ANSI_NULLS ON
 GO
@@ -10,7 +16,7 @@ GO
 -- Create date: <Create Date,,>
 -- Description:	<Description,,>
 -- =============================================
-ALTER PROCEDURE [dbo].[Proc_AnnualEquipmentMaintenanceProgram]
+CREATE PROCEDURE [dbo].[Proc_AnnualEquipmentMaintenanceProgram]
     @Year INT = 0,
     @Keyword NVARCHAR(50) = ''
 AS
diff --git a/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_DeviceTreeViews.sql b/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_DeviceTreeViews.sql
index 750bd76..7029e09 100644
--- a/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_DeviceTreeViews.sql
+++ b/DeviceRepair.DataAccess/Script/5.0/Proc/Proc_DeviceTreeViews.sql
@@ -3,127 +3,140 @@ GO
 
 IF OBJECT_ID('Proc_DeviceTreeViews', 'P') IS NOT NULL
 BEGIN
-    DROP PROCEDURE [dbo].[Proc_DeviceTreeViews]
-END
+    DROP PROCEDURE [dbo].[Proc_DeviceTreeViews];
+END;
 
-SET ANSI_NULLS ON
+SET ANSI_NULLS ON;
 GO
-SET QUOTED_IDENTIFIER ON
+SET QUOTED_IDENTIFIER ON;
 GO
 -- =============================================
 -- Author:		蔡峰
 -- Create date: 2024年8月2日
 -- Description:	获取树形结构的设备列表
 -- =============================================
-CREATE PROCEDURE dbo.Proc_DeviceTreeViews
-    @RootName varchar(50)
+CREATE PROCEDURE dbo.Proc_DeviceTreeViews @RootName VARCHAR(50)
 AS
-BEGIN
+BEGIN;
 WITH Base
          AS (SELECT t1.Route,
                     ISNULL(t2.ParentID, 0) AS ParentID,
                     ISNULL(t1.Totalcapacity, 0) AS Totalcapacity,
                     ISNULL(t1.Weight, 0) AS Weight,
                     ISNULL(t1.EquipmentOriginalvalue, 0) AS EquipmentOriginalvalue
-             FROM dbo.DriveInformation t1
-                      LEFT JOIN dbo.DeviceRoute t2
-                                ON t1.Route = t2.AutoID
-    ),
-     LevelView
-         AS (SELECT AutoID,
-                    GUID AS RouteAutoId,
-                    CAST(0x0 AS UNIQUEIDENTIFIER) AS ParentRouteId,
-                    ParentID,
-                    Name,
-                    1 AS Level
-             FROM dbo.DeviceRoute
-             WHERE ParentID = 0 AND Name IN (SELECT col FROM dbo.SplitIn(@RootName, ','))
-             UNION ALL
-             SELECT DeviceRoute.AutoID,
-                    DeviceRoute.GUID,
-                    LevelView.RouteAutoId,
-                    LevelView.ParentID,
-                    LevelView.Name,
-                    LevelView.Level + 1 AS Level
-             FROM dbo.DeviceRoute
-                      INNER JOIN LevelView
-                                 ON LevelView.AutoID = DeviceRoute.ParentID),
-     Total1
-         AS (SELECT vw.AutoID,
-                    vw.RouteAutoId,
-                    vw.ParentRouteId,
-                    vw.ParentID,
-                    vw.Name,
-                    vw.Level,
-                    SUM(dev.Totalcapacity) AS Totalcapacity,
-                    SUM(dev.Weight) AS Weight,
-                    SUM(dev.EquipmentOriginalvalue) AS EquipmentOriginalvalue
-             FROM LevelView vw
-                      LEFT JOIN dbo.DriveInformation dev
-                                ON vw.AutoID = dev.Route
-             WHERE vw.Level = 3
-             GROUP BY vw.AutoID,
-                      vw.RouteAutoId,
-                      vw.ParentRouteId,
-                      vw.ParentID,
-                      vw.Name,
-                      vw.Level),
-     Total2
-         AS (SELECT vw.AutoID,
-                    vw.RouteAutoId,
-                    vw.ParentRouteId,
-                    vw.ParentID,
-                    vw.Name,
-                    vw.Level,
-                    SUM(tl.Totalcapacity) AS Totalcapacity,
-                    SUM(tl.Weight) AS Weight,
-                    SUM(tl.EquipmentOriginalvalue) AS EquipmentOriginalvalue
-             FROM LevelView vw
-                      INNER JOIN Total1 tl
-                                 ON tl.ParentRouteId = vw.RouteAutoId
-             GROUP BY vw.AutoID,
-                      vw.RouteAutoId,
-                      vw.ParentRouteId,
-                      vw.ParentID,
-                      vw.Name,
-                      vw.Level),
-     Total
-         AS (SELECT vw.AutoID,
-                    vw.RouteAutoId,
-                    vw.ParentRouteId,
-                    vw.ParentID,
-                    vw.Name,
-                    SUM(tl.Totalcapacity) AS Totalcapacity,
-                    SUM(tl.Weight) AS Weight,
-                    SUM(tl.EquipmentOriginalvalue) AS EquipmentOriginalvalue
-             FROM LevelView vw
-                      INNER JOIN Total2 tl
-                                 ON tl.ParentRouteId = vw.RouteAutoId
-             GROUP BY vw.AutoID,
-                      vw.RouteAutoId,
-                      vw.ParentRouteId,
-                      vw.ParentID,
-                      vw.Name
-             UNION ALL
-             SELECT Total2.AutoID,
-                    Total2.RouteAutoId,
-                    Total2.ParentRouteId,
-                    Total2.ParentID,
-                    Total2.Name,
-                    Total2.Totalcapacity,
-                    Total2.Weight,
-                    Total2.EquipmentOriginalvalue
-             FROM Total2
-             UNION ALL
-             SELECT Total1.AutoID,
-                    Total1.RouteAutoId,
-                    Total1.ParentRouteId,
-                    Total1.ParentID,
-                    Total1.Name,
-                    Total1.Totalcapacity,
-                    Total1.Weight,
-                    Total1.EquipmentOriginalvalue
-             FROM Total1)
+             FROM dbo.DriveInformation AS t1 WITH (NOLOCK)
+    LEFT JOIN dbo.DeviceRoute AS t2 WITH (NOLOCK)
+ON t1.Route = t2.AutoID
+WHERE t1.Route <> 0),
+    LevelView
+    AS (SELECT AutoID,
+    GUID AS RouteAutoId,
+    CAST(0x0 AS UNIQUEIDENTIFIER) AS ParentRouteId,
+    ParentID,
+    Name,
+    Name AS RootName,
+    1 AS Level
+FROM dbo.DeviceRoute WITH (NOLOCK)
+WHERE ParentID = 0
+  AND Name IN
+    (
+    SELECT col FROM dbo.SplitIn('KH,OEM', ',')
+    )
+UNION ALL
+SELECT DeviceRoute.AutoID,
+    DeviceRoute.GUID,
+    LevelView.RouteAutoId,
+    LevelView.ParentID,
+    DeviceRoute.Name,
+    LevelView.RootName,
+    LevelView.Level + 1 AS Level
+FROM dbo.DeviceRoute WITH (NOLOCK)
+    INNER JOIN LevelView
+ON LevelView.AutoID = DeviceRoute.ParentID),
+    Total1
+    AS (SELECT vw.AutoID,
+    vw.RouteAutoId,
+    vw.ParentRouteId,
+    vw.ParentID,
+    vw.Name,
+    vw.RootName,
+    vw.Level,
+    SUM(dev.Totalcapacity) AS Totalcapacity,
+    SUM(dev.Weight) AS Weight,
+    SUM(dev.EquipmentOriginalvalue) AS EquipmentOriginalvalue
+FROM LevelView vw
+    LEFT JOIN dbo.DriveInformation AS dev WITH (NOLOCK)
+ON vw.AutoID = dev.Route
+WHERE vw.Level = 3
+GROUP BY vw.AutoID,
+    vw.RouteAutoId,
+    vw.ParentRouteId,
+    vw.ParentID,
+    vw.Name,
+    vw.RootName,
+    vw.Level),
+    Total2
+    AS (SELECT vw.AutoID,
+    vw.RouteAutoId,
+    vw.ParentRouteId,
+    vw.ParentID,
+    vw.Name,
+    vw.RootName,
+    vw.Level,
+    SUM(tl.Totalcapacity) AS Totalcapacity,
+    SUM(tl.Weight) AS Weight,
+    SUM(tl.EquipmentOriginalvalue) AS EquipmentOriginalvalue
+FROM LevelView vw
+    INNER JOIN Total1 tl
+ON tl.ParentRouteId = vw.RouteAutoId
+GROUP BY vw.AutoID,
+    vw.RouteAutoId,
+    vw.ParentRouteId,
+    vw.ParentID,
+    vw.Name,
+    vw.RootName,
+    vw.Level),
+    Total
+    AS (SELECT vw.AutoID,
+    vw.RouteAutoId,
+    vw.ParentRouteId,
+    vw.ParentID,
+    vw.Name,
+    vw.RootName,
+    SUM(tl.Totalcapacity) AS Totalcapacity,
+    SUM(tl.Weight) AS Weight,
+    SUM(tl.EquipmentOriginalvalue) AS EquipmentOriginalvalue
+FROM LevelView vw
+    INNER JOIN Total2 tl
+ON tl.ParentRouteId = vw.RouteAutoId
+GROUP BY vw.AutoID,
+    vw.RouteAutoId,
+    vw.ParentRouteId,
+    vw.ParentID,
+    vw.Name,
+    vw.RootName
+UNION ALL
+SELECT Total2.AutoID,
+    Total2.RouteAutoId,
+    Total2.ParentRouteId,
+    Total2.ParentID,
+    Total2.Name,
+    Total2.RootName,
+    Total2.Totalcapacity,
+    Total2.Weight,
+    Total2.EquipmentOriginalvalue
+FROM Total2
+UNION ALL
+SELECT Total1.AutoID,
+    Total1.RouteAutoId,
+    Total1.ParentRouteId,
+    Total1.ParentID,
+    Total1.Name,
+    Total1.RootName,
+    Total1.Totalcapacity,
+    Total1.Weight,
+    Total1.EquipmentOriginalvalue
+FROM Total1)
 SELECT 0 AS AutoID,
        NULL AS ChangeDate,
        0 AS ChangeUser,
@@ -188,14 +201,15 @@ SELECT t2.AutoID,
        t2.WarrantyPeriod,
        t2.Weight,
        t2.AutoID AS Route,
-       t1.RouteAutoId,
+       t2.GUID AS RouteAutoId,
        t1.ParentRouteId
 FROM Total t1
-         INNER JOIN dbo.DriveInformation t2
-         LEFT JOIN dbo.MaintenanceFormVersion pm
-                   ON pm.AutoID = t2.MaintenanceFormVersion
-         LEFT JOIN dbo.MaintenanceFormVersion am
-                   ON am.AutoID = t2.MaintenanceAMFormVersion
-                   ON t1.AutoID = t2.Route;
-END
+         INNER JOIN dbo.DriveInformation AS t2 WITH (NOLOCK)
+            LEFT JOIN dbo.MaintenanceFormVersion AS pm WITH (NOLOCK)
+ON pm.AutoID = t2.MaintenanceFormVersion
+    LEFT JOIN dbo.MaintenanceFormVersion AS am WITH (NOLOCK)
+ON am.AutoID = t2.MaintenanceAMFormVersion
+    ON t1.AutoID = t2.Route
+WHERE t2.Route <> 0;
+END;
 GO
diff --git a/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql b/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql
new file mode 100644
index 0000000..6302ffb
--- /dev/null
+++ b/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql
@@ -0,0 +1,211 @@
+USE DriveMaintenance;
+GO
+
+IF OBJECT_ID('Proc_AnnualEquipmentMaintenanceProgram', 'P') IS NOT NULL
+BEGIN
+    DROP PROCEDURE [dbo].[Proc_AnnualEquipmentMaintenanceProgram];
+END;
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+
+
+-- =============================================
+-- Author:		蔡峰
+-- Create date: 2024-8-5
+-- Description:	判断当前开工设备是否存在未完成的保养计划
+-- =============================================
+CREATE PROCEDURE [dbo].[proc_EquipmentPlanIsComplete] @EquipmentDisplayID VARCHAR(50)
+AS
+BEGIN
+    BEGIN TRY
+        DECLARE @planId INT,
+                @devid INT,
+                @MaintenanceType NVARCHAR(50),
+                @MaintenanceMonth INT,
+                @Msg NVARCHAR(MAX);
+
+
+        DECLARE cursor_plan CURSOR FOR
+        SELECT pl.AutoID,
+               dev.AutoID,
+               pl.MaintenanceType,
+               pl.MaintenanceMonth
+        FROM dbo.DriveMaintencePlan pl
+            INNER JOIN dbo.DriveInformation dev
+                ON pl.EquipmentID = dev.AutoID
+        WHERE dev.EquipmentID = @EquipmentDisplayID
+              AND pl.PlanStatus = 'A'
+              AND pl.MaintenanceType IS NOT NULL
+              AND pl.MaintenanceYear = YEAR(GETDATE())
+              AND pl.MaintenanceMonth <= MONTH(GETDATE());
+        OPEN cursor_plan;
+
+
+
+        FETCH NEXT FROM cursor_plan
+        INTO @planId,
+             @devid,
+             @MaintenanceType,
+             @MaintenanceMonth;
+        WHILE @@FETCH_STATUS = 0
+        BEGIN
+            IF (@MaintenanceType = 'Daily')
+            BEGIN
+                SELECT MaintenanceDay,
+                       Banci,
+                       IsComplete
+                INTO #ScheduleDetail
+                FROM func_GetDailyPlanProccScheduleDetail(@planId);
+
+
+                /* 没有获取到点检表信息 */
+                IF NOT EXISTS (SELECT 1 FROM #ScheduleDetail)
+                BEGIN
+                    RAISERROR('设备：%s，存在保养类型：%s ，未完成,请先完成保养 ！', 16, 1, @EquipmentDisplayID, @MaintenanceType);
+                    RETURN -1;
+                END;
+                ELSE
+                BEGIN
+                    /* 存在未完成的历史日保养计划 */
+                    IF EXISTS
+                    (
+                        SELECT 1
+                        FROM #ScheduleDetail
+                        WHERE MaintenanceDay < CAST(GETDATE() AS DATE)
+                              AND IsComplete = 0
+                    )
+                    BEGIN
+                        RAISERROR('设备：%s，存在保养类型：%s ，未完成,请先完成保养 ！', 16, 1, @EquipmentDisplayID, @MaintenanceType);
+                        RETURN -1;
+                    END;
+                    ELSE
+                    BEGIN
+                        /* 判断当日日保养完成进度 */
+                        IF (DATEPART(HOUR, GETDATE()) > 12)
+                        BEGIN
+                            /* 早班 */
+                            IF EXISTS
+                            (
+                                SELECT 1
+                                FROM #ScheduleDetail
+                                WHERE DATEDIFF(DAY, MaintenanceDay, GETDATE()) = 0
+                                      AND Banci = 1
+                                      AND IsComplete = 0
+                            )
+                            BEGIN
+                                RAISERROR('设备：%s，存在当日的早班保养未完成,请先完成保养 ！', 16, 1, @EquipmentDisplayID);
+                                RETURN -1;
+                            END;
+
+                            IF (DATEPART(HOUR, GETDATE()) > 17)
+                            BEGIN
+
+                                /* 中班 */
+                                IF EXISTS
+                                (
+                                    SELECT 1
+                                    FROM #ScheduleDetail
+                                    WHERE DATEDIFF(DAY, MaintenanceDay, GETDATE()) = 0
+                                          AND Banci = 2
+                                          AND IsComplete = 0
+                                )
+                                BEGIN
+                                    RAISERROR('设备：%s，存在当日的中班保养未完成,请先完成保养 ！', 16, 1, @EquipmentDisplayID);
+                                    RETURN -1;
+                                END;
+
+                                IF (DATEPART(HOUR, GETDATE()) > 22)
+                                BEGIN
+                                    /* 晚班 */
+                                    IF EXISTS
+                                    (
+                                        SELECT 1
+                                        FROM #ScheduleDetail
+                                        WHERE DATEDIFF(DAY, MaintenanceDay, GETDATE()) = 0
+                                              AND Banci = 3
+                                              AND IsComplete = 0
+                                    )
+                                    BEGIN
+                                        RAISERROR('设备：%s，存在当日的夜班保养未完成,请先完成保养 ！', 16, 1, @EquipmentDisplayID);
+                                        RETURN -1;
+                                    END;
+                                END;
+
+                            END;
+                        END;
+                    END;
+                END;
+                DROP TABLE #ScheduleDetail;
+            END;
+            ELSE
+            BEGIN
+                IF NOT EXISTS
+                (
+                    SELECT 1
+                    FROM dbo.MaintenanceRecord
+                    WHERE PlanPrimaryID = @planId
+                          AND PlanType = @MaintenanceType
+                )
+                BEGIN
+                    RAISERROR('设备：%s，存在保养类型：%s ，未完成,请先完成保养 ！', 16, 1, @EquipmentDisplayID, @MaintenanceType);
+                    RETURN -1;
+                END;
+            END;
+
+            FETCH NEXT FROM cursor_plan
+            INTO @planId,
+                 @devid,
+                 @MaintenanceType,
+                 @MaintenanceMonth;
+        END;
+        CLOSE cursor_plan;
+        DEALLOCATE cursor_plan;
+
+        --/* 日保养提醒 */
+        --SELECT dt.MaintenanceDay,
+        --       CASE
+        --           WHEN dt.Banci = 1 THEN
+        --               DATEADD(HOUR, 12, dt.MaintenanceDay)
+        --           WHEN dt.Banci = 2 THEN
+        --               DATEADD(HOUR, 17, dt.MaintenanceDay)
+        --           WHEN dt.Banci = 3 THEN
+        --               DATEADD(HOUR, 22, dt.MaintenanceDay)
+        --       END AS LastCompleteDate,
+        --       dt.Banci,
+        --       dt.IsComplete
+        --FROM dbo.DriveMaintencePlan pln
+        --    INNER JOIN dbo.DriveInformation dev
+        --        ON pln.EquipmentID = dev.AutoID
+        --    CROSS APPLY dbo.func_GetDailyPlanProccScheduleDetail(pln.AutoID) dt
+        --WHERE dev.EquipmentID = @EquipmentDisplayID
+        --      AND pln.MaintenanceType = 'Daily'
+        --      AND pln.MaintenanceYear = YEAR(GETDATE())
+        --      AND pln.MaintenanceMonth = MONTH(GETDATE())
+        --      AND DATEDIFF(DAY, GETDATE(), dt.MaintenanceDay) = 0;
+    END TRY
+    BEGIN CATCH
+        IF OBJECT_ID('tempdb..#ScheduleDetail') IS NOT NULL
+        BEGIN
+            DROP TABLE #ScheduleDetail;
+        END;
+
+        CLOSE cursor_plan;
+        DEALLOCATE cursor_plan;
+        DECLARE @ErrorMessage NVARCHAR(4000);
+        DECLARE @ErrorSeverity INT;
+        DECLARE @ErrorState INT;
+        SELECT @ErrorMessage = ERROR_MESSAGE(),
+               @ErrorSeverity = ERROR_SEVERITY(),
+               @ErrorState = ERROR_STATE();
+        IF @@TRANCOUNT > 0
+            ROLLBACK TRAN BIZ_ADDON_NCMR_SAVE;
+        RAISERROR(@ErrorMessage, @ErrorSeverity, @ErrorState);
+        RETURN -1;
+    END CATCH;
+END;
+
+
+
diff --git a/DeviceRepair.DataAccess/Tag/TagDa.cs b/DeviceRepair.DataAccess/Tag/TagDa.cs
index 41a6c20..0d7b8f9 100644
--- a/DeviceRepair.DataAccess/Tag/TagDa.cs
+++ b/DeviceRepair.DataAccess/Tag/TagDa.cs
@@ -15,7 +15,7 @@ namespace DeviceRepair.DataAccess.Tag
     public class TagDa : BaseDa
     {
         private static readonly Logger log = LogManager.GetCurrentClassLogger();
-        
+
         public TagDa(IDictionary<string, string> apiParams) : base(apiParams)
         {
 
@@ -29,37 +29,33 @@ namespace DeviceRepair.DataAccess.Tag
                 DateTime sDate = DateTime.Today.AddMonths(-1);
                 if (!ApiParameters.ContainsKey("sDate"))
                 {
-                    if (DateTime.TryParse(ApiParameters["sDate"], out sDate))
+                    sDate = base.GetParamDateTime("sDate", "开始时间");
+                    if (sDate < new DateTime(1900, 01, 01))
                     {
-                        if (sDate < new DateTime(1900, 01, 01))
-                        {
-                            sDate = new DateTime(1900, 01, 01);
-                        }
+                        sDate = new DateTime(1900, 01, 01);
                     }
                 }
 
                 DateTime eDate = DateTime.Today.AddDays(1).AddMilliseconds(-1);
                 if (!ApiParameters.ContainsKey("eDate"))
                 {
-                    if (DateTime.TryParse(ApiParameters["eDate"], out eDate))
+                    eDate = base.GetParamDateTime("eDate", "结束时间");
+                    if (eDate.Date > DateTime.Today)
                     {
-                        if (eDate.Date > DateTime.Today)
-                        {
-                            sDate = DateTime.Today.AddDays(1).AddMilliseconds(-1);
-                        }
+                        sDate = DateTime.Today.AddDays(1).AddMilliseconds(-1);
                     }
                 }
 
                 string EquipmentDisPlayID = string.Empty;
                 if (!ApiParameters.ContainsKey("EquipmentDisPlayID"))
                 {
-                    EquipmentDisPlayID = ApiParameters["EquipmentDisPlayID"]?.Trim();
+                    EquipmentDisPlayID = base.GetParamString("EquipmentDisPlayID", "设备编号");
                 }
 
                 string TagFormStatus = string.Empty;
                 if (!ApiParameters.ContainsKey("TagFormStatus"))
                 {
-                    TagFormStatus = ApiParameters["TagFormStatus"]?.Trim();
+                    TagFormStatus = base.GetParamString("TagFormStatus", "表单状态");
                 }
 
                 var exp = Expressionable.Create<TagRecordInfo>()
@@ -98,12 +94,7 @@ namespace DeviceRepair.DataAccess.Tag
                 if (Data == null || Data.Rows.Count == 0)
                     throw new ArgumentException($"待插入的数据库对象不能为空");
 
-                if (!ApiParameters.ContainsKey("OPERATORAUTOID"))
-                    throw new ArgumentException("传入的操作员对象参数不正确,操作员不能为空！");
-
-                int Operation = 0;
-                if (!int.TryParse(ApiParameters["OPERATORAUTOID"], out Operation))
-                    throw new ArgumentException("传入的操作员对象参数不正确！");
+                int Operation = base.GetParamInt("OPERATORAUTOID", "操作员");
 
                 devMain.BeginTran();
                 TagRecordInfo Model = DTOHelper<TagRecordInfo>.DataTableToList(Data)?.FirstOrDefault();
@@ -194,22 +185,10 @@ namespace DeviceRepair.DataAccess.Tag
                 if (tagRecordInfo == null)
                     throw new Exception($"找不到Tag编号为【{Model.AutoID}】的Tag表单!");
 
-                if (!ApiParameters.ContainsKey("TagOperation"))
-                    throw new ArgumentException("传入的电子签操作员对象参数不正确,操作员不能为空！");
+                int Operation = base.GetParamInt("TagOperation", "电子签操作员");
+                CurrentTime = base.GetParamDateTime("TagOperationDate", "电子签操作时间");
 
-                int Operation = 0;
-                if (!int.TryParse(ApiParameters["TagOperation"], out Operation))
-                    throw new ArgumentException("传入的电子签操作员对象参数不正确！");
-
-                if (!ApiParameters.ContainsKey("TagOperationDate"))
-                    throw new ArgumentException("传入的电子签操作时间不能为空！");
-
-                if (!DateTime.TryParse(ApiParameters["TagOperationDate"], out CurrentTime))
-                    throw new ArgumentException("传入的电子签操作时间参数不正确！");
-
-                string TagOperationName = string.Empty;
-                if (!ApiParameters.ContainsKey("TagOperationName"))
-                    throw new ArgumentException("传入的电子签操作人名称不能为空！");
+                string TagOperationName = base.GetParamString("TagOperationName", "电子签操作人名称");
 
                 TagOperationName = ApiParameters["TagOperationName"];
 
diff --git a/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs b/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs
index adb304c..3f4e8c8 100644
--- a/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs
+++ b/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs
@@ -116,7 +116,7 @@
             this.tvDevices.OptionsView.AutoWidth = false;
             this.tvDevices.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All;
             this.tvDevices.RowHeight = 31;
-            this.tvDevices.Size = new System.Drawing.Size(1830, 831);
+            this.tvDevices.Size = new System.Drawing.Size(1614, 831);
             this.tvDevices.TabIndex = 13;
             this.tvDevices.TreeLevelWidth = 23;
             this.tvDevices.CustomColumnDisplayText += new DevExpress.XtraTreeList.CustomColumnDisplayTextEventHandler(this.tvDevices_CustomColumnDisplayText);
@@ -352,7 +352,7 @@
             // 
             // EditSearch
             // 
-            this.EditSearch.Location = new System.Drawing.Point(1472, 19);
+            this.EditSearch.Location = new System.Drawing.Point(1256, 19);
             this.EditSearch.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
             this.EditSearch.Name = "EditSearch";
             this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
@@ -375,7 +375,7 @@
             this.layoutControl1.Location = new System.Drawing.Point(0, 0);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(1854, 900);
+            this.layoutControl1.Size = new System.Drawing.Size(1638, 900);
             this.layoutControl1.TabIndex = 1;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -402,7 +402,7 @@
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2});
-            this.Root.Size = new System.Drawing.Size(1854, 900);
+            this.Root.Size = new System.Drawing.Size(1638, 900);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem2
@@ -414,7 +414,7 @@
             this.layoutControlItem2.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem2.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem2.Control = this.EditSearch;
-            this.layoutControlItem2.Location = new System.Drawing.Point(1384, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(1168, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.OptionsToolTip.ToolTip = "输入设备编号/设备名称/设备型号查询";
@@ -429,7 +429,7 @@
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(1834, 835);
+            this.layoutControlItem1.Size = new System.Drawing.Size(1618, 835);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
@@ -441,7 +441,7 @@
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(1854, 900);
+            this.ClientSize = new System.Drawing.Size(1638, 900);
             this.Controls.Add(this.layoutControl1);
             this.Name = "page_DriveTypeTree";
             this.Text = "page_DriveTypeTree";
diff --git a/TsSFCDevice.Client.Biz/Impl/DevRepository.cs b/TsSFCDevice.Client.Biz/Impl/DevRepository.cs
index 8cad4d4..a0a0c87 100644
--- a/TsSFCDevice.Client.Biz/Impl/DevRepository.cs
+++ b/TsSFCDevice.Client.Biz/Impl/DevRepository.cs
@@ -88,7 +88,7 @@ namespace TsSFCDevice.Client.Biz.Impl
         /// </summary>
         /// <param name="Auths"></param>
         /// <returns></returns>
-        public IList<DeviceInformationInfoTree> GetTreeDatas(List<string> Auths)
+        public IList<DeviceInformationInfoTree> GetTreeDatas(List<string> Auths,string FilterValue = "")
         {
             try
             {
@@ -99,6 +99,8 @@ namespace TsSFCDevice.Client.Biz.Impl
                 byte[] btResults = null;
                 ApiParameters?.Clear();
                 ApiParameters.Add("Auths", string.Join(",", Auths));
+                if (!FilterValue.IsNull())
+                    ApiParameters.Add("FilterValue", FilterValue);
 
                 var Rtn = Utility.SfcBizService.CurrentSvc.Get_DEVICE_TreeDatas(GetParameters(), out btResults);
                 if (Rtn.Code != 1)
diff --git a/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs b/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs
index f707058..1e0c670 100644
--- a/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs
+++ b/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs
@@ -6,10 +6,12 @@ using DeviceRepair.Models.SFC;
 using DeviceRepair.Utils;
 using NLog;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using TsSFCDevice.Client.Biz.Base.Service;
 using TsSFCDevice.Client.Biz.Base.Utils;
 
@@ -593,6 +595,28 @@ namespace TsSFCDevice.Client.Biz.Impl
             }
         }
 
+        /// <summary>
+        /// 判断当前开工设备是否存在未完成的保养计划
+        /// </summary>
+        /// <param name="EquipmentID"></param>
+        /// <returns></returns>
+        public APIResponseData Get_EquipmentPlanIsComplete(string EquipmentID)
+        {
+            try
+            {
+                ApiParameters?.Clear();
+                ApiParameters.Add("EquipmentID", EquipmentID);
+
+                var Rtn = Utility.SfcBizService.CurrentSvc.Get_EquipmentPlanIsComplete(GetParameters());
+                return new APIResponseData { Code = Rtn.Code, Message = Rtn.Message };
+            }
+            catch (Exception ex)
+            {
+                log.Error(ex.Message, ex);
+                throw ex;
+            }
+        }
+
         #region 公共
 
         internal string GetParameters(string cOperator = "", bool bFlag = true)
diff --git a/TsSFCDevice.Client.Biz/Scheduler.cs b/TsSFCDevice.Client.Biz/Scheduler.cs
new file mode 100644
index 0000000..671b5f3
--- /dev/null
+++ b/TsSFCDevice.Client.Biz/Scheduler.cs
@@ -0,0 +1,62 @@
+using DeviceRepair.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TsSFCDevice.Client.Biz.Impl;
+
+namespace TsSFCDevice.Client.Biz
+{
+    public class Scheduler
+    {
+        public delegate void CallBackEventHandler(string args, object value);
+        public event CallBackEventHandler CallBack;
+
+        private static Scheduler manager;
+        public static Scheduler Instance
+        {
+            get
+            {
+                if (manager == null)
+                    manager = new Scheduler();
+                return manager;
+            }
+        }
+
+        /// <summary>
+        /// 启动
+        /// </summary>
+        public void Run()
+        {
+            Task.Run(() =>
+            {
+                while (true)
+                {
+                    Console.WriteLine(DateTime.Now.ToLongTimeString());
+                    GetSchedulerPlanTips();
+                    Task.Delay(3000).Wait();
+                }
+            });
+        }
+
+        /// <summary>
+        /// 获取当年度 - 当月待保养计划 - 数量
+        /// </summary>
+        protected void GetSchedulerPlanTips()
+        {
+            try
+            {
+                IList<View_CurrentMonthPlanTips> lst = PlanRepository.Instance.Get_PM_PLAN_CurrentMonth();
+                CallBack?.Invoke("SchedulerPlanTips", (lst?.Count ?? 00));
+            }
+            catch (Exception ex)
+            {
+                CallBack?.Invoke("SchedulerPlanTips", ex.Message);
+            }
+        }
+
+        //    
+
+    }
+}
diff --git a/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj b/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj
index ef391eb..388ce9b 100644
--- a/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj
+++ b/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj
@@ -78,6 +78,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="Scheduler.cs" />
     <Compile Include="Web References\DeviceSvc\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl
index 9bac26c..a3a4987 100644
--- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl	
+++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl	
@@ -61,6 +61,7 @@
           <s:enumeration value="Get_EquiAnnualPlans" />
           <s:enumeration value="AM_PLAN_Scheduler" />
           <s:enumeration value="SFC_Batch_PE_QE_Email" />
+          <s:enumeration value="Get_SFC_Auths" />
           <s:enumeration value="Attachment" />
         </s:restriction>
       </s:simpleType>
@@ -97,6 +98,20 @@
           </s:sequence>
         </s:complexType>
       </s:element>
+      <s:element name="Get_EquipmentPlanIsComplete">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="inParams" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="Get_EquipmentPlanIsCompleteResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="Get_EquipmentPlanIsCompleteResult" type="tns:APIResponseData" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
       <s:element name="Get_DEVICE_TreeDatas">
         <s:complexType>
           <s:sequence>
@@ -954,6 +969,15 @@
   <wsdl:message name="UserLoginSFCAuthorize">
     <wsdl:part name="SFCAuthorize" element="tns:SFCAuthorize" />
   </wsdl:message>
+  <wsdl:message name="Get_EquipmentPlanIsCompleteSoapIn">
+    <wsdl:part name="parameters" element="tns:Get_EquipmentPlanIsComplete" />
+  </wsdl:message>
+  <wsdl:message name="Get_EquipmentPlanIsCompleteSoapOut">
+    <wsdl:part name="parameters" element="tns:Get_EquipmentPlanIsCompleteResponse" />
+  </wsdl:message>
+  <wsdl:message name="Get_EquipmentPlanIsCompleteSFCAuthorize">
+    <wsdl:part name="SFCAuthorize" element="tns:SFCAuthorize" />
+  </wsdl:message>
   <wsdl:message name="Get_DEVICE_TreeDatasSoapIn">
     <wsdl:part name="parameters" element="tns:Get_DEVICE_TreeDatas" />
   </wsdl:message>
@@ -1387,6 +1411,11 @@
       <wsdl:input message="tns:UserLoginSoapIn" />
       <wsdl:output message="tns:UserLoginSoapOut" />
     </wsdl:operation>
+    <wsdl:operation name="Get_EquipmentPlanIsComplete">
+      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">判断当前开工设备是否存在未完成的保养计划</wsdl:documentation>
+      <wsdl:input message="tns:Get_EquipmentPlanIsCompleteSoapIn" />
+      <wsdl:output message="tns:Get_EquipmentPlanIsCompleteSoapOut" />
+    </wsdl:operation>
     <wsdl:operation name="Get_DEVICE_TreeDatas">
       <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">获取树形结构</wsdl:documentation>
       <wsdl:input message="tns:Get_DEVICE_TreeDatasSoapIn" />
@@ -1660,6 +1689,16 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="Get_EquipmentPlanIsComplete">
+      <soap:operation soapAction="http://www.TechScan.cn/Get_EquipmentPlanIsComplete" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+        <soap:header message="tns:Get_EquipmentPlanIsCompleteSFCAuthorize" part="SFCAuthorize" use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="Get_DEVICE_TreeDatas">
       <soap:operation soapAction="http://www.TechScan.cn/Get_DEVICE_TreeDatas" style="document" />
       <wsdl:input>
@@ -2163,6 +2202,16 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="Get_EquipmentPlanIsComplete">
+      <soap12:operation soapAction="http://www.TechScan.cn/Get_EquipmentPlanIsComplete" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+        <soap12:header message="tns:Get_EquipmentPlanIsCompleteSFCAuthorize" part="SFCAuthorize" use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="Get_DEVICE_TreeDatas">
       <soap12:operation soapAction="http://www.TechScan.cn/Get_DEVICE_TreeDatas" style="document" />
       <wsdl:input>
diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs
index 4a978cd..76bf4c3 100644
--- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs	
+++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs	
@@ -40,6 +40,8 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc {
         
         private System.Threading.SendOrPostCallback UserLoginOperationCompleted;
         
+        private System.Threading.SendOrPostCallback Get_EquipmentPlanIsCompleteOperationCompleted;
+        
         private System.Threading.SendOrPostCallback Get_DEVICE_TreeDatasOperationCompleted;
         
         private System.Threading.SendOrPostCallback Get_DEVICE_RouteOperationCompleted;
@@ -191,6 +193,9 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc {
         /// <remarks/>
         public event UserLoginCompletedEventHandler UserLoginCompleted;
         
+        /// <remarks/>
+        public event Get_EquipmentPlanIsCompleteCompletedEventHandler Get_EquipmentPlanIsCompleteCompleted;
+        
         /// <remarks/>
         public event Get_DEVICE_TreeDatasCompletedEventHandler Get_DEVICE_TreeDatasCompleted;
         
@@ -453,6 +458,36 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_EquipmentPlanIsComplete", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public APIResponseData Get_EquipmentPlanIsComplete(string inParams) {
+            object[] results = this.Invoke("Get_EquipmentPlanIsComplete", new object[] {
+                        inParams});
+            return ((APIResponseData)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Get_EquipmentPlanIsCompleteAsync(string inParams) {
+            this.Get_EquipmentPlanIsCompleteAsync(inParams, null);
+        }
+        
+        /// <remarks/>
+        public void Get_EquipmentPlanIsCompleteAsync(string inParams, object userState) {
+            if ((this.Get_EquipmentPlanIsCompleteOperationCompleted == null)) {
+                this.Get_EquipmentPlanIsCompleteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGet_EquipmentPlanIsCompleteOperationCompleted);
+            }
+            this.InvokeAsync("Get_EquipmentPlanIsComplete", new object[] {
+                        inParams}, this.Get_EquipmentPlanIsCompleteOperationCompleted, userState);
+        }
+        
+        private void OnGet_EquipmentPlanIsCompleteOperationCompleted(object arg) {
+            if ((this.Get_EquipmentPlanIsCompleteCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Get_EquipmentPlanIsCompleteCompleted(this, new Get_EquipmentPlanIsCompleteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_DEVICE_TreeDatas", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -2138,6 +2173,9 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc {
         /// <remarks/>
         SFC_Batch_PE_QE_Email,
         
+        /// <remarks/>
+        Get_SFC_Auths,
+        
         /// <remarks/>
         Attachment,
     }
@@ -2262,6 +2300,32 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
+    public delegate void Get_EquipmentPlanIsCompleteCompletedEventHandler(object sender, Get_EquipmentPlanIsCompleteCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Get_EquipmentPlanIsCompleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Get_EquipmentPlanIsCompleteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public APIResponseData Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((APIResponseData)(this.results[0]));
+            }
+        }
+    }
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     public delegate void Get_DEVICE_TreeDatasCompletedEventHandler(object sender, Get_DEVICE_TreeDatasCompletedEventArgs e);
diff --git a/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.Designer.cs b/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.Designer.cs
index fffb040..8238743 100644
--- a/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.Designer.cs
+++ b/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.Designer.cs
@@ -102,6 +102,9 @@
             // 
             // tvDevices
             // 
+            this.tvDevices.Appearance.HeaderPanel.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.tvDevices.Appearance.HeaderPanel.Options.UseFont = true;
+            this.tvDevices.CaptionHeight = 31;
             this.tvDevices.ColumnPanelRowHeight = 31;
             this.tvDevices.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
             this.colAutoID,
diff --git a/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.resx b/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.resx
index 169f18b..116124a 100644
--- a/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.resx
+++ b/TsSFCDevice.Client.Launch/CheckForm/page_AssignDriveTree.resx
@@ -118,102 +118,102 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>205, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="bBtnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAALdEVYdFRpdGxlAFNhdmU7+ej5CQAAAvRJREFUOE+Fk11Ik1EYx1emIWIfVpqUkhkDwTRtbbr5
-        Oufmvpxz0+lsTrfhzK/8yO+VpgZFEXQTBN0GBSGFGEVRQXSZHxdhqRFdqE3nNCuXK2/+nedtFxJBB368
-        L+85/995znl4BaGxnRHG2PEX4f8gIgTNb2MIwjhNxStOVwGbewC9Q7fRNXAL7edvorn3Bhrar8PdcgWO
-        hkuodPdDb2mBrKAcWcrS1yxLQkEEp7XCM3gNVlcfAsFNBDb+sB7i+49N+L78gHclALWpAa09l5CtKgXL
-        RpJgp7SgDN39V2Gp9vBBWry4SgT4kFiqgZjTYmLWB6XBjRJbHSQKMwmiSBBJto7zl2GydfE7UtgbCn+Y
-        W0MWp4O6yIYFfwByrZMJaiGSF5MgmgRR4nwz2lhZReVtrNxfWFgO4JP3G95+9GOc7copjDCUOjG/vI6c
-        giqYT9cikzOQYDcJok/JjWjuHIS2pInfdfKDDxMzPowzxhhvppcwx8JzvnVkK2wwVbiRLtWSYC8JdpGt
-        sa0PKmMd8gtrodDXQK5xIVfjQI7KDqmykgVPIyuvAhK5FcXWGhwXq0mwjwR70qU6nGnxgCswwVjuYjhR
-        VOaEweJgVKOwtBr6kiroSuzQmSvZnAspIiUJDpAgJlWiRk1TDy/435Ap2X1YXBBm5JEgjgT7U0QqOOo6
-        WLnF/KLV7z+x+o0IYvVrEH727mfPFYYkT88qciA5jSNBPAliyWZ3t7IzGniBnwUpwLMWxPLaBo+PIZKp
-        2VGqkJQqJcEhEhw8lp4Lq/MsuyA9+kdncWFkBj0Pp9E5PI22++/RfO8dGu9Oof7OFE7KNNAUVyIxRUKC
-        BBLEJ6XKYLHXQ5SjxfXXS7j6ahGXX3ox9Pwz+p4uwPN4Ht2jc+hgZGSrWFfMSBCKSJBIgpjDwswxMmZI
-        1TANvUTRxRfQeZ5B3f0EinOPwDWPILv+AU7VDiNNnA/hCQ5xR45PsizfBfotqZ9kO7KFpC0c3UJy6Fus
-        QCAI/w0F4v5uZtgcHwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAt0RVh0VGl0
+        bGUAU2F2ZTv56PkJAAAC9ElEQVQ4T4WTXUiTURjHV6YhYh9WmpSSGQPBNG1tuvk65+a+nHPT6WxOt+HM
+        r/zI75WmBkURdBME3QYFIYUYRVFBdJkfF2GpEV2oTec0K5crb/6d520XEkEHfrwv7zn/33nOeXgFobGd
+        EcbY8Rfh/yAiBM1vYwjCOE3FK05XAZt7AL1Dt9E1cAvt52+iufcGGtqvw91yBY6GS6h090NvaYGsoBxZ
+        ytLXLEtCQQSntcIzeA1WVx8CwU0ENv6wHuL7j034vvyAdyUAtakBrT2XkK0qBctGkmCntKAM3f1XYan2
+        8EFavLhKBPiQWKqBmNNiYtYHpcGNElsdJAozCaJIEEm2jvOXYbJ18TtS2BsKf5hbQxang7rIhgV/AHKt
+        kwlqIZIXkyCaBFHifDPaWFlF5W2s3F9YWA7gk/cb3n70Y5ztyimMMJQ6Mb+8jpyCKphP1yKTM5BgNwmi
+        T8mNaO4chLakid918oMPEzM+jDPGGG+mlzDHwnO+dWQrbDBVuJEu1ZJgLwl2ka2xrQ8qYx3yC2uh0NdA
+        rnEhV+NAjsoOqbKSBU8jK68CErkVxdYaHBerSbCPBHvSpTqcafGAKzDBWO5iOFFU5oTB4mBUo7C0GvqS
+        KuhK7NCZK9mcCykiJQkOkCAmVaJGTVMPL/jfkCnZfVhcEGbkkSCOBPtTRCo46jpYucX8otXvP7H6jQhi
+        9WsQfvbuZ88VhiRPzypyIDmNI0E8CWLJZne3sjMaeIGfBSnAsxbE8toGj48hkqnZUaqQlColwSESHDyW
+        ngur8yy7ID36R2dxYWQGPQ+n0Tk8jbb779F87x0a706h/s4UTso00BRXIjFFQoIEEsQnpcpgsddDlKPF
+        9ddLuPpqEZdfejH0/DP6ni7A83ge3aNz6GBkZKtYV8xIEIpIkEiCmMPCzDEyZkjVMA29RNHFF9B5nkHd
+        /QSKc4/ANY8gu/4BTtUOI02cD+EJDnFHjk+yLN8F+i2pn2Q7soWkLRzdQnLoW6xAIAj/DQXi/m5m2Bwf
+        AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="bBtnSave.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
-        CtBCAjUAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAt0RVh0VGl0
+        bGUAU2F2ZTv56PkJAAAJQElEQVRYR8WWd1TUVxbH3ZItycYkpm39d/+Ku1FRikjvvQ0ww9AZGJgBBhh6
+        GRh6R6RIQEWxIGKkKKLYgsEaY8EuKEWRCCrShKjnu/f9hiEhuMecPSdn3zkfHo+Zw/d77yv3LgHwf+Wn
+        41fEr/9HfvMzUH+X6Swa7IO3iN8Tf/wJb7+Bd34m7Lvs/zMzC0ywxVth6Vsy5Hk7X0YX1COmcDfiiuvB
+        F6fD1iMGtoIYeIhSkV+2G7ml9cgu2YHMou1QFmxDal4tUrI3IzGjBnHKKsQoNiIqqQwWjsFw8pbD0UsO
+        B49I2PFlL614kh2kxUywgOcHW/whInfHbNPxK2g50Y3mzm60dV2Hpp4HjCw8YeMcDM8gJZ5NzWKMeDqp
+        4snEDB6Pz2B0/DlGnql4NDaN755Mw8w+EFV1+1FZ24ryTc3YUNMEW7fwl6TFssGyMD/Y4u3w7Do0HbuM
+        3E3tyN7cjpK6o3MGhLBxCoYwMJUTvNr/BN19j3Hl3mNcvjuKS70jWKllTlhipTZB8/2RCRjbiiCNKYE4
+        qhCBEXlIpixZu4ayk/funOb8YIt3wtK3ofHIRWRVtxEHULytA2v0BDA0F8LaSQx+QAoX3cWeEXzb8wgX
+        7jzCN7e/w/lbw1ilY40Vmk4k7gx72q67Q89gaOWHkLgiBEXlQRSRi/jMarWBpcRvmbB6MAN/kio3o+Hw
+        BaRXtSKjaj8Kt3Zg9To+DOYMuPkm48HoJM7dHMbZG8M4c/0hTl8bwqmrQ9DQtYPGWh4ZdoetezRuDTyB
+        noUPQmKKERhJBsJzEZteBSsXKTPwHrHYgERRg11t55BW0QJlZQsKtrRjtS4ZMPOAlWMgeN6J6BseR1f3
+        A3zdfR+dlwfx1aVBnLg4QMJO0DH0wFpjL4oyCldpW3TNvBAsL6LocxAQloXo1ApYOEuYgfeJRQbeDUmu
+        Rt3+M1CUfYnUsn3I33yQInOHPhmwdBDB2TMed+4/xYlv+3H8Qj+OEh3n+9Bx7h60DHjQN/eFkbUIFrwI
+        XLj5EDrGHhDLC+AXng2f0GxEppTDnG4Gab3WwNKghErUNnUhqaQRyaV7kVPTSml1g56pABb2IrpKsbh2
+        bwQdZ+/iENF+phcHT/ei7VQPtA3dYeEig7mzDGZO4ThNGdIy5NMBzIdfaCa8JZmQJW6AmaOYGfiAWGCA
+        LZYGxJZj095OJNIbkFjcgKyqFjpcrlhnwoe5XQDd42hcuj2MA109OPD1HbQyTt5GC9HceQunrgyi6/IA
+        Tl4aQOfFfmjqu3H77yXNhFdIOsLii2FCV5O0ls1pzg+2eM9PXoKN9ccRm7cT8fm7kFnZBEuXMKzQdsEK
+        LRfomfnAyCoABlb+0Lfwha65N3RNvbDWRAhtSre2oQCaFPUafXc6E67cNQyg/fckcaFYSQeyEEY2IrUB
+        9urOD2bgfS9ZIcq2d0CevR3ynO1QlDZAWd6I9LK9UDI2NNLM1o1I27AHSvo8taQBEakbIYkpQkh0IcQM
+        2vcgunYiWQ586fAJg9LApzckKDKfM09aHxKLDXhI87B+y0FEZNSqyKxF1BxyNmcxts7/Ls/cgghlDXwo
+        Qh9JOrxpZtF6BjOU8BCnQcDERQrw/RV0E3JgYOnHDHxELDLwgXtwFgqqWxGetglhCoJm9ruMzUqa1aTV
+        ENX0txoE0CsnnBNkaWbRenARkygJuwcQ/slw80uGb2gWvQ2+PzYwX5CYgWUugenIrmiCJLEKkuQvIEn5
+        AlI2J1dBmkJ/I9gcmrJRtU6sIDElBEyMUsxEBSzaOWEmyvNLAs83CS4+CXQQldzbQFofEwsMsMUyJ98U
+        KNfvQVBsBYISyiGOL4cX3V8PikxAEQrYzKWVxIIU9I8T4OgZTdeTVbsoeoIjYc9nVS8CNm4ymiPB80nk
+        xJ284rnM6Bh7MgOfzGkuMPChnWciFIU7ESDfwCGSr+eimn3xEjOzKp4T07MvMDXzEhPTsxinysgq5DOq
+        jGOTM3hKVfExg6qihZOUhOPIZCwcBLHcOdA2EqoN/I5YaMCaH4O4nG3wlRURxfCjmaWPCU8+f0F8/4Mo
+        K8VUhpnQ6BhjGiPEo6dTXCkefjJJ5TiYe7zs+bHcG+JK2dA04DMDnxKLDHxkSW94NBUkoSSfUp8HT2k+
+        nH3iuagnSLz52C18eeQm9hy+hk2NF1C56zxK686guPYU8qtPIrvyBNJLj5L4FIYfT8LYJpATtnWX05bI
+        4SyMp+Lmxgz8mZg3wH4wAx+bOYcjnA6cICibOiEVDsJoTM+8wPj095RqBjUiE7PzaVZFrY6cCROjUxgi
+        AwaW/rChoGx4UbB2ofNB26CxzvW/GzCyl1L9LodrQAbcROk0UzvmHokpin6cxHe3X8PO/VdQVf8NSref
+        RQmLvEYd+TEoig8jsaCdEx+isr2OXk4mbE31wcJJRt1QNFbquDADfyEWGfhEz1qMwKj1cPZN43DxVcCK
+        F8alf4y1YCxy6ojYnrPIR7jIWfulivwhg4SHRibxgNCm0syEGeaO4bDmRWKFjtNrDbDFp7oWgfAPK6BT
+        mwwHhjAJ5nSSWfRjJP50fBajXNp/6Ps4ceIhRc2Jj05w4qwl09IXwMwhnAiDqX0Y9QIR+FyLM/BXgjWm
+        Cw1om/rRi5ZNBycedgIVJnZiVHT2I+dQDzLa7iCx+Qbi991AzN7riG68jsiG65DVX0PYzquQ7LiK4Lpu
+        BG3rRuDWbjpw7lT9QmFqFwoTWynMyci/1zgyA38jFhvQNPamlyydTmwsrN1iOAypwdh45hEKTgwh88gD
+        pB0aRMrBASQdGED8/n7EtvQhuqkPkfvuQdZ4F+GEtKEXkt091KDy6CZIYETiRjSbkpnlaxxea4C7hmsM
+        PF+5+adSCZbDyjkKloQedTllXcPIPaYSV7QPIrltEAlkIK6lH9HNfYgi8Yi9KvHQPb2cgZD6Xq5JZcJq
+        jG0l+Gy1/QvSWvAOsB9cR7Rc06FolR7/lQY1oiupFWNo0j56FnbBNesrOKYdhW1yB6wTDsEi9iBM5Adg
+        GNGKdaFN0JHsg6a4EatFe7DKfzc+99mF5RoO+EzDnmO5ilf//JdJPmmpWzLOABvsF+aItcvsmWSHhKXp
+        Tfz9DfzjR7A1u/9MfD796sEW6kyw7WBf+CVgQaojX2BAPdQf/NLMjSVL/gMGC1sK0EICNQAAAABJRU5E
+        rkJggg==
 </value>
   </data>
   <data name="page_AssignDriveTree.IconOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
-        gVfwAAAAAElFTkSuQmCC
+        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
+        YII=
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.Designer.cs b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.Designer.cs
index dc0f7ec..6a23183 100644
--- a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.Designer.cs
+++ b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.Designer.cs
@@ -70,6 +70,7 @@
             this.txt_OperatingParameters = new DevExpress.XtraEditors.TextEdit();
             this.txt_Remarks = new DevExpress.XtraEditors.TextEdit();
             this.btn_SelectFormRev = new DevExpress.XtraEditors.ButtonEdit();
+            this.btn_AM_Form = new DevExpress.XtraEditors.ButtonEdit();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -89,13 +90,12 @@
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true);
             this.dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            this.btn_AM_Form = new DevExpress.XtraEditors.ButtonEdit();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             stackPanel1 = new DevExpress.Utils.Layout.StackPanel();
             ((System.ComponentModel.ISupportInitialize)(stackPanel1)).BeginInit();
             stackPanel1.SuspendLayout();
@@ -121,6 +121,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_OperatingParameters.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_Remarks.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.btn_SelectFormRev.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.btn_AM_Form.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -140,12 +141,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.btn_AM_Form.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             this.SuspendLayout();
             // 
             // stackPanel1
@@ -570,11 +570,33 @@
             this.btn_SelectFormRev.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis, "", 30, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.btn_SelectFormRev.Properties.ReadOnly = true;
+            this.btn_SelectFormRev.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.btn_SelectFormRev.Size = new System.Drawing.Size(353, 26);
             this.btn_SelectFormRev.StyleController = this.layoutControl2;
             this.btn_SelectFormRev.TabIndex = 19;
             this.btn_SelectFormRev.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.btn_SelectFormRev_ButtonClick);
             // 
+            // btn_AM_Form
+            // 
+            this.btn_AM_Form.Location = new System.Drawing.Point(695, 489);
+            this.btn_AM_Form.Name = "btn_AM_Form";
+            this.btn_AM_Form.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.btn_AM_Form.Properties.Appearance.Options.UseFont = true;
+            this.btn_AM_Form.Properties.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.btn_AM_Form.Properties.AppearanceDisabled.Options.UseFont = true;
+            this.btn_AM_Form.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.btn_AM_Form.Properties.AppearanceFocused.Options.UseFont = true;
+            this.btn_AM_Form.Properties.AppearanceReadOnly.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.btn_AM_Form.Properties.AppearanceReadOnly.Options.UseFont = true;
+            this.btn_AM_Form.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.btn_AM_Form.Properties.ReadOnly = true;
+            this.btn_AM_Form.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.btn_AM_Form.Size = new System.Drawing.Size(353, 26);
+            this.btn_AM_Form.StyleController = this.layoutControl2;
+            this.btn_AM_Form.TabIndex = 24;
+            this.btn_AM_Form.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.btn_AM_Form_ButtonClick);
+            // 
             // layoutControlGroup1
             // 
             this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -921,6 +943,23 @@
             this.layoutControlItem17.Text = "PM的点检表：";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(151, 19);
             // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.layoutControlItem12.AppearanceItemCaption.Options.UseFont = true;
+            this.layoutControlItem12.AppearanceItemCaptionDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.layoutControlItem12.AppearanceItemCaptionDisabled.Options.UseFont = true;
+            this.layoutControlItem12.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.layoutControlItem12.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+            this.layoutControlItem12.Control = this.btn_AM_Form;
+            this.layoutControlItem12.Location = new System.Drawing.Point(520, 463);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 8;
+            this.layoutControlItem12.Size = new System.Drawing.Size(520, 58);
+            this.layoutControlItem12.Text = "AM的点检表：";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(151, 19);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -958,42 +997,6 @@
             // 
             this.dxErrorProvider1.ContainerControl = this;
             // 
-            // btn_AM_Form
-            // 
-            this.btn_AM_Form.Location = new System.Drawing.Point(695, 489);
-            this.btn_AM_Form.Name = "btn_AM_Form";
-            this.btn_AM_Form.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.btn_AM_Form.Properties.Appearance.Options.UseFont = true;
-            this.btn_AM_Form.Properties.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.btn_AM_Form.Properties.AppearanceDisabled.Options.UseFont = true;
-            this.btn_AM_Form.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.btn_AM_Form.Properties.AppearanceFocused.Options.UseFont = true;
-            this.btn_AM_Form.Properties.AppearanceReadOnly.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.btn_AM_Form.Properties.AppearanceReadOnly.Options.UseFont = true;
-            this.btn_AM_Form.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.btn_AM_Form.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.btn_AM_Form.Size = new System.Drawing.Size(353, 26);
-            this.btn_AM_Form.StyleController = this.layoutControl2;
-            this.btn_AM_Form.TabIndex = 24;
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.layoutControlItem12.AppearanceItemCaption.Options.UseFont = true;
-            this.layoutControlItem12.AppearanceItemCaptionDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.layoutControlItem12.AppearanceItemCaptionDisabled.Options.UseFont = true;
-            this.layoutControlItem12.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.layoutControlItem12.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
-            this.layoutControlItem12.Control = this.btn_AM_Form;
-            this.layoutControlItem12.Location = new System.Drawing.Point(520, 463);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem12.Size = new System.Drawing.Size(520, 58);
-            this.layoutControlItem12.Text = "AM的点检表：";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(151, 19);
-            // 
             // Page_DriveInfoEdit
             // 
             this.AcceptButton = this.btn_Submit;
@@ -1034,6 +1037,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_OperatingParameters.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_Remarks.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.btn_SelectFormRev.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.btn_AM_Form.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -1053,12 +1057,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.btn_AM_Form.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             this.ResumeLayout(false);
 
         }
diff --git a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs
index 9e0e678..a1c0941 100644
--- a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs
+++ b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs
@@ -15,6 +15,8 @@ namespace TsSFCDevice.Client.Launch.Device
         private View_DriveInfomationModel CurrentModel;
         private int FormVerValue = 0;
         private string FormVerName = "";
+        private int AMFormVerValue = 0;
+        private string AMFormVerName = "";
 
         public DeviceInformationInfo OperationObject;
         public DateTime ServiceTime;
@@ -39,7 +41,7 @@ namespace TsSFCDevice.Client.Launch.Device
             txt_Route.Tag = CurrentModel.Route;
             if (CurrentModel.Route > 0)
             {
-                txt_Route.EditValue = Utility.SystemRuntimeInfo.CurrentDevRootCaches.FirstOrDefault(x=>x.AutoID == CurrentModel.Route)?.Name;
+                txt_Route.EditValue = Utility.SystemRuntimeInfo.CurrentDevRootCaches.FirstOrDefault(x => x.AutoID == CurrentModel.Route)?.Name;
             }
             //txt_Route.EditValue = CurrentModel.RouteText;
 
@@ -189,6 +191,7 @@ namespace TsSFCDevice.Client.Launch.Device
                     OwningUnit = txt_OwningUnit.Text,
                     OperatingParameters = txt_OperatingParameters.Text,
                     MaintenanceFormVersion = FormVerValue,
+                    MaintenanceAMFormVersion = AMFormVerValue,
                     Remarks = txt_Remarks.Text
                 };
 
@@ -466,5 +469,20 @@ namespace TsSFCDevice.Client.Launch.Device
                 }
             }
         }
+
+        private void btn_AM_Form_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            int Value = 0;
+            int.TryParse(AMFormVerValue + "", out Value);
+
+            Page_FormVersionDialog view = new Page_FormVersionDialog(Value, DeviceRepair.Models.Enum.EnumDeviceBelong.AM);
+            if (view.ShowDialog(this) == DialogResult.OK)
+            {
+                CurrentModel.MaintenanceAMFormVersion = view.SelectValue;
+                AMFormVerValue = view.SelectValue;
+                AMFormVerName = view.SelectText + "";
+                btn_AM_Form.Text = AMFormVerName;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.resx b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.resx
index 0746156..a54acad 100644
--- a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.resx
+++ b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.resx
@@ -121,7 +121,7 @@
     <value>False</value>
   </metadata>
   <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 17</value>
+    <value>208, 17</value>
   </metadata>
   <assembly alias="DevExpress.Data.v20.2" name="DevExpress.Data.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="Page_DriveInfoEdit.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/TsSFCDevice.Client.Launch/Device/Page_FormVersionDialog.cs b/TsSFCDevice.Client.Launch/Device/Page_FormVersionDialog.cs
index e4de5d3..4c24667 100644
--- a/TsSFCDevice.Client.Launch/Device/Page_FormVersionDialog.cs
+++ b/TsSFCDevice.Client.Launch/Device/Page_FormVersionDialog.cs
@@ -1,5 +1,6 @@
 using DevExpress.XtraEditors;
 using DeviceRepair.Models;
+using DeviceRepair.Models.Enum;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,10 +14,18 @@ namespace TsSFCDevice.Client.Launch.Device
         public int SelectValue = 0;
         public string SelectText = string.Empty;
 
-        public Page_FormVersionDialog(int AutoID)
+        private EnumDeviceBelong Belong = EnumDeviceBelong.PM;
+
+        public Page_FormVersionDialog() : this(0)
+        {
+
+        }
+
+        public Page_FormVersionDialog(int AutoID, EnumDeviceBelong belong = EnumDeviceBelong.PM)
         {
             InitializeComponent();
             SelectValue = AutoID;
+            Belong = belong;
         }
 
         private void btn_Submit_Click(object sender, EventArgs e)
@@ -88,7 +97,7 @@ namespace TsSFCDevice.Client.Launch.Device
             try
             {
                 List<MaintenanceFormVersionInfo> result = CheckFormRepository.Instance.GetDatas()?.ToList();
-                List<MaintenanceFormVersionInfo> lst = result.Where(x => x.FormStatus == true)?.ToList();
+                List<MaintenanceFormVersionInfo> lst = result.Where(x => x.FormStatus == true && (x.FormBelong ?? "").Trim().Equals(Belong.ToString().Trim(), StringComparison.OrdinalIgnoreCase))?.ToList();
                 gridControl1.DataSource = lst;
             }
             catch (Exception ex)
diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs
new file mode 100644
index 0000000..0be56ab
--- /dev/null
+++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs
@@ -0,0 +1,578 @@
+namespace TsSFCDevice.Client.Launch.Device
+{
+    partial class pageDeviceTreeView
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageDeviceTreeView));
+            this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
+            this.baripsEquipmentID = new DevExpress.XtraBars.BarEditItem();
+            this.ipsEquipmentID = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.barSearch = new DevExpress.XtraBars.BarButtonItem();
+            this.barInsert = new DevExpress.XtraBars.BarButtonItem();
+            this.barEdit = new DevExpress.XtraBars.BarButtonItem();
+            this.barEditStatus = new DevExpress.XtraBars.BarButtonItem();
+            this.barRefresh = new DevExpress.XtraBars.BarButtonItem();
+            this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+            this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true);
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.treeList1 = new DevExpress.XtraTreeList.TreeList();
+            this.gcAutoID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcEquipmentName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcEquipmentID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcSpecification = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcManufacturer = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcSerialNumber = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcUsingDate = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcTotalcapacity = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcWeight = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcEquipmentCategory = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcEquipmentOriginalvalue = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcEquipmentStatus = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcWarrantyPeriod = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcInstallationLocation = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcOwningUnit = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcOperatingParameters = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.gcRemarks = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.UsingDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.treeList1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // ribbon
+            // 
+            this.ribbon.ExpandCollapseItem.Id = 0;
+            this.ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
+            this.ribbon.ExpandCollapseItem,
+            this.ribbon.SearchEditItem,
+            this.baripsEquipmentID,
+            this.barSearch,
+            this.barInsert,
+            this.barEdit,
+            this.barEditStatus,
+            this.barRefresh});
+            this.ribbon.Location = new System.Drawing.Point(0, 0);
+            this.ribbon.Margin = new System.Windows.Forms.Padding(4);
+            this.ribbon.MaxItemId = 8;
+            this.ribbon.Name = "ribbon";
+            this.ribbon.OptionsMenuMinWidth = 424;
+            this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
+            this.ribbonPage1});
+            this.ribbon.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.ipsEquipmentID});
+            this.ribbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
+            this.ribbon.ShowQatLocationSelector = false;
+            this.ribbon.ShowToolbarCustomizeItem = false;
+            this.ribbon.Size = new System.Drawing.Size(1331, 133);
+            this.ribbon.Toolbar.ShowCustomizeItem = false;
+            this.ribbon.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
+            // 
+            // baripsEquipmentID
+            // 
+            this.baripsEquipmentID.Caption = "设备编号：";
+            this.baripsEquipmentID.Edit = this.ipsEquipmentID;
+            this.baripsEquipmentID.EditHeight = 30;
+            this.baripsEquipmentID.EditWidth = 180;
+            this.baripsEquipmentID.Id = 1;
+            this.baripsEquipmentID.ItemAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemAppearance.Disabled.Options.UseFont = true;
+            this.baripsEquipmentID.ItemAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemAppearance.Hovered.Options.UseFont = true;
+            this.baripsEquipmentID.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemAppearance.Normal.Options.UseFont = true;
+            this.baripsEquipmentID.ItemAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemAppearance.Pressed.Options.UseFont = true;
+            this.baripsEquipmentID.ItemInMenuAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemInMenuAppearance.Disabled.Options.UseFont = true;
+            this.baripsEquipmentID.ItemInMenuAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemInMenuAppearance.Hovered.Options.UseFont = true;
+            this.baripsEquipmentID.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemInMenuAppearance.Normal.Options.UseFont = true;
+            this.baripsEquipmentID.ItemInMenuAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.baripsEquipmentID.ItemInMenuAppearance.Pressed.Options.UseFont = true;
+            this.baripsEquipmentID.Name = "baripsEquipmentID";
+            // 
+            // ipsEquipmentID
+            // 
+            this.ipsEquipmentID.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.ipsEquipmentID.Appearance.Options.UseFont = true;
+            this.ipsEquipmentID.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.ipsEquipmentID.AppearanceDisabled.Options.UseFont = true;
+            this.ipsEquipmentID.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.ipsEquipmentID.AppearanceFocused.Options.UseFont = true;
+            this.ipsEquipmentID.AppearanceReadOnly.Options.UseTextOptions = true;
+            this.ipsEquipmentID.AppearanceReadOnly.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
+            this.ipsEquipmentID.AutoHeight = false;
+            serializableAppearanceObject1.Font = new System.Drawing.Font("Tahoma", 12F);
+            serializableAppearanceObject1.Options.UseFont = true;
+            serializableAppearanceObject2.Font = new System.Drawing.Font("Tahoma", 12F);
+            serializableAppearanceObject2.Options.UseFont = true;
+            serializableAppearanceObject3.Font = new System.Drawing.Font("Tahoma", 2F);
+            serializableAppearanceObject3.Options.UseFont = true;
+            serializableAppearanceObject4.Font = new System.Drawing.Font("Tahoma", 12F);
+            serializableAppearanceObject4.Options.UseFont = true;
+            this.ipsEquipmentID.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.ipsEquipmentID.MaxLength = 20;
+            this.ipsEquipmentID.Name = "ipsEquipmentID";
+            this.ipsEquipmentID.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.ipsEquipmentID_ButtonClick);
+            // 
+            // barSearch
+            // 
+            this.barSearch.Caption = "查询";
+            this.barSearch.Id = 2;
+            this.barSearch.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barSearch.ImageOptions.SvgImage")));
+            this.barSearch.Name = "barSearch";
+            this.barSearch.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barSearch_ItemClick);
+            // 
+            // barInsert
+            // 
+            this.barInsert.Caption = "新增";
+            this.barInsert.Id = 3;
+            this.barInsert.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barInsert.ImageOptions.Image")));
+            this.barInsert.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barInsert.ImageOptions.LargeImage")));
+            this.barInsert.Name = "barInsert";
+            this.barInsert.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barInsert_ItemClick);
+            // 
+            // barEdit
+            // 
+            this.barEdit.Caption = "修改";
+            this.barEdit.Enabled = false;
+            this.barEdit.Id = 4;
+            this.barEdit.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barEdit.ImageOptions.Image")));
+            this.barEdit.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barEdit.ImageOptions.LargeImage")));
+            this.barEdit.Name = "barEdit";
+            this.barEdit.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barEdit_ItemClick);
+            // 
+            // barEditStatus
+            // 
+            this.barEditStatus.Caption = "修改状态";
+            this.barEditStatus.Enabled = false;
+            this.barEditStatus.Id = 5;
+            this.barEditStatus.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barEditStatus.ImageOptions.Image")));
+            this.barEditStatus.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barEditStatus.ImageOptions.LargeImage")));
+            this.barEditStatus.Name = "barEditStatus";
+            this.barEditStatus.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barEditStatus_ItemClick);
+            // 
+            // barRefresh
+            // 
+            this.barRefresh.Caption = "刷新";
+            this.barRefresh.Id = 7;
+            this.barRefresh.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barRefresh.ImageOptions.Image")));
+            this.barRefresh.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barRefresh.ImageOptions.LargeImage")));
+            this.barRefresh.Name = "barRefresh";
+            this.barRefresh.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barRefresh_ItemClick);
+            // 
+            // ribbonPage1
+            // 
+            this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
+            this.ribbonPageGroup1,
+            this.ribbonPageGroup2});
+            this.ribbonPage1.Name = "ribbonPage1";
+            this.ribbonPage1.Text = "ribbonPage1";
+            // 
+            // ribbonPageGroup1
+            // 
+            this.ribbonPageGroup1.ItemLinks.Add(this.baripsEquipmentID);
+            this.ribbonPageGroup1.ItemsLayout = DevExpress.XtraBars.Ribbon.RibbonPageGroupItemsLayout.OneRow;
+            this.ribbonPageGroup1.Name = "ribbonPageGroup1";
+            this.ribbonPageGroup1.Text = "查询";
+            // 
+            // ribbonPageGroup2
+            // 
+            this.ribbonPageGroup2.ItemLinks.Add(this.barSearch);
+            this.ribbonPageGroup2.ItemLinks.Add(this.barRefresh);
+            this.ribbonPageGroup2.ItemLinks.Add(this.barInsert);
+            this.ribbonPageGroup2.ItemLinks.Add(this.barEdit);
+            this.ribbonPageGroup2.ItemLinks.Add(this.barEditStatus);
+            this.ribbonPageGroup2.Name = "ribbonPageGroup2";
+            this.ribbonPageGroup2.Text = "操作";
+            // 
+            // splashScreenManager1
+            // 
+            this.splashScreenManager1.ClosingDelay = 500;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.treeList1);
+            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl1.Location = new System.Drawing.Point(0, 133);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.Root;
+            this.layoutControl1.Size = new System.Drawing.Size(1331, 634);
+            this.layoutControl1.TabIndex = 5;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // treeList1
+            // 
+            this.treeList1.Appearance.Caption.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.treeList1.Appearance.Caption.Options.UseFont = true;
+            this.treeList1.Appearance.FocusedRow.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.treeList1.Appearance.FocusedRow.Options.UseFont = true;
+            this.treeList1.Appearance.HeaderPanel.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.treeList1.Appearance.HeaderPanel.Options.UseFont = true;
+            this.treeList1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.treeList1.Appearance.Row.Options.UseFont = true;
+            this.treeList1.Appearance.SelectedRow.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.treeList1.Appearance.SelectedRow.Options.UseFont = true;
+            this.treeList1.CaptionHeight = 31;
+            this.treeList1.ColumnPanelRowHeight = 31;
+            this.treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
+            this.gcAutoID,
+            this.gcEquipmentName,
+            this.gcEquipmentID,
+            this.gcSpecification,
+            this.gcManufacturer,
+            this.gcSerialNumber,
+            this.gcUsingDate,
+            this.gcTotalcapacity,
+            this.gcWeight,
+            this.gcEquipmentCategory,
+            this.gcEquipmentOriginalvalue,
+            this.gcEquipmentStatus,
+            this.gcWarrantyPeriod,
+            this.gcInstallationLocation,
+            this.gcOwningUnit,
+            this.gcOperatingParameters,
+            this.gcRemarks});
+            this.treeList1.FixedLineWidth = 3;
+            this.treeList1.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.treeList1.HorzScrollStep = 4;
+            this.treeList1.Location = new System.Drawing.Point(12, 12);
+            this.treeList1.Margin = new System.Windows.Forms.Padding(4);
+            this.treeList1.MenuManager = this.ribbon;
+            this.treeList1.MinimumSize = new System.Drawing.Size(3300, 0);
+            this.treeList1.MinWidth = 26;
+            this.treeList1.Name = "treeList1";
+            this.treeList1.OptionsBehavior.AllowIndeterminateCheckState = true;
+            this.treeList1.OptionsBehavior.AutoSelectAllInEditor = false;
+            this.treeList1.OptionsBehavior.Editable = false;
+            this.treeList1.OptionsBehavior.ReadOnly = true;
+            this.treeList1.OptionsCustomization.AllowBandMoving = false;
+            this.treeList1.OptionsCustomization.AllowQuickHideColumns = false;
+            this.treeList1.OptionsCustomization.AllowSort = false;
+            this.treeList1.OptionsFind.AllowFindPanel = false;
+            this.treeList1.OptionsSelection.KeepSelectedOnClick = false;
+            this.treeList1.OptionsView.AutoWidth = false;
+            this.treeList1.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All;
+            this.treeList1.RowHeight = 31;
+            this.treeList1.Size = new System.Drawing.Size(3300, 593);
+            this.treeList1.TabIndex = 13;
+            this.treeList1.TreeLevelWidth = 23;
+            this.treeList1.RowCellClick += new DevExpress.XtraTreeList.RowCellClickEventHandler(this.treeList1_RowCellClick);
+            // 
+            // gcAutoID
+            // 
+            this.gcAutoID.Caption = "编号";
+            this.gcAutoID.FieldName = "AutoID";
+            this.gcAutoID.Name = "gcAutoID";
+            // 
+            // gcEquipmentName
+            // 
+            this.gcEquipmentName.Caption = "设备名称";
+            this.gcEquipmentName.FieldName = "EquipmentName";
+            this.gcEquipmentName.Name = "gcEquipmentName";
+            this.gcEquipmentName.Visible = true;
+            this.gcEquipmentName.VisibleIndex = 0;
+            // 
+            // gcEquipmentID
+            // 
+            this.gcEquipmentID.Caption = "设备编号";
+            this.gcEquipmentID.FieldName = "EquipmentID";
+            this.gcEquipmentID.Name = "gcEquipmentID";
+            this.gcEquipmentID.Visible = true;
+            this.gcEquipmentID.VisibleIndex = 1;
+            // 
+            // gcSpecification
+            // 
+            this.gcSpecification.Caption = "设备型号规格";
+            this.gcSpecification.FieldName = "Specification";
+            this.gcSpecification.Name = "gcSpecification";
+            this.gcSpecification.Visible = true;
+            this.gcSpecification.VisibleIndex = 2;
+            // 
+            // gcManufacturer
+            // 
+            this.gcManufacturer.Caption = "制造厂家";
+            this.gcManufacturer.FieldName = "Manufacturer";
+            this.gcManufacturer.Name = "gcManufacturer";
+            this.gcManufacturer.Visible = true;
+            this.gcManufacturer.VisibleIndex = 3;
+            // 
+            // gcSerialNumber
+            // 
+            this.gcSerialNumber.Caption = "出厂编号";
+            this.gcSerialNumber.FieldName = "SerialNumber";
+            this.gcSerialNumber.Name = "gcSerialNumber";
+            this.gcSerialNumber.Visible = true;
+            this.gcSerialNumber.VisibleIndex = 4;
+            // 
+            // gcUsingDate
+            // 
+            this.gcUsingDate.Caption = "投产年月";
+            this.gcUsingDate.FieldName = "UsingDate";
+            this.gcUsingDate.Name = "gcUsingDate";
+            this.gcUsingDate.Visible = true;
+            this.gcUsingDate.VisibleIndex = 5;
+            // 
+            // gcTotalcapacity
+            // 
+            this.gcTotalcapacity.Caption = "设备总容量(KW)";
+            this.gcTotalcapacity.FieldName = "Totalcapacity";
+            this.gcTotalcapacity.Format.FormatString = "#.00";
+            this.gcTotalcapacity.Format.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.gcTotalcapacity.Name = "gcTotalcapacity";
+            this.gcTotalcapacity.Visible = true;
+            this.gcTotalcapacity.VisibleIndex = 6;
+            this.gcTotalcapacity.Width = 130;
+            // 
+            // gcWeight
+            // 
+            this.gcWeight.Caption = "设备重量(吨)";
+            this.gcWeight.FieldName = "Weight";
+            this.gcWeight.Format.FormatString = "#.00";
+            this.gcWeight.Format.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.gcWeight.Name = "gcWeight";
+            this.gcWeight.Visible = true;
+            this.gcWeight.VisibleIndex = 7;
+            this.gcWeight.Width = 114;
+            // 
+            // gcEquipmentCategory
+            // 
+            this.gcEquipmentCategory.Caption = "设备类别";
+            this.gcEquipmentCategory.FieldName = "EquipmentCategory";
+            this.gcEquipmentCategory.Name = "gcEquipmentCategory";
+            this.gcEquipmentCategory.Visible = true;
+            this.gcEquipmentCategory.VisibleIndex = 8;
+            // 
+            // gcEquipmentOriginalvalue
+            // 
+            this.gcEquipmentOriginalvalue.Caption = "设备原值(万元)";
+            this.gcEquipmentOriginalvalue.FieldName = "EquipmentOriginalvalue";
+            this.gcEquipmentOriginalvalue.Format.FormatString = "#.00";
+            this.gcEquipmentOriginalvalue.Format.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.gcEquipmentOriginalvalue.Name = "gcEquipmentOriginalvalue";
+            this.gcEquipmentOriginalvalue.Visible = true;
+            this.gcEquipmentOriginalvalue.VisibleIndex = 9;
+            this.gcEquipmentOriginalvalue.Width = 123;
+            // 
+            // gcEquipmentStatus
+            // 
+            this.gcEquipmentStatus.Caption = "设备状态";
+            this.gcEquipmentStatus.FieldName = "EquipmentStatus";
+            this.gcEquipmentStatus.Name = "gcEquipmentStatus";
+            this.gcEquipmentStatus.Visible = true;
+            this.gcEquipmentStatus.VisibleIndex = 10;
+            // 
+            // gcWarrantyPeriod
+            // 
+            this.gcWarrantyPeriod.Caption = "保质期";
+            this.gcWarrantyPeriod.FieldName = "WarrantyPeriod";
+            this.gcWarrantyPeriod.Name = "gcWarrantyPeriod";
+            this.gcWarrantyPeriod.Visible = true;
+            this.gcWarrantyPeriod.VisibleIndex = 11;
+            // 
+            // gcInstallationLocation
+            // 
+            this.gcInstallationLocation.Caption = "安装地点";
+            this.gcInstallationLocation.FieldName = "InstallationLocation";
+            this.gcInstallationLocation.Name = "gcInstallationLocation";
+            this.gcInstallationLocation.Visible = true;
+            this.gcInstallationLocation.VisibleIndex = 12;
+            // 
+            // gcOwningUnit
+            // 
+            this.gcOwningUnit.Caption = "所属单元";
+            this.gcOwningUnit.FieldName = "OwningUnit";
+            this.gcOwningUnit.Name = "gcOwningUnit";
+            this.gcOwningUnit.Visible = true;
+            this.gcOwningUnit.VisibleIndex = 13;
+            // 
+            // gcOperatingParameters
+            // 
+            this.gcOperatingParameters.Caption = "运行参数";
+            this.gcOperatingParameters.FieldName = "OperatingParameters";
+            this.gcOperatingParameters.Name = "gcOperatingParameters";
+            this.gcOperatingParameters.Visible = true;
+            this.gcOperatingParameters.VisibleIndex = 14;
+            // 
+            // gcRemarks
+            // 
+            this.gcRemarks.Caption = "运行参数";
+            this.gcRemarks.FieldName = "Remarks";
+            this.gcRemarks.Name = "gcRemarks";
+            this.gcRemarks.Visible = true;
+            this.gcRemarks.VisibleIndex = 15;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1});
+            this.Root.Name = "Root";
+            this.Root.Size = new System.Drawing.Size(3324, 617);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.treeList1;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(3304, 597);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem1.TextVisible = false;
+            // 
+            // UsingDate
+            // 
+            this.UsingDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.UsingDate.AppearanceCell.Options.UseFont = true;
+            this.UsingDate.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.UsingDate.AppearanceHeader.Options.UseFont = true;
+            this.UsingDate.Caption = "投产年月";
+            this.UsingDate.FieldName = "UsingDate";
+            this.UsingDate.Name = "UsingDate";
+            this.UsingDate.OptionsColumn.AllowEdit = false;
+            this.UsingDate.Visible = true;
+            this.UsingDate.VisibleIndex = 5;
+            this.UsingDate.Width = 80;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.gridColumn1.AppearanceCell.Options.UseFont = true;
+            this.gridColumn1.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.gridColumn1.AppearanceHeader.Options.UseFont = true;
+            this.gridColumn1.Caption = "投产年月";
+            this.gridColumn1.FieldName = "UsingDate";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 80;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.gridColumn2.AppearanceCell.Options.UseFont = true;
+            this.gridColumn2.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.gridColumn2.AppearanceHeader.Options.UseFont = true;
+            this.gridColumn2.Caption = "投产年月";
+            this.gridColumn2.FieldName = "UsingDate";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 5;
+            this.gridColumn2.Width = 80;
+            // 
+            // pageDeviceTreeView
+            // 
+            this.Appearance.Options.UseFont = true;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1331, 767);
+            this.Controls.Add(this.layoutControl1);
+            this.Controls.Add(this.ribbon);
+            this.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "pageDeviceTreeView";
+            this.Ribbon = this.ribbon;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "设备台账";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.Load += new System.EventHandler(this.pageDeviceTreeView_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.treeList1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
+        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+        private DevExpress.XtraBars.BarEditItem baripsEquipmentID;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit ipsEquipmentID;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+        private DevExpress.XtraBars.BarButtonItem barSearch;
+        private DevExpress.XtraBars.BarButtonItem barInsert;
+        private DevExpress.XtraBars.BarButtonItem barEdit;
+        private DevExpress.XtraBars.BarButtonItem barEditStatus;
+        private DevExpress.XtraBars.BarButtonItem barRefresh;
+        private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraTreeList.TreeList treeList1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcAutoID;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentID;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentName;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcSpecification;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcManufacturer;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcSerialNumber;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcUsingDate;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcTotalcapacity;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcWeight;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentCategory;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentOriginalvalue;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentStatus;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcWarrantyPeriod;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcInstallationLocation;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcOwningUnit;
+        private DevExpress.XtraGrid.Columns.GridColumn UsingDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcOperatingParameters;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn gcRemarks;
+    }
+}
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs
new file mode 100644
index 0000000..afd2c81
--- /dev/null
+++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using DevExpress.XtraBars;
+using DeviceRepair.Models.Device;
+using TsSFCDevice.Client.Biz.Base.Utils;
+using DevExpress.XtraEditors;
+using TsSFCDevice.Client.Biz.Impl;
+using TsSFCDevice.Client.Launch.FormatProviderExtend;
+
+namespace TsSFCDevice.Client.Launch.Device
+{
+    public partial class pageDeviceTreeView : DevExpress.XtraBars.Ribbon.RibbonForm
+    {
+        #region 属性&字段
+
+        /// <summary>
+        /// 按钮图标
+        /// </summary>
+        Dictionary<string, Image> Icons = new Dictionary<string, Image>
+        {
+            { "Lock",DevExpress.Images.ImageResourceCache.Default.GetImageById(DevExpress.Images.DXImages.Cancel,DevExpress.Utils.Design.ImageSize.Size32x32,DevExpress.Utils.Design.ImageType.Colored) },
+            { "UnLock",DevExpress.Images.ImageResourceCache.Default.GetImageById(DevExpress.Images.DXImages.Apply,DevExpress.Utils.Design.ImageSize.Size32x32,DevExpress.Utils.Design.ImageType.Colored) },
+        };
+
+        public IList<DeviceInformationInfoTree> Datas { get; set; }
+
+        private DeviceInformationInfoTree m_CurrentModel;
+
+        private string parEquipmentID { get { return baripsEquipmentID.EditValue + ""; } }
+
+
+        #endregion
+
+        #region 函数
+
+        public pageDeviceTreeView()
+        {
+            InitializeComponent();
+        }
+
+        #endregion
+
+        #region 事件
+
+        /// <summary>
+        /// 窗体加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void pageDeviceTreeView_Load(object sender, EventArgs e)
+        {
+            ribbon.AllowCustomization = false;
+            ribbon.AllowMinimizeRibbon = false;
+
+            // 关闭列头右键菜单
+            treeList1.OptionsMenu.EnableColumnMenu = false;
+            treeList1.OptionsBehavior.Editable = false;
+            treeList1.OptionsBehavior.ReadOnly = true;
+            treeList1.OptionsSelection.EnableAppearanceFocusedCell = false;
+            treeList1.OptionsScrollAnnotations.ShowSelectedRows = DevExpress.Utils.DefaultBoolean.False;
+
+            #region 状态格式化
+            gcEquipmentStatus.Format.FormatType = DevExpress.Utils.FormatType.Custom;
+            gcEquipmentStatus.Format.Format = new StatusFormatter();
+            gcEquipmentStatus.Format.FormatString = "device";
+            #endregion
+
+            #region 根据权限隐藏按钮
+            if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_KH)
+                && !Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_OEM)
+                )
+            {
+                barSearch.Visibility = BarItemVisibility.Never;
+                barRefresh.Visibility = BarItemVisibility.Never;
+            }
+
+
+            if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_ADD))
+            {
+                barInsert.Visibility = BarItemVisibility.Never;
+            }
+
+
+            if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_Edit))
+            {
+                barEdit.Visibility = BarItemVisibility.Never;
+            }
+
+
+            if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_Status))
+            {
+                barEditStatus.Visibility = BarItemVisibility.Never;
+            }
+            #endregion
+        }
+
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void barSearch_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            try
+            {
+                InitializeGridData();
+            }
+            catch (Exception ex)
+            {
+                XtraMessageBoxHelper.Error(ex.Message, "出错");
+            }
+        }
+
+        /// <summary>
+        /// 刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void barRefresh_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            try
+            {
+                Utility.SystemRuntimeInfo.CurrentDeviceCaches = null;
+                Utility.SystemRuntimeInfo.CurrentUsersCaches = null;
+                InitializeGridData();
+            }
+            catch (Exception ex)
+            {
+                XtraMessageBoxHelper.Error(ex.Message, "出错");
+            }
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void barInsert_ItemClick(object sender, ItemClickEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// 编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void barEdit_ItemClick(object sender, ItemClickEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// 修改状态
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void barEditStatus_ItemClick(object sender, ItemClickEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// 点击清空
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ipsEquipmentID_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            ((sender as ButtonEdit)).EditValue = "";
+        }
+
+        #endregion
+
+        #region 方法
+
+        /// <summary>
+        /// 数据查询
+        /// </summary>
+        public void InitializeGridData()
+        {
+            try
+            {
+                splashScreenManager1.ShowWaitForm();
+                m_CurrentModel = null;
+
+                List<string> auths = new List<string>();
+                if (Utility.SystemRuntimeInfo.AuthValidate(Utility.SystemRuntimeInfo.DEVICE_OEM))
+                    auths.Add("OEM");
+                if (Utility.SystemRuntimeInfo.AuthValidate(Utility.SystemRuntimeInfo.DEVICE_KH))
+                    auths.Add("KH");
+
+                DevRepository devDa = new DevRepository();
+                IList<DeviceInformationInfoTree> Datas = devDa.GetTreeDatas(auths, parEquipmentID);
+                Datas = Datas.ToList();
+
+                treeList1.DataSource = Datas;
+                treeList1.KeyFieldName = "RouteAutoId";
+                treeList1.ParentFieldName = "ParentRouteId";
+                treeList1.ExpandAll();
+                treeList1.BestFitColumns();
+
+                splashScreenManager1.CloseWaitForm();
+            }
+            catch (Exception ex)
+            {
+                splashScreenManager1.CloseWaitForm();
+                throw new Exception(ex.Message);
+            }
+        }
+
+        #endregion
+
+        private void treeList1_RowCellClick(object sender, DevExpress.XtraTreeList.RowCellClickEventArgs e)
+        {
+            m_CurrentModel = treeList1.GetRow(e.Node.Id) as DeviceInformationInfoTree;
+
+            if (m_CurrentModel != null)
+            {
+                barEdit.Enabled = m_CurrentModel.EquipmentStatus > 0;
+                barEditStatus.Enabled = true;
+
+                barEditStatus.Caption = m_CurrentModel.EquipmentStatus > 0 ? "禁用" : "启用";
+                barEditStatus.ImageOptions.Image = m_CurrentModel.EquipmentStatus > 0 ? Icons["Lock"] : Icons["UnLock"];
+                barEditStatus.ImageOptions.LargeImage = m_CurrentModel.EquipmentStatus > 0 ? Icons["Lock"] : Icons["UnLock"];
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.resx b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.resx
new file mode 100644
index 0000000..12f7464
--- /dev/null
+++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.resx
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="DevExpress.Data.v20.2" name="DevExpress.Data.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="barSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPwCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yOS43LDI3
+        LjNMMjIsMTkuNmwtMC4xLTAuMWMxLjMtMS44LDIuMS00LjEsMi4xLTYuNWMwLTYuMS00LjktMTEtMTEt
+        MTFTMiw2LjksMiwxM3M0LjksMTEsMTEsMTEgICBjMi40LDAsNC43LTAuOCw2LjUtMi4xYzAsMCwwLDAu
+        MSwwLjEsMC4xbDcuNyw3LjdjMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwyOC4yLDMw
+        LjEsMjcuNiwyOS43LDI3LjN6IE00LDEzICAgYzAtNSw0LTksOS05czksNCw5LDlzLTQsOS05LDlTNCwx
+        OCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="barInsert.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACN0RVh0VGl0
+        bGUAQWRkO0ZpbGU7QWRkRmlsZTtCYXJzO1JpYmJvbjsV3KoKAAADJElEQVQ4T02TaUhUURiGr2tqFkUF
+        /fFHOLbaRgtTFFqhWaE1KhFlppHiMla2KIrlWi5NTo6OuYJaQaWSUhnZItnmaFoUgaH5ozQxLXNWvTPj
+        23fOJHTguR/33Ps+9zvn3ivQsCuo6nx+paoTjIIqDfIrNSgg8io6iQ7klmuQW/YWl8s6kFP6so0y9gAE
+        Bhv2+RUaTNMZhw42pjnWGaw2sopfsZTD/wKHS+Vvecg0aYGRMJhs6I1mjs5ogZYQLVakK9tZyvF/gSOz
+        MoHeZAvYQmYuM5LINEXCSTNEswW5at6BU1a9v8Bgwyld+YK3qzOK0BlEEokY/j2E5s5rUD44AroRhVSb
+        NYVofqZhAheL1SBk3PHjAudURRtf58S/p3/+psGlxv141FOM72MfYbboeG3pViHzdiDirm6RUc4+7eYu
+        LpiVnPeUC/7ozfgxNoicu0HoG+6AaP0NdVMqzpUeRMm9c9BOfUHv0HOk1OzQRmZu9KKsHRO4JmY/hoV2
+        WEvt321X4GFXCQziN4wYXiOxOAS9A2M4rQrB1z/1GJhoQuObHMiLtlZQ1pEJ3OTpLVwwoZvEhZr96B1p
+        huKOHCeVwUgg2L7IqcYXypB9KxxP+pMQp5QOU3YWE8yOTbtP6ySBfhIJqm14N5KJOMUBfOr7iXGSjuum
+        eGUjJj8INz774ET+JpGyLkzgHp3SBLPZinGtiVregyd9ciRV+yMqLxBRuYEYnTAi6nIgThBnK/2g6tiA
+        sIx1rAMumHs8uYnesRWj40aUNmag+GEoqj5uhrpnDY5n7+VPjszci9IP3lC/90bq7fU4cGZlLWWdueDY
+        2UZMkUCrFzEw2I+ILCmuv/SFqns5EtS+OHoxAPISHxR1L0VO6zKEJK0ySGUeaynrwARuh2Lr2sNO1+Pw
+        qXooKtpRVFuH0PPrkFi9GlmtEhR2eVL1RHyZF2SJ3lZpsEcY5Zz3yZeyvGDPJMQ8Yj6xgFi8TLrQZ2fE
+        koaAGMlYQJwX/GMkv3zDlzSs2L5oC113Jex2x0gE/kPMsDtWIvBJ2wfC2mOb5E7MJeb8O2fzdn7RnoJf
+        tKfwF7guZQwBlVFoAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="barInsert.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="barEdit.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
+        bGUARWRpdDtCYXJzO1JpYmJvbjtTdGFuZGFyZDswE8PbAAACtUlEQVQ4T2WSW0hUQRjHT97Xy1oIJilt
+        og9GQgQVUQ+hBKWGIvnik/ViglCEBJVhpZTZFhEahuYFV1PUtvJSGaKihqVBpcZulkFZ2Orqqnt293j2
+        8u+bcXe1GvjNDHPm9//OmTMCAIGab0OHfqCp+wsau6fW6JqCpvMzp4HRwdCjpn18kPYHMI+77gB/tnFj
+        czGoc1G3PrpQq9UxQUGP/woIqH+qpymwKjshubGtEpIDVskOq80Oi82B6vZJJgQzj7u8o4AarZ5X5ZJX
+        dHDJQrJImGle2TLBhJB/AwKr2ib4q65LDohWEgmz1YEVYpnmFY0fmRA6fOug0HtlnzcgiCWzb9wocVEk
+        0WLHEmG2yhh+94MJkUQAsckToCjXfICTAswWmarZvRLDJMpUXcaCyYyX9SWgyqg7vfMueaHegDv173mA
+        VxRJNMtriBIMRhNGtWX4+iyL9n3D5KMM3DweU+4JCFY/HIPD6eLCIlVcpNG4TOOKhFnDAkbarmNKm8ll
+        afoMBgsToT4S5T5JOtUblW9hd7iwsLLKmV9io4Rfs/MYbC6GrjWdy+JkHvrOJ6BPfRi5ieG1noDQaxUj
+        kO0uzJE4tyRRgA3ff/5Gf2MRPjWlcdk0egq9Z+PRU3IIJxPCNORFeQOK7r2mAKf7N8owzBnRr7mM8bqj
+        XDb0Z6MnPxadhfuRHRfSTM42ws8TEFRQ+mrg0u0hXCTua8ZQ8aAFQ+pjXJ7pysSLPBW0BXuQpVK00v4Y
+        JmdvpT/pDvAhFISSCCd2JBzI0XZUlcIy8wbPc1Voyd+FjOjAx/RMRfhNN6cIJyL81wI2wm4Yte27k8/N
+        jo/0oKHsAoqT4pEaFfiE1mMJf111sqCrThLSN/v+H9B7la4nVdkSkwxl5F6jQhnXGRGsyKG1aCanKX0F
+        RmqYj5AS5iP8AQSCmu1rvrSCAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="barEdit.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        /wBqkiSvivDUAgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="barEditStatus.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACF0RVh0VGl0
+        bGUAQXBwbHk7T0s7Q2hlY2s7QmFycztSaWJib247ZGPIaAAAA6ZJREFUOE9Nk31Q03Ucx3+iqwzOhE6t
+        MxsDOcbDhgPtziPoCGXkJIq6FQsn0WSOjRKIpzTmgRMfuKwpA2zLjFUzIPAIXCDIIiYPTWyDxThQntp4
+        iAeBjP569/3Nuut397r73X0/79fn87n7fqnJlQZq7qGJIt86wvqMC+yYXG2o7ng1p19pCFtQfsvtP6Hn
+        NGSVBwvJ+WMEj/m/zJTrzxvU1Eo9RblWje5wUhZrW6Y6yFhasw+tVhXsTgPmVrswNFMD09BZqJsFKPgy
+        tE9U6BdIN5p9eOuRgA4L0pnPZHwaPGwwHcPkchOGlyoxMK/Cnblc2BfPYHRZC9dqCxotBcjXcWeT8/24
+        JOcxsVznFmx47zS7qc5cAMfCZXT8fgSdLgnMLhm6p+XomVGgZ1aOZrsYv81XoNV2GorPQqzbd3p60c2p
+        pGw//nFtLOx/lKPlvghtE2LcmnoXJqcEXU4pbk9LUXR1Lw5kMiE5z4ZjsRJltQk4VBSQSTen3v4ooKah
+        Ox83x9JwY1RIJMloG09BOxGZpg5DWsZG3icyjIw7wZdvww9Dh9E2WII0VaCZCDZSwkL/kXZHAa4PJ0Hd
+        EoUY2UbkacNgvPcWcqo4KNLkwDW7BMWZRFxuFeHHe+/g9oQSaaXsNSLwot7M8182OtJhsMUhRuqJPqsV
+        +RcyECv3docnpx/g/FfZUH0TR6YTo95xED9NyJF6KhAhkd7PUq9l+97X9wpgsO6DujERGcWvwjmzhKbO
+        DoxOLmJg9A4Sc7fDOJKK2qF4fGfno3bgdYg+DqAn2EQlKFjNZY1RuGLZi2uDAhRXx6K4QoaFB2tYWPkb
+        h5R7cPVnIQyDsdDboqH/9UWU34zBGzksCxF4Ui+Ld4jTz3HxhSUSFb27cM0mQFb5bujqS2Hqv47Uc/5k
+        vf240v8CPrdEoPpuNI5d4oEveV5JBI8TqCcFct+7J77moqo3AppuLlnnIFJKfBEppaBp34+qPh4qCdpf
+        dqOkjofED1g2Lx/G0yTrQQvWR8Rv5SVk+s1/qAsigjBoerhkTyGaho9CRybT9Owi8nAU6kOQlOO/Fh63
+        JYrkGJ0T71OUaVxGSxjh8Vv3HJD5jqSc3Imi2iCou0JxqZuDi2YOTn4fjFRVAF45yhzgPQrTo69zZzvG
+        JLSAfokbyFg+0cnPFcZJmGaBnAU3Chb4R5jWl0Q7Tnk+xdhC6hh0PZ1zZ//7+VdE70Tb6Xu+meBD8CZs
+        IjxB8Ph/fceYhPoHAkQRj5PgdPMAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="barEditStatus.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="barRefresh.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACp0RVh0VGl0
+        bGUAUmVmcmVzaEFsbFBpdm90VGFibGU7UmVmcmVzaDtVcGRhdGU7gLmk/QAAApJJREFUOE9lk21Ik1EU
+        x9ec0yW9qLlk6VypLUuTILZeiNJJuHTNNDZfculagr3Ym2kvYG1GRlZu9LIyStDQsmJYklh9yyD7oEJB
+        ZFEGUX2NvtXgdP7X5xlhF37Pueece89z7v0/j2LGmCWhZKIYlWThyzmZ/waCUbUtqx0er6lrd6v5fd0Z
+        829Y+IhzPppReXwmr7Q+UkhZ5DamlB/J8Vc154YHR4L0dmqYvv0cExY+4s7DOQFpDfEedCYK4BFdsjfL
+        f3vgBL37HqKep810tMNK5Y0rhYUv4k9OMS1UdmA5CqgZHE2hLKxNr9havzQ8+ukSnb5pI6s7o39Dqb5K
+        mxqXAQv/SqiaRqcu0KupduK1KBDLoAuFanPNku5gqJLO37NRgWtxf0KyJpXjCRJJ+ZWGwMnOPHowXiOw
+        etJRQMOIAtEWV9pkwU4DAbNN5+TYXGmBJq9Sf1bO/QvnIh3gLPHMQgm8dTaDOG4dc+STmRRGxyxgYhhx
+        B2qWi2bC0vk4h+8AheKch3LLIjmfaVKKiwIxkOXHr3FBz5CXHAez2zmON6MDdeaqxHiWsHfw5VUaeBEg
+        nvcgzggZYyHL6JeA4NbQfrLvWdZndWduy16nTSyuM9pK9mXd8ffW0+vPQUgYLqzNdPE+FBcFNJCltbtI
+        8GiigW489lDTxS20vSGbjnfY6e6zYzTyoY18XcXEkl/jPfMYHG+6A8hiqTJcZ7k6eR7uuF9Kw2ON9Obr
+        OXo+0USXHzogXdiywxBcsT7JyHtwPPn/UKg3Vejb2CYxyWvsul0bK/R9+dVpH1muP7Dw19oXuTkPheKY
+        SPsY0BKaIzGHmc9AJi0DWWHho235YsXtywOVcB4gbp2RC8rARzzyA00PheIvOpAOIaUhiVUAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="barRefresh.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceView.Designer.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceView.Designer.cs
index 2213d72..700e00a 100644
--- a/TsSFCDevice.Client.Launch/Device/pageDeviceView.Designer.cs
+++ b/TsSFCDevice.Client.Launch/Device/pageDeviceView.Designer.cs
@@ -71,6 +71,8 @@
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
@@ -291,6 +293,8 @@
             this.OperatingParameters,
             this.colVersionCode,
             this.colVersionRev,
+            this.gridColumn1,
+            this.gridColumn2,
             this.Remarks});
             this.gridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1635, 636, 252, 286);
             this.gridView1.GridControl = this.gridControl1;
@@ -542,7 +546,7 @@
             this.colVersionCode.AppearanceCell.Options.UseFont = true;
             this.colVersionCode.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F);
             this.colVersionCode.AppearanceHeader.Options.UseFont = true;
-            this.colVersionCode.Caption = "点检表编号";
+            this.colVersionCode.Caption = "PM的点检表编号";
             this.colVersionCode.FieldName = "VersionCode";
             this.colVersionCode.Name = "colVersionCode";
             this.colVersionCode.OptionsColumn.AllowEdit = false;
@@ -556,7 +560,7 @@
             this.colVersionRev.AppearanceCell.Options.UseFont = true;
             this.colVersionRev.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F);
             this.colVersionRev.AppearanceHeader.Options.UseFont = true;
-            this.colVersionRev.Caption = "点检表版本";
+            this.colVersionRev.Caption = "PM的点检表版本";
             this.colVersionRev.FieldName = "VersionRev";
             this.colVersionRev.Name = "colVersionRev";
             this.colVersionRev.Visible = true;
@@ -611,6 +615,20 @@
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "AM的点检表编号";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 18;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "AM的点检表版本";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 19;
+            // 
             // pageDeviceView
             // 
             this.Appearance.Options.UseFont = true;
@@ -679,5 +697,7 @@
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
     }
 }
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs b/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs
index 0d75b93..abc0ab1 100644
--- a/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs
+++ b/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs
@@ -33,6 +33,12 @@ namespace TsSFCDevice.Client.Launch
 
         #endregion
 
+
+        /// <summary>
+        /// 跳过当天保养计划校验
+        /// </summary>
+        public readonly static string PLAN_JUMP_CHECK = "BIZ_EQUIP_PM_PLAN_06";
+
         #region PM 保养计划
         /// <summary>
         /// PM 保养计划
@@ -63,6 +69,7 @@ namespace TsSFCDevice.Client.Launch
         /// PM 保养计划删除
         /// </summary>
         public readonly static string PM_PLAN_DELETE = "BIZ_EQUIP_PM_PLAN_05";
+
         #endregion
 
         #region PM 点检表
diff --git a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj
index a347825..bdbd597 100644
--- a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj
+++ b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj
@@ -217,6 +217,12 @@
     <Compile Include="CustomField\pageFieldEdit.Designer.cs">
       <DependentUpon>pageFieldEdit.cs</DependentUpon>
     </Compile>
+    <Compile Include="Device\pageDeviceTreeView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Device\pageDeviceTreeView.Designer.cs">
+      <DependentUpon>pageDeviceTreeView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Device\pageDeviceView.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -400,6 +406,12 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="sysConfig\pageJumpCheckView.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="sysConfig\pageJumpCheckView.Designer.cs">
+      <DependentUpon>pageJumpCheckView.cs</DependentUpon>
+    </Compile>
     <Compile Include="sysConfig\pageSytemSetting.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -462,6 +474,9 @@
     <EmbeddedResource Include="CustomField\pageFieldEdit.resx">
       <DependentUpon>pageFieldEdit.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Device\pageDeviceTreeView.resx">
+      <DependentUpon>pageDeviceTreeView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Device\pageDeviceView.resx">
       <DependentUpon>pageDeviceView.cs</DependentUpon>
     </EmbeddedResource>
@@ -560,6 +575,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="sysConfig\pageJumpCheckView.resx">
+      <DependentUpon>pageJumpCheckView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="sysConfig\pageSytemSetting.resx">
       <DependentUpon>pageSytemSetting.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs
index 78d75d5..a93092d 100644
--- a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs
+++ b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs
@@ -73,7 +73,9 @@ namespace TsSFCDevice.Client.Launch
             this.barButtonItem17 = new DevExpress.XtraBars.BarButtonItem();
             this.btnTagMgr = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem7 = new DevExpress.XtraBars.BarButtonItem();
+            this.btn_treeView = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
+            this.btnPlanCheckJump = new DevExpress.XtraBars.BarButtonItem();
             this.page_Main = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.pg_Main = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -173,9 +175,11 @@ namespace TsSFCDevice.Client.Launch
             this.barButtonItem17,
             this.btnTagMgr,
             this.barButtonItem7,
-            this.barButtonItem5});
+            this.btn_treeView,
+            this.barButtonItem5,
+            this.btnPlanCheckJump});
             this.ribbonControl.Location = new System.Drawing.Point(0, 0);
-            this.ribbonControl.MaxItemId = 79;
+            this.ribbonControl.MaxItemId = 81;
             this.ribbonControl.Name = "ribbonControl";
             this.ribbonControl.OptionsMenuMinWidth = 385;
             this.ribbonControl.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
@@ -201,8 +205,8 @@ namespace TsSFCDevice.Client.Launch
             // 
             this.batBtnRefresh.Caption = "清理缓存";
             this.batBtnRefresh.Id = 78;
-            this.batBtnRefresh.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.Image")));
-            this.batBtnRefresh.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.LargeImage")));
+            this.batBtnRefresh.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("batBtnRefresh.ImageOptions.Image")));
+            this.batBtnRefresh.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("batBtnRefresh.ImageOptions.LargeImage")));
             this.batBtnRefresh.Name = "batBtnRefresh";
             this.batBtnRefresh.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.batBtnRefresh_ItemClick);
             // 
@@ -539,15 +543,31 @@ namespace TsSFCDevice.Client.Launch
             this.barButtonItem7.Tag = "BIZ_EQUIP_REPAIRRECORD_01";
             this.barButtonItem7.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem7_ItemClick_1);
             // 
+            // btn_treeView
+            // 
+            this.btn_treeView.Caption = "设备总台账树";
+            this.btn_treeView.Id = 77;
+            this.btn_treeView.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_treeView.ImageOptions.Image")));
+            this.btn_treeView.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btn_treeView.ImageOptions.LargeImage")));
+            this.btn_treeView.Name = "btn_treeView";
+            this.btn_treeView.Tag = "BIZ_EQUIP_DEVICE123";
+            this.btn_treeView.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            this.btn_treeView.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_treeView_ItemClick);
+            // 
             // barButtonItem5
             // 
-            this.barButtonItem5.Caption = "设备总台账树";
-            this.barButtonItem5.Id = 77;
-            this.barButtonItem5.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem5.ImageOptions.Image")));
-            this.barButtonItem5.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem5.ImageOptions.LargeImage")));
+            this.barButtonItem5.Caption = "barButtonItem5";
+            this.barButtonItem5.Id = 79;
             this.barButtonItem5.Name = "barButtonItem5";
-            this.barButtonItem5.Tag = "";
-            this.barButtonItem5.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnPlanCheckJump
+            // 
+            this.btnPlanCheckJump.Caption = "计划完成校验关闭";
+            this.btnPlanCheckJump.Id = 80;
+            this.btnPlanCheckJump.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.Image")));
+            this.btnPlanCheckJump.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.LargeImage")));
+            this.btnPlanCheckJump.Name = "btnPlanCheckJump";
+            this.btnPlanCheckJump.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnPlanCheckJump_ItemClick);
             // 
             // page_Main
             // 
@@ -685,12 +705,13 @@ namespace TsSFCDevice.Client.Launch
             // ribbonPageGroup2
             // 
             this.ribbonPageGroup2.ItemLinks.Add(this.btn_Report01);
-            this.ribbonPageGroup2.ItemLinks.Add(this.barButtonItem5);
+            this.ribbonPageGroup2.ItemLinks.Add(this.btn_treeView);
             this.ribbonPageGroup2.Name = "ribbonPageGroup2";
             this.ribbonPageGroup2.Text = "设备数据";
             // 
             // ribbonPageGroup11
             // 
+            this.ribbonPageGroup11.ItemLinks.Add(this.btnPlanCheckJump);
             this.ribbonPageGroup11.ItemLinks.Add(this.btnSystemSetting);
             this.ribbonPageGroup11.Name = "ribbonPageGroup11";
             this.ribbonPageGroup11.Text = "设置";
@@ -831,7 +852,9 @@ namespace TsSFCDevice.Client.Launch
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage7;
         private DevExpress.XtraBars.BarButtonItem btnTagMgr;
         private DevExpress.XtraBars.BarButtonItem barButtonItem7;
-        private DevExpress.XtraBars.BarButtonItem barButtonItem5;
+        private DevExpress.XtraBars.BarButtonItem btn_treeView;
         private DevExpress.XtraBars.BarButtonItem batBtnRefresh;
+        private DevExpress.XtraBars.BarButtonItem barButtonItem5;
+        private DevExpress.XtraBars.BarButtonItem btnPlanCheckJump;
     }
 }
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/frm_Launch.cs b/TsSFCDevice.Client.Launch/frm_Launch.cs
index ae50e28..a8f4524 100644
--- a/TsSFCDevice.Client.Launch/frm_Launch.cs
+++ b/TsSFCDevice.Client.Launch/frm_Launch.cs
@@ -1,12 +1,16 @@
 using DevExpress.XtraBars;
 using DevExpress.XtraBars.Ribbon;
+using DevExpress.XtraEditors;
+using DeviceRepair.Models;
 using DeviceRepair.Models.Common;
 using DeviceRepair.Models.Enum;
 using DeviceRepair.Utils;
 using System;
 using System.Linq;
 using System.Windows.Forms;
+using TsSFCDevice.Client.Biz;
 using TsSFCDevice.Client.Biz.Base.Utils;
+using TsSFCDevice.Client.Biz.Impl;
 using TsSFCDevice.Client.Launch.Plan;
 using TsSFCDevice.Client.Launch.sysConfig;
 
@@ -24,8 +28,8 @@ namespace TsSFCDevice.Client.Launch
 
         private void frm_Launch_Load(object sender, EventArgs e)
         {
-            //Scheduler.Instance.CallBack += InvokeChangeFormText;
-            //Scheduler.Instance.Run();
+            Scheduler.Instance.CallBack += InvokeChangeFormText;
+            Scheduler.Instance.Run();
 
             this.FormClosing += (ss, ee) =>
             {
@@ -108,15 +112,6 @@ namespace TsSFCDevice.Client.Launch
                     case "SchedulerPlanTips":
                         btn_PlanCount.Caption = Value + "";
                         break;
-                    case "CurrentYearPlanSchedule":
-                        if (Value != null)
-                        {
-                            if (Value is CurrentYearPlanSchedule)
-                                barLb_Schedule.Caption = ((CurrentYearPlanSchedule)Value).ToString();
-                            else
-                                barLb_Schedule.Caption = Value + "";
-                        }
-                        break;
                     default:
                         break;
                 }
@@ -940,5 +935,54 @@ namespace TsSFCDevice.Client.Launch
             Utility.SystemRuntimeInfo.CurrentDeviceCaches = null;
             Utility.SystemRuntimeInfo.CurrentDevRootCaches = null;
         }
+
+        /// <summary>
+        /// 树形视图
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btn_treeView_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            try
+            {
+                if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_KH)
+                    && !Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_OEM)
+                    )
+                {
+                    throw new Exception($"当前账号缺少此操作的权限");
+                }
+
+                using (Device.pageDeviceTreeView view = new Device.pageDeviceTreeView())
+                {
+                    view.ShowDialog(this);
+                }
+            }
+            catch (Exception ex)
+            {
+                XtraMessageBoxHelper.Error(ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 跳过当前日期生成设备校验计划
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnPlanCheckJump_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            try
+            {
+                if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PLAN_JUMP_CHECK))
+                {
+                    throw new Exception($"当前账号缺少此操作的权限");
+                }
+
+
+            }
+            catch (Exception ex)
+            {
+                XtraMessageBoxHelper.Error(ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/frm_Launch.resx b/TsSFCDevice.Client.Launch/frm_Launch.resx
index c29ef06..f0e0b97 100644
--- a/TsSFCDevice.Client.Launch/frm_Launch.resx
+++ b/TsSFCDevice.Client.Launch/frm_Launch.resx
@@ -201,7 +201,7 @@
 </value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="barButtonItem8.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="batBtnRefresh.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACd0RVh0VGl0
         bGUAUmVmcmVzaDtSZXBlYXQ7QmFycztSaWJib247UmVsb2FkzU326QAAAwFJREFUOE+lk3sslWEcxx/k
@@ -220,7 +220,7 @@
         yEckJ2/AQITNhixOCaOGIa+pg1Hf0Mi9X2ezX/TfAfQdAvawuvfdXuIAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="barButtonItem8.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="batBtnRefresh.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACd0RVh0VGl0
         bGUAUmVmcmVzaDtSZXBlYXQ7QmFycztSaWJib247UmVsb2FkzU326QAACWhJREFUWEfFlwlUk1cWgB/W
@@ -1120,7 +1120,7 @@
         T8b7/XCa++SfYzx6ji0+TvBM8H7ggpfB6zUUxspgn/viAVPMYcP/AGBDyOsdZH9HAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="barButtonItem5.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btn_treeView.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA
@@ -1133,7 +1133,7 @@
         FGQA6bHgFVJ83jO46L9HUOF/t4A80mMBGYNsITkWkDEQEIiF/wwAEzc5In1OcF0AAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="barButtonItem5.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btn_treeView.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA
@@ -1165,9 +1165,78 @@
         q6y9RcvvZHEJIj7KGs2/P84ZFqX5IpcAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="pmLogUser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 17</value>
-  </metadata>
+  <data name="barButtonItem8.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAATdEVYdFRpdGxlAEhpc3Rvcnk7SXRlbTuQPSVvAAADmklEQVQ4T2WSe0yTZxSHX5i3ZcmYcVu2
+        /bHMuSk6mDNR2OayRTJQLgGHFkRRWDKjDpjgwJA4YcCEdpRyESm36KwhgO1sK1rl0tLSGy1QWpFysdIG
+        QltoOxw355blt/dr3B/LTvLk5Ms5vyd58x2S1mAmJ+qHyXG+iaTWDRFagUkV6vjkKkM9i9c/wKo0PDvM
+        619O5OpG4znKEjp/gRIQW6YmMZdUhAkWDMw/ZYIBsReEbyZV6aX5wjE0amcgtXqhd69A51rBfdsCiqQT
+        iCvtc0ac/zWU2d9frCTkaO0QjtQYCuN/uheczh/y3DC6oHEuo9uxiFLZJI7X6pHAUSG7xQLRmBeCQRcS
+        y7V/f5bdsoeRkORqI7hddrB4BmebeR6yx7/jqtGNQ1wNTlerwBZoUX5DhzM1KkT+KMflvmlUKOzYd7Hb
+        RQXryOFKA+SOJVT3TkNsXUClchZJFVp0GexYWvnDj9Xmhui+BezrOuwvkUMwPIdTV034NFfMJ19x9bgz
+        8QT1hjlU97kQx1bDOO7G8uqz/zDnXYJAMojvrqiRKbCg+M4kwvM6PCSerUGrxQeu0okC2QyOXDGBJ3kI
+        l2cRbsqk3envUzNeCO+Z0SAaQExZH/i6WezOFq+SLwsV+PxCFz7Ok2HXWSlCM8TYcUqEgmv9UOosSIhN
+        gWRvCBShb0H2zkYIOx8gorgXjf1u7MoQ/sX8vhcjC3t8NaoZxHDUaO96CJXRhlsyPeIOnURdsxAK7Qg6
+        VWbc7h5CG51H02eW9zgQ8k2LhxFs+CL/tiLvphXp9YMoaR1Gj/oBohLS0HT9FsZtTjxyzGP0kQuDI9P+
+        +dfNZmT+YkJwagM9BELWhp25lpXwsxqFHTZE/NCJDu1jyLq1mJ71wuNbgtu7CMesD7J+O6I5GhTdncK+
+        8xJsjivKYASBL73+7ivhOeKxk00mnG0ZQVSpBhVSKyxTPqw+/RMW+2/gdUwgqkyLnPZxpF/W4X1WtZxm
+        g8gnuXcZyZot0bnhu7NE3pQqHb5vt+Io34QDbD0iLmlwgKOn38PIaR0Fi6PA9mONvld3HvyQyZE92RJG
+        EEBZ90ZY8vYdaY3yvefESKsz4FybFflimz94gp50WEYrtiSW9276IDqE2ffnPvpWSHaebv9XsoYStDn2
+        YubW5BrNtmNNC8Gpzdiawn/yHr3ttyPzsuh8I2Uts78tqZa2/xcjWk95mbKJ8trzHkTZQAmkPC9C/gFM
+        gks/ML6Z5gAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="barButtonItem8.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        /03icbjO+DeTqe1BwSGzrQAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="frm_Launch.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi4z
diff --git a/TsSFCDevice.Client.Launch/page_PlanDialog.cs b/TsSFCDevice.Client.Launch/page_PlanDialog.cs
index 706a14a..d7a6cba 100644
--- a/TsSFCDevice.Client.Launch/page_PlanDialog.cs
+++ b/TsSFCDevice.Client.Launch/page_PlanDialog.cs
@@ -150,26 +150,23 @@ namespace TsSFCDevice.Client.Launch
                 int handle = item.RowHandle;
                 View_CurrentMonthPlanTips dmp = (View_CurrentMonthPlanTips)tileView1.GetRow(handle);
 
+                /* 保养类型 */
+                EnumDeviceBelong Belong = dmp.MaintenanceType.Equals("Daily", StringComparison.OrdinalIgnoreCase) ? EnumDeviceBelong.AM : EnumDeviceBelong.PM;
+
                 if (dmp != null)
                 {
-                    if (dmp.FormAutoID == 0)
-                    {
-                        XtraMessageBoxHelper.Error($"当前设备未绑定点检表表单！");
-                        return;
-                    }
-
                     this.Hide();
 
                     //获取设备信息
                     DeviceInformationInfo entity = Utility.SystemRuntimeInfo.CurrentDeviceCaches.FirstOrDefault(x => x.EquipmentID.Equals(dmp.EquipmentID, StringComparison.CurrentCultureIgnoreCase));
-                    if (entity == null || entity.MaintenanceFormVersion == 0)
+                    if (entity == null || (Belong == EnumDeviceBelong.AM ? entity.MaintenanceAMFormVersion : entity.MaintenanceFormVersion) == 0)
                     {
-                        XtraMessageBox.Show("该设备未绑定点检表,请先绑定点检表。", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        XtraMessageBoxHelper.Error("该设备未绑定点检表,请先绑定点检表。");
                         this.Show();
                         return;
                     }
 
-                    page_DriveMaintenance view = new page_DriveMaintenance(entity, (EnumDeviceBelong)Enum.Parse(typeof(EnumDeviceBelong), dmp.Belong), dmp.AutoID);
+                    page_DriveMaintenance view = new page_DriveMaintenance(entity, Belong, dmp.AutoID);
                     if (dmp.MaintenanceType == EnumMaintenanceType.Daily.ToString())
                     {
                         view.DaylyMaintenanceDate = DateTime.Today;
@@ -189,13 +186,13 @@ namespace TsSFCDevice.Client.Launch
                 }
                 else
                 {
-                    XtraMessageBox.Show("未能获取到设备信息,请重试。", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    XtraMessageBoxHelper.Error("未能获取到设备信息,请重试。");
                     this.Show();
                 }
             }
             catch (Exception ex)
             {
-                XtraMessageBox.Show(ex.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                XtraMessageBoxHelper.Error(ex.Message);
                 this.Show();
             }
         }
diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs
new file mode 100644
index 0000000..b20d686
--- /dev/null
+++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs
@@ -0,0 +1,103 @@
+namespace TsSFCDevice.Client.Launch.sysConfig
+{
+    partial class pageJumpCheckView
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
+            this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+            this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.ribbonStatusBar = new DevExpress.XtraBars.Ribbon.RibbonStatusBar();
+            ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // ribbon
+            // 
+            this.ribbon.AllowMinimizeRibbon = false;
+            this.ribbon.ExpandCollapseItem.Id = 0;
+            this.ribbon.Location = new System.Drawing.Point(0, 0);
+            this.ribbon.Margin = new System.Windows.Forms.Padding(4);
+            this.ribbon.MaxItemId = 4;
+            this.ribbon.Name = "ribbon";
+            this.ribbon.OptionsMenuMinWidth = 424;
+            this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
+            this.ribbonPage1});
+            this.ribbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.False;
+            this.ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
+            this.ribbon.ShowQatLocationSelector = false;
+            this.ribbon.ShowToolbarCustomizeItem = false;
+            this.ribbon.Size = new System.Drawing.Size(1331, 134);
+            this.ribbon.StatusBar = this.ribbonStatusBar;
+            this.ribbon.Toolbar.ShowCustomizeItem = false;
+            // 
+            // ribbonPage1
+            // 
+            this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
+            this.ribbonPageGroup1});
+            this.ribbonPage1.Name = "ribbonPage1";
+            this.ribbonPage1.Text = "ribbonPage1";
+            // 
+            // ribbonPageGroup1
+            // 
+            this.ribbonPageGroup1.Name = "ribbonPageGroup1";
+            this.ribbonPageGroup1.Text = "ribbonPageGroup1";
+            // 
+            // ribbonStatusBar
+            // 
+            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 662);
+            this.ribbonStatusBar.Name = "ribbonStatusBar";
+            this.ribbonStatusBar.Ribbon = this.ribbon;
+            this.ribbonStatusBar.Size = new System.Drawing.Size(1489, 24);
+            // 
+            // pageJumpCheckView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1489, 686);
+            this.Controls.Add(this.ribbonStatusBar);
+            this.Controls.Add(this.ribbon);
+            this.Name = "pageJumpCheckView";
+            this.Ribbon = this.ribbon;
+            this.StatusBar = this.ribbonStatusBar;
+            this.Text = "pageJumpCheckView";
+            ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
+        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+        private DevExpress.XtraBars.Ribbon.RibbonStatusBar ribbonStatusBar;
+    }
+}
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs
new file mode 100644
index 0000000..f30e0bf
--- /dev/null
+++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using DevExpress.XtraBars;
+
+namespace TsSFCDevice.Client.Launch.sysConfig
+{
+    public partial class pageJumpCheckView : DevExpress.XtraBars.Ribbon.RibbonForm
+    {
+        public pageJumpCheckView()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/TsSFCDeviceSvc/MainService.asmx.cs b/TsSFCDeviceSvc/MainService.asmx.cs
index 4320e8e..f44426a 100644
--- a/TsSFCDeviceSvc/MainService.asmx.cs
+++ b/TsSFCDeviceSvc/MainService.asmx.cs
@@ -216,6 +216,36 @@ namespace TsSFCDeviceSvc
             }
         }
 
+        [WebMethod(Description = "判断当前开工设备是否存在未完成的保养计划")]
+        [SoapHeader("auth")]
+        public APIResponseData Get_EquipmentPlanIsComplete(string inParams)
+        {
+            HttpAuthtication();
+            Dictionary<string, string> Parameters = GetParameters(inParams);
+
+            try
+            {
+                #region 检查APP版本是否是最新版本，否则返回错误
+
+                AppVersionValid(Parameters);
+
+                #endregion
+
+                if (!Parameters.ContainsKey("EquipmentID"))
+                {
+                    throw new ArgumentException("缺少传入参数设备编号(EquipmentID)");
+                }
+
+                PlanDa cmd = new PlanDa(Parameters);
+                return cmd.Get_EquipmentPlanIsComplete(Parameters["EquipmentID"]);
+            }
+            catch (Exception ex)
+            {
+                log.Error(ex);
+                return new APIResponseData { Code = -1, Message = ex.Message };
+            }
+        }
+
         #region 设备信息
 
         [WebMethod(Description = "获取树形结构")]
@@ -1766,5 +1796,6 @@ namespace TsSFCDeviceSvc
         {
             return JsonConvert.DeserializeObject<Dictionary<string, string>>(inParameter);
         }
+
     }
 }
\ No newline at end of file