From 48ba9b7947fbb5e7fd0c798df98f1d5711a0602d Mon Sep 17 00:00:00 2001 From: clovejunti Date: Thu, 26 Sep 2024 10:47:56 +0800 Subject: [PATCH] 21 --- DeviceRepair.DataAccess/PLAN/PlanDa.cs | 35 +++ .../Device/DeviceInformationInfoTree.cs | 2 + .../Device/View_DriveInfomationModel.cs | 6 + .../AM/FormVersion/pageFormVersionEdit.cs | 2 +- .../Pages/AM/Plan/pageDevicePlanEdit.cs | 4 +- .../DriveMaintenance/page_DriveMaintenance.cs | 8 +- .../Pages/FormVersion/Page_FormVersionAdd.cs | 2 +- .../Pages/FormVersion/page_FormVersion.cs | 13 +- .../Pages/Maintenance/page_MaintenanceView.cs | 8 +- .../Pages/Plan/page_PlanEdit.cs | 4 +- .../Pages/Plan/page_PlanExcelImport.cs | 10 +- .../WaitRemove/page_DriveItems.Designer.cs | 30 +-- .../Pages/page_PlanDialog.cs | 6 +- DeviceRepairAndOptimization/Program.cs | 2 +- TsSFCDevice.Client.Biz/Impl/PlanRepository.cs | 37 +++ .../DeviceSvc/MainService.disco | 2 +- .../Web References/DeviceSvc/MainService.wsdl | 53 +++- .../Web References/DeviceSvc/Reference.cs | 76 +++++- .../Web References/DeviceSvc/Reference.map | 4 +- .../Edit/pageAMFormVersionEdit.Designer.cs | 5 +- .../CheckForm/Edit/pageAMFormVersionEdit.cs | 2 +- .../CheckForm/Edit/pageFormVersionEdit.cs | 7 +- .../CheckForm/pageCheckFormView.Designer.cs | 16 ++ .../Device/Page_DriveInfoEdit.cs | 5 +- .../Device/pageDeviceTreeView.Designer.cs | 175 +++++++----- .../Device/pageDeviceTreeView.cs | 98 ++++++- .../Device/pageDeviceView.Designer.cs | 35 +-- .../Device/pageDeviceView.cs | 2 - .../Device/pageDeviceView.resx | 23 ++ .../Plan/AM/pageDeviceAMPlanView.Designer.cs | 6 +- .../Plan/AM/pageDeviceAMPlanView.resx | 52 +++- .../Plan/PagePlanDetail.Designer.cs | 92 ++++--- .../Plan/PagePlanDetail.cs | 12 +- .../Plan/PagePlanDetail.resx | 8 +- .../Plan/pageDevicePlanEdit.cs | 11 +- .../Plan/pageDevicePlanView.Designer.cs | 7 +- .../Plan/pageDevicePlanView.resx | 72 +++-- .../Preserve/page_DriveMaintenance.cs | 8 +- .../frm_Launch.Designer.cs | 70 +---- TsSFCDevice.Client.Launch/frm_Launch.cs | 2 +- TsSFCDevice.Client.Launch/frm_Launch.resx | 254 +++++------------- TsSFCDeviceSvc/MainService.asmx.cs | 42 ++- .../PublishProfiles/FolderProfile.pubxml.user | 18 +- 43 files changed, 850 insertions(+), 476 deletions(-) diff --git a/DeviceRepair.DataAccess/PLAN/PlanDa.cs b/DeviceRepair.DataAccess/PLAN/PlanDa.cs index 9660486..d74ef02 100644 --- a/DeviceRepair.DataAccess/PLAN/PlanDa.cs +++ b/DeviceRepair.DataAccess/PLAN/PlanDa.cs @@ -601,6 +601,41 @@ GROUP BY MaintenanceDay;"; } } + /// + /// 获取计划任务进度 + /// + /// + /// + public APIResponseData Get_AM_PLAN_ProgressInfo(out DataSet dsDatas) + { + dsDatas = new DataSet("Datas"); + + try + { + int EquipmentAutoID = base.GetParamInt("EquipmentID", "设备编号"); + int Year = base.GetParamInt("Year", "计划年"); + + List Datas = devMain.SqlQueryable("SELECT * FROM View_AM_Plan_Progress").Where(x => x.PlanYear == Year && x.EquipmentID == EquipmentAutoID).ToList(); + if ((Datas?.Count ?? 0) == 0) + { + throw new ArgumentException("传入的数据不正确，获取计划信息失败！"); + } + + DataTable table = Datas.ToDataTable(); + dsDatas.Tables.Add(table); + return new APIResponseData { Code = 1, Message = "操作成功！" }; + } + catch (SqlException sqlEx) + { + throw sqlEx; + } + catch (Exception ex) + { + log.Error(ex); + throw ex; + } + } + /// /// 新增或编辑 /// diff --git a/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs b/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs index c78ce48..1193295 100644 --- a/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs +++ b/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs @@ -133,6 +133,8 @@ namespace DeviceRepair.Models.Device /// public virtual int Route { get; set; } + public virtual int RoutePkID { get; set; } + /// /// 控件用ID diff --git a/DeviceRepair.Models/Device/View_DriveInfomationModel.cs b/DeviceRepair.Models/Device/View_DriveInfomationModel.cs index e26700d..aadc90d 100644 --- a/DeviceRepair.Models/Device/View_DriveInfomationModel.cs +++ b/DeviceRepair.Models/Device/View_DriveInfomationModel.cs @@ -53,6 +53,12 @@ namespace DeviceRepair.Models [SugarColumn(IsIgnore = true)] public string MaintenanceAMFormVersionName { get; set; } + [SugarColumn(IsIgnore = true)] + public string AMVersionCode { get; set; } + + [SugarColumn(IsIgnore = true)] + public string AMVersionRev { get; set; } + [SugarColumn(IsIgnore = true)] public bool MaintenanceFormStatus { get; set; } diff --git a/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionEdit.cs b/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionEdit.cs index 84bce63..1b4b78e 100644 --- a/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionEdit.cs +++ b/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionEdit.cs @@ -209,7 +209,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion catch (Exception ex) { splashScreenManager1.TryCloseWait(); - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } } diff --git a/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs b/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs index b05ccc7..d2197c4 100644 --- a/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs +++ b/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs @@ -126,7 +126,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan AnnualMaintenancePlan vp = Biz.PlanManager.Instance.GetPlanByEquipmentPkAndYear(CurrentModel?.MaintenanceYear ?? DateTime.Now.Year, CurrentDevice.AutoID); if (vp != null) { - if (XtraMessageBox.Show($"当前年度下设备编号:{CurrentDevice.EquipmentID}的设备已经存在计划,是否转到编辑？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Asterisk) == DialogResult.Yes) + if (XtraMessageBoxHelper.AskYesNo($"当前年度下设备编号:{CurrentDevice.EquipmentID}的设备已经存在计划,是否转到编辑？") == DialogResult.Yes) { CurrentModel = vp; txt_EquipmentID.ReadOnly = false; @@ -184,7 +184,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan AnnualMaintenancePlan vp = Biz.PlanManager.Instance.GetPlanByEquipmentPkAndYear(CurrentModel?.MaintenanceYear ?? DateTime.Now.Year, CurrentDevice.AutoID); if (vp != null) { - if (XtraMessageBox.Show($"当前年度下设备编号:{CurrentDevice.EquipmentID}的设备已经存在计划,是否转到编辑？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Asterisk) == DialogResult.Yes) + if (XtraMessageBoxHelper.AskYesNo($"当前年度下设备编号:{CurrentDevice.EquipmentID}的设备已经存在计划,是否转到编辑？") == DialogResult.Yes) { CurrentModel = vp; txt_EquipmentID.ReadOnly = false; diff --git a/DeviceRepairAndOptimization/Pages/DriveMaintenance/page_DriveMaintenance.cs b/DeviceRepairAndOptimization/Pages/DriveMaintenance/page_DriveMaintenance.cs index eff554b..7c0e32a 100644 --- a/DeviceRepairAndOptimization/Pages/DriveMaintenance/page_DriveMaintenance.cs +++ b/DeviceRepairAndOptimization/Pages/DriveMaintenance/page_DriveMaintenance.cs @@ -1243,7 +1243,7 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance spreadsheetControl1.Document.Worksheets.ActiveWorksheet = spreadsheetControl1.Document.Worksheets["Table2"]; else { - XtraMessageBox.Show("非标准设备保养表单！", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("非标准设备保养表单！"); this.DialogResult = DialogResult.Cancel; } @@ -1295,7 +1295,7 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance string watermarkText = ApiHelper.Instance.GetServiceTime(); if (string.IsNullOrWhiteSpace(watermarkText)) { - XtraMessageBox.Show("未能获取到服务器时间。", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("未能获取到服务器时间。"); return; } @@ -1325,7 +1325,7 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance } catch (Exception ex) { - XtraMessageBox.Show(ex.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } @@ -1378,7 +1378,7 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance } catch (Exception ex) { - XtraMessageBox.Show(ex.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } diff --git a/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.cs b/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.cs index e2f2484..806291a 100644 --- a/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.cs +++ b/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.cs @@ -188,7 +188,7 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion txt_FilePath.Text = ""; splashScreenManager1.TryCloseWait(); - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } splashScreenManager1.TryCloseWait(); } diff --git a/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.cs b/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.cs index a64437d..4bad1b6 100644 --- a/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.cs +++ b/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.cs @@ -270,15 +270,14 @@ namespace DeviceRepairAndOptimization.Pages XtraMessageBoxHelper.Error($"请选择要操作的数据！"); return; } - - DialogResult result = XtraMessageBox.Show("你确定要执行此操作吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (result == DialogResult.Yes) + + if (XtraMessageBoxHelper.AskYesNo("你确定要执行此操作吗？") == DialogResult.Yes) { APIResponseData apiResponseData = FormManager.Instance.ChangeStauts(CurrentItem.AutoID); if (apiResponseData.Code == 1) { - XtraMessageBox.Show("操作成功!", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + XtraMessageBoxHelper.Info("操作成功!"); BindData(); } else @@ -290,7 +289,7 @@ namespace DeviceRepairAndOptimization.Pages catch (Exception ex) { BindData(); - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } @@ -321,7 +320,7 @@ namespace DeviceRepairAndOptimization.Pages page_AssignDriveTree view = new page_AssignDriveTree(CurrentItem); if (view.ShowDialog(this) == DialogResult.OK) { - XtraMessageBox.Show("操作成功!", "信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + XtraMessageBoxHelper.Info("操作成功!"); BindData(); } } @@ -333,7 +332,7 @@ namespace DeviceRepairAndOptimization.Pages catch (Exception ex) { BindData(); - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } diff --git a/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.cs b/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.cs index 65329e3..599e9ab 100644 --- a/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.cs +++ b/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.cs @@ -101,7 +101,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintenance APIResponseData result = PreserveManager.Instance.GetPreserveDatas(FilterString); if (result.Code == -1) { - XtraMessageBox.Show(result.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(result.Message); return; } List Datas = result.ToDeserializeObject>(); @@ -128,7 +128,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintenance if (SelectedRows.Length == 0) { - XtraMessageBox.Show("请勾选要操作的数据", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("请勾选要操作的数据"); return; } @@ -159,7 +159,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintenance if (SelectedRows.Length == 0) { - XtraMessageBox.Show("请勾选要操作的数据", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("请勾选要操作的数据"); return; } @@ -226,7 +226,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintenance if (SelectedRows.Length == 0) { - XtraMessageBox.Show("请勾选要操作的数据", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("请勾选要操作的数据"); return; } diff --git a/DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.cs b/DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.cs index a7b2186..87a0d48 100644 --- a/DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.cs +++ b/DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.cs @@ -176,7 +176,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan } catch (Exception ex) { - XtraMessageBox.Show(ex.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); this.DialogResult = DialogResult.Abort; } this.DialogResult = DialogResult.OK; @@ -239,7 +239,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan if (vp != null) { splashScreenManager1.TryCloseWait(); - if (XtraMessageBox.Show($"当前年度下设备编号:{dim.EquipmentID}的设备已经存在计划,是否转到编辑？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Asterisk) == DialogResult.Yes) + if (XtraMessageBoxHelper.AskYesNo($"当前年度下设备编号:{dim.EquipmentID}的设备已经存在计划,是否转到编辑？") == DialogResult.Yes) { DataSource = vp; txt_EquipmentID.Enabled = false; diff --git a/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs b/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs index 2d2f6cf..b2e9a1b 100644 --- a/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs +++ b/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs @@ -136,7 +136,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan { if (logs.Length == 0) { - XtraMessageBox.Show("当前没有日志信息！", "信息"); + XtraMessageBoxHelper.Info("当前没有日志信息！", "信息"); } else { @@ -158,7 +158,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan DataTable dataTable = new DataTable(); if (string.IsNullOrEmpty(filePath)) { - XtraMessageBox.Show("请选择待导入的文件", "错误"); + XtraMessageBoxHelper.Error("请选择待导入的文件"); return; } @@ -413,7 +413,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan { HasErrorAndExitAction(ex.Message); logs.AppendLine(ex.Message); - XtraMessageBox.Show(ex.Message, "错误"); + XtraMessageBoxHelper.Error(ex.Message); } } @@ -430,11 +430,11 @@ namespace DeviceRepairAndOptimization.Pages.Plan try { OutExcel(dlg.SelectedPath.ToString()); - XtraMessageBox.Show("导出成功！", "信息"); + XtraMessageBoxHelper.Info("导出成功！"); } catch (Exception ex) { - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } diff --git a/DeviceRepairAndOptimization/Pages/WaitRemove/page_DriveItems.Designer.cs b/DeviceRepairAndOptimization/Pages/WaitRemove/page_DriveItems.Designer.cs index f3ca427..95f9de9 100644 --- a/DeviceRepairAndOptimization/Pages/WaitRemove/page_DriveItems.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/WaitRemove/page_DriveItems.Designer.cs @@ -130,10 +130,10 @@ namespace DeviceRepairAndOptimization.Pages this.lb_Caption.AutoSize = true; this.lb_Caption.Font = new System.Drawing.Font("Tahoma", 21F, System.Drawing.FontStyle.Bold); this.lb_Caption.ForeColor = System.Drawing.SystemColors.Control; - this.lb_Caption.Location = new System.Drawing.Point(9, 82); + this.lb_Caption.Location = new System.Drawing.Point(9, 86); this.lb_Caption.Margin = new System.Windows.Forms.Padding(9, 0, 9, 0); this.lb_Caption.Name = "lb_Caption"; - this.lb_Caption.Size = new System.Drawing.Size(162, 42); + this.lb_Caption.Size = new System.Drawing.Size(131, 34); this.lb_Caption.TabIndex = 0; this.lb_Caption.Text = "设备类型"; // @@ -141,7 +141,7 @@ namespace DeviceRepairAndOptimization.Pages // this.btn_Return.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Return.ImageOptions.Image"))); this.btn_Return.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleCenter; - this.btn_Return.Location = new System.Drawing.Point(189, -4); + this.btn_Return.Location = new System.Drawing.Point(158, -4); this.btn_Return.Margin = new System.Windows.Forms.Padding(9); this.btn_Return.Name = "btn_Return"; this.btn_Return.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; @@ -158,7 +158,7 @@ namespace DeviceRepairAndOptimization.Pages panelControl1.Location = new System.Drawing.Point(0, 207); panelControl1.Margin = new System.Windows.Forms.Padding(9); panelControl1.Name = "panelControl1"; - panelControl1.Size = new System.Drawing.Size(1472, 669); + panelControl1.Size = new System.Drawing.Size(1638, 711); panelControl1.TabIndex = 18; // // gridControl @@ -174,7 +174,7 @@ namespace DeviceRepairAndOptimization.Pages this.gridControl.Margin = new System.Windows.Forms.Padding(9); this.gridControl.MenuManager = this.barManager1; this.gridControl.Name = "gridControl"; - this.gridControl.Size = new System.Drawing.Size(1468, 665); + this.gridControl.Size = new System.Drawing.Size(1634, 707); this.gridControl.TabIndex = 0; this.gridControl.ToolTipController = this.toolTipController1; this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -441,15 +441,15 @@ namespace DeviceRepairAndOptimization.Pages this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; this.barDockControlTop.Location = new System.Drawing.Point(0, 0); this.barDockControlTop.Manager = this.barManager1; - this.barDockControlTop.Size = new System.Drawing.Size(1472, 0); + this.barDockControlTop.Size = new System.Drawing.Size(1638, 0); // // barDockControlBottom // this.barDockControlBottom.CausesValidation = false; this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.barDockControlBottom.Location = new System.Drawing.Point(0, 876); + this.barDockControlBottom.Location = new System.Drawing.Point(0, 918); this.barDockControlBottom.Manager = this.barManager1; - this.barDockControlBottom.Size = new System.Drawing.Size(1472, 0); + this.barDockControlBottom.Size = new System.Drawing.Size(1638, 0); // // barDockControlLeft // @@ -457,15 +457,15 @@ namespace DeviceRepairAndOptimization.Pages this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; this.barDockControlLeft.Location = new System.Drawing.Point(0, 0); this.barDockControlLeft.Manager = this.barManager1; - this.barDockControlLeft.Size = new System.Drawing.Size(0, 876); + this.barDockControlLeft.Size = new System.Drawing.Size(0, 918); // // barDockControlRight // this.barDockControlRight.CausesValidation = false; this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(1472, 0); + this.barDockControlRight.Location = new System.Drawing.Point(1638, 0); this.barDockControlRight.Manager = this.barManager1; - this.barDockControlRight.Size = new System.Drawing.Size(0, 876); + this.barDockControlRight.Size = new System.Drawing.Size(0, 918); // // btn_Back // @@ -535,7 +535,7 @@ namespace DeviceRepairAndOptimization.Pages this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Margin = new System.Windows.Forms.Padding(9); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1472, 207); + this.panelControl2.Size = new System.Drawing.Size(1638, 207); this.panelControl2.TabIndex = 17; // // stackPanel2 @@ -544,7 +544,7 @@ namespace DeviceRepairAndOptimization.Pages this.stackPanel2.Controls.Add(this.simpleButton1); this.stackPanel2.Dock = System.Windows.Forms.DockStyle.Right; this.stackPanel2.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft; - this.stackPanel2.Location = new System.Drawing.Point(604, 0); + this.stackPanel2.Location = new System.Drawing.Point(770, 0); this.stackPanel2.Margin = new System.Windows.Forms.Padding(9); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(868, 207); @@ -577,9 +577,9 @@ namespace DeviceRepairAndOptimization.Pages // // page_DriveItems // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1472, 876); + this.ClientSize = new System.Drawing.Size(1638, 918); this.Controls.Add(panelControl1); this.Controls.Add(this.panelControl2); this.Controls.Add(this.barDockControlLeft); diff --git a/DeviceRepairAndOptimization/Pages/page_PlanDialog.cs b/DeviceRepairAndOptimization/Pages/page_PlanDialog.cs index bd111b8..312d296 100644 --- a/DeviceRepairAndOptimization/Pages/page_PlanDialog.cs +++ b/DeviceRepairAndOptimization/Pages/page_PlanDialog.cs @@ -167,7 +167,7 @@ namespace DeviceRepairAndOptimization.Pages if (entity == null || entity.MaintenanceFormVersion == 0) { - XtraMessageBox.Show("该设备未绑定点检表,请先绑定点检表。", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("该设备未绑定点检表,请先绑定点检表。"); this.Show(); return; } @@ -198,13 +198,13 @@ namespace DeviceRepairAndOptimization.Pages } 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/DeviceRepairAndOptimization/Program.cs b/DeviceRepairAndOptimization/Program.cs index f498858..6eeb19a 100644 --- a/DeviceRepairAndOptimization/Program.cs +++ b/DeviceRepairAndOptimization/Program.cs @@ -80,7 +80,7 @@ namespace DeviceRepairAndOptimization } catch (Exception ex) { - DevExpress.XtraEditors.XtraMessageBox.Show(ex.Message, "错误"); + XtraMessageBoxHelper.Error(ex.Message); return; } } diff --git a/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs b/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs index 6e05ad4..e2e88fe 100644 --- a/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs +++ b/TsSFCDevice.Client.Biz/Impl/PlanRepository.cs @@ -380,6 +380,43 @@ namespace TsSFCDevice.Client.Biz.Impl } } + /// + /// 获取计划任务进度 + /// + /// + /// + /// + public IList Get_AM_PLAN_ProgressInfo(int EquipmentID, int Year) + { + try + { + byte[] btResults = null; + ApiParameters?.Clear(); + + ApiParameters.Add("EquipmentID", EquipmentID + ""); + ApiParameters.Add("Year", Year + ""); + + var Rtn = Utility.SfcBizService.CurrentSvc.Get_AM_PLAN_ProgressInfo(GetParameters(), out btResults); + if (Rtn.Code != 1) + { + throw new Exception(Rtn.Message); + } + + DataSet dsResults = CompressionHelper.ExactDataSet(btResults); + IList Datas = DTOHelper.DataTableToList(dsResults.Tables[0]); + if (Datas == null) + { + throw new Exception("实例化当前计划数据时发生异常错误！"); + } + return Datas; + } + catch (Exception ex) + { + log.Error(ex.Message, ex); + throw ex; + } + } + #endregion /// diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco index c54b060..0527e6a 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco @@ -1,5 +1,5 @@ - + diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl index da0158c..81abc48 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl @@ -1,5 +1,5 @@ - + @@ -288,6 +288,21 @@ + + + + + + + + + + + + + + + @@ -1097,6 +1112,15 @@ + + + + + + + + + @@ -1509,10 +1533,15 @@ - 获取计划任务进度 + 获取PM计划任务进度 + + 获取AM计划任务进度 + + + 获取单计划数据 @@ -1856,6 +1885,16 @@ + + + + + + + + + + @@ -2389,6 +2428,16 @@ + + + + + + + + + + diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs index e7d2dd0..a2ae523 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs @@ -14,12 +14,12 @@ #pragma warning disable 1591 namespace TsSFCDevice.Client.Biz.DeviceSvc { - using System; - using System.Web.Services; using System.Diagnostics; - using System.Web.Services.Protocols; + using System; using System.Xml.Serialization; using System.ComponentModel; + using System.Web.Services.Protocols; + using System.Web.Services; using System.Data; @@ -62,6 +62,8 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { private System.Threading.SendOrPostCallback Get_PM_PLAN_ProgressInfoOperationCompleted; + private System.Threading.SendOrPostCallback Get_AM_PLAN_ProgressInfoOperationCompleted; + private System.Threading.SendOrPostCallback Get_PLAN_SingleOperationCompleted; private System.Threading.SendOrPostCallback Get_AM_PLAN_XlsxOperationCompleted; @@ -230,6 +232,9 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { /// public event Get_PM_PLAN_ProgressInfoCompletedEventHandler Get_PM_PLAN_ProgressInfoCompleted; + /// + public event Get_AM_PLAN_ProgressInfoCompletedEventHandler Get_AM_PLAN_ProgressInfoCompleted; + /// public event Get_PLAN_SingleCompletedEventHandler Get_PLAN_SingleCompleted; @@ -817,6 +822,37 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { } } + /// + [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_AM_PLAN_ProgressInfo", 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_AM_PLAN_ProgressInfo(string inParams, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] out byte[] btResults) { + object[] results = this.Invoke("Get_AM_PLAN_ProgressInfo", new object[] { + inParams}); + btResults = ((byte[])(results[1])); + return ((APIResponseData)(results[0])); + } + + /// + public void Get_AM_PLAN_ProgressInfoAsync(string inParams) { + this.Get_AM_PLAN_ProgressInfoAsync(inParams, null); + } + + /// + public void Get_AM_PLAN_ProgressInfoAsync(string inParams, object userState) { + if ((this.Get_AM_PLAN_ProgressInfoOperationCompleted == null)) { + this.Get_AM_PLAN_ProgressInfoOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGet_AM_PLAN_ProgressInfoOperationCompleted); + } + this.InvokeAsync("Get_AM_PLAN_ProgressInfo", new object[] { + inParams}, this.Get_AM_PLAN_ProgressInfoOperationCompleted, userState); + } + + private void OnGet_AM_PLAN_ProgressInfoOperationCompleted(object arg) { + if ((this.Get_AM_PLAN_ProgressInfoCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.Get_AM_PLAN_ProgressInfoCompleted(this, new Get_AM_PLAN_ProgressInfoCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_PLAN_Single", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] @@ -2731,6 +2767,40 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { } } + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void Get_AM_PLAN_ProgressInfoCompletedEventHandler(object sender, Get_AM_PLAN_ProgressInfoCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Get_AM_PLAN_ProgressInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal Get_AM_PLAN_ProgressInfoCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public APIResponseData Result { + get { + this.RaiseExceptionIfNecessary(); + return ((APIResponseData)(this.results[0])); + } + } + + /// + public byte[] btResults { + get { + this.RaiseExceptionIfNecessary(); + return ((byte[])(this.results[1])); + } + } + } + /// [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void Get_PLAN_SingleCompletedEventHandler(object sender, Get_PLAN_SingleCompletedEventArgs e); diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map index a47b807..f8d69fd 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.Designer.cs b/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.Designer.cs index 1d89ffe..a0b2347 100644 --- a/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.Designer.cs +++ b/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.Designer.cs @@ -253,10 +253,11 @@ namespace TsSFCDevice.Client.Launch.CheckForm this.txtVersion.Name = "txtVersion"; this.txtVersion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.txtVersion.Properties.Appearance.Options.UseFont = true; - this.txtVersion.Properties.Columns = 2; + this.txtVersion.Properties.Columns = 3; this.txtVersion.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0075.01", "FM-P0075.01"), - new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0075.15", "FM-P0075.15")}); + new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0075.15", "FM-P0075.15"), + new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0075.17", "FM-P0075.17")}); this.txtVersion.Size = new System.Drawing.Size(512, 34); this.txtVersion.StyleController = this.layoutControl1; this.txtVersion.TabIndex = 7; diff --git a/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.cs b/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.cs index d024229..69f6b63 100644 --- a/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.cs +++ b/TsSFCDevice.Client.Launch/CheckForm/Edit/pageAMFormVersionEdit.cs @@ -206,7 +206,7 @@ namespace TsSFCDevice.Client.Launch.CheckForm catch (Exception ex) { splashScreenManager1.TryCloseWait(); - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } } diff --git a/TsSFCDevice.Client.Launch/CheckForm/Edit/pageFormVersionEdit.cs b/TsSFCDevice.Client.Launch/CheckForm/Edit/pageFormVersionEdit.cs index 854af42..3b9f404 100644 --- a/TsSFCDevice.Client.Launch/CheckForm/Edit/pageFormVersionEdit.cs +++ b/TsSFCDevice.Client.Launch/CheckForm/Edit/pageFormVersionEdit.cs @@ -47,6 +47,11 @@ namespace TsSFCDevice.Client.Launch.CheckForm Description = "FM-P0075.15", Value = "FM-P0075.15" }); + txtVersion.Properties.Items.Add(new DevExpress.XtraEditors.Controls.RadioGroupItem + { + Description = "FM-P0075.17", + Value = "FM-P0075.17" + }); txtVersion.EditValue = "FM-P0075.01"; this.Text = "AM 的点检表"; } @@ -232,7 +237,7 @@ namespace TsSFCDevice.Client.Launch.CheckForm catch (Exception ex) { splashScreenManager1.TryCloseWait(); - XtraMessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } } diff --git a/TsSFCDevice.Client.Launch/CheckForm/pageCheckFormView.Designer.cs b/TsSFCDevice.Client.Launch/CheckForm/pageCheckFormView.Designer.cs index 69e042f..e4525ba 100644 --- a/TsSFCDevice.Client.Launch/CheckForm/pageCheckFormView.Designer.cs +++ b/TsSFCDevice.Client.Launch/CheckForm/pageCheckFormView.Designer.cs @@ -312,6 +312,10 @@ // // gcCreateName // + this.gcCreateName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcCreateName.AppearanceCell.Options.UseFont = true; + this.gcCreateName.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcCreateName.AppearanceHeader.Options.UseFont = true; this.gcCreateName.Caption = "创建人"; this.gcCreateName.FieldName = "CreatUserName"; this.gcCreateName.Name = "gcCreateName"; @@ -320,6 +324,10 @@ // // gcCreatetime // + this.gcCreatetime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcCreatetime.AppearanceCell.Options.UseFont = true; + this.gcCreatetime.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcCreatetime.AppearanceHeader.Options.UseFont = true; this.gcCreatetime.Caption = "创建时间"; this.gcCreatetime.FieldName = "CreatDate"; this.gcCreatetime.Name = "gcCreatetime"; @@ -328,6 +336,10 @@ // // gcChangeUser // + this.gcChangeUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcChangeUser.AppearanceCell.Options.UseFont = true; + this.gcChangeUser.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcChangeUser.AppearanceHeader.Options.UseFont = true; this.gcChangeUser.Caption = "修改人"; this.gcChangeUser.FieldName = "ChangeUserName"; this.gcChangeUser.Name = "gcChangeUser"; @@ -336,6 +348,10 @@ // // gcChangeDate // + this.gcChangeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcChangeDate.AppearanceCell.Options.UseFont = true; + this.gcChangeDate.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcChangeDate.AppearanceHeader.Options.UseFont = true; this.gcChangeDate.Caption = "修改时间"; this.gcChangeDate.FieldName = "ChangeDate"; this.gcChangeDate.Name = "gcChangeDate"; diff --git a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs index a1c0941..28d82c2 100644 --- a/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs +++ b/TsSFCDevice.Client.Launch/Device/Page_DriveInfoEdit.cs @@ -96,7 +96,10 @@ namespace TsSFCDevice.Client.Launch.Device // 使用的表单 FormVerValue = CurrentModel.MaintenanceFormVersion; //FormVerName = CurrentModel.MaintenanceFormVersionName; - btn_SelectFormRev.Text = CurrentModel.VersionCode; + btn_SelectFormRev.Text = $"{CurrentModel.VersionCode}-{CurrentModel.VersionRev}"; + + AMFormVerValue = CurrentModel.MaintenanceAMFormVersion; + btn_AM_Form.Text = $"{CurrentModel.AMVersionCode}-{CurrentModel.AMVersionRev}"; // 备注 txt_Remarks.Text = CurrentModel.Remarks; diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs index dd65122..ccb522f 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs @@ -28,11 +28,11 @@ /// private void InitializeComponent() { - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + 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(); @@ -46,6 +46,10 @@ 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.UsingDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + 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(); @@ -64,12 +68,15 @@ this.gcOwningUnit = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.gcOperatingParameters = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.gcRemarks = new DevExpress.XtraTreeList.Columns.TreeListColumn(); - this.UsingDate = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); ((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 @@ -139,16 +146,16 @@ this.ipsEquipmentID.AppearanceReadOnly.Options.UseTextOptions = true; this.ipsEquipmentID.AppearanceReadOnly.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; this.ipsEquipmentID.AutoHeight = false; - serializableAppearanceObject5.Font = new System.Drawing.Font("Tahoma", 12F); - serializableAppearanceObject5.Options.UseFont = true; - serializableAppearanceObject6.Font = new System.Drawing.Font("Tahoma", 12F); - serializableAppearanceObject6.Options.UseFont = true; - serializableAppearanceObject7.Font = new System.Drawing.Font("Tahoma", 2F); - serializableAppearanceObject7.Options.UseFont = true; - serializableAppearanceObject8.Font = new System.Drawing.Font("Tahoma", 12F); - serializableAppearanceObject8.Options.UseFont = true; + 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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + 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); @@ -228,6 +235,59 @@ // this.splashScreenManager1.ClosingDelay = 500; // + // 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; + // + // 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 = 15; + this.layoutControl1.Text = "layoutControl1"; + // // treeList1 // this.treeList1.Appearance.Caption.Font = new System.Drawing.Font("Tahoma", 12F); @@ -260,11 +320,11 @@ this.gcOwningUnit, this.gcOperatingParameters, this.gcRemarks}); - this.treeList1.Dock = System.Windows.Forms.DockStyle.Fill; this.treeList1.FixedLineWidth = 3; this.treeList1.Font = new System.Drawing.Font("Tahoma", 12F); - this.treeList1.HorzScrollStep = 4; - this.treeList1.Location = new System.Drawing.Point(0, 133); + this.treeList1.HorzScrollStep = 1; + this.treeList1.HorzScrollVisibility = DevExpress.XtraTreeList.ScrollVisibility.Never; + 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); @@ -282,10 +342,9 @@ 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, 634); - this.treeList1.TabIndex = 13; + this.treeList1.Size = new System.Drawing.Size(3300, 593); + this.treeList1.TabIndex = 14; this.treeList1.TreeLevelWidth = 23; - this.treeList1.RowCellClick += new DevExpress.XtraTreeList.RowCellClickEventHandler(this.treeList1_RowCellClick); // // gcAutoID // @@ -430,47 +489,24 @@ this.gcRemarks.Visible = true; this.gcRemarks.VisibleIndex = 15; // - // UsingDate + // Root // - 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; + 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; // - // gridColumn1 + // layoutControlItem1 // - 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; + 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; // // pageDeviceTreeView // @@ -478,7 +514,7 @@ 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.treeList1); + 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); @@ -490,7 +526,11 @@ 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(); @@ -510,10 +550,14 @@ private DevExpress.XtraBars.BarButtonItem barEditStatus; private DevExpress.XtraBars.BarButtonItem barRefresh; private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1; + private DevExpress.XtraGrid.Columns.GridColumn UsingDate; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraLayout.LayoutControl layoutControl1; private DevExpress.XtraTreeList.TreeList treeList1; private DevExpress.XtraTreeList.Columns.TreeListColumn gcAutoID; - private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentID; private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentName; + private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentID; private DevExpress.XtraTreeList.Columns.TreeListColumn gcSpecification; private DevExpress.XtraTreeList.Columns.TreeListColumn gcManufacturer; private DevExpress.XtraTreeList.Columns.TreeListColumn gcSerialNumber; @@ -526,10 +570,9 @@ 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; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; } } \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs index 91f3c6a..2b8b4f1 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs @@ -145,7 +145,30 @@ namespace TsSFCDevice.Client.Launch.Device /// private void barInsert_ItemClick(object sender, ItemClickEventArgs e) { + if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_ADD)) + { + XtraMessageBoxHelper.Error("当前账号缺少此操作的权限！"); + return; + } + try + { + using (Page_DriveInfoEdit view = new Page_DriveInfoEdit()) + { + if (view.ShowDialog(this) == DialogResult.OK) + { + DeviceInformationInfo nItem = view.OperationObject; + + Utility.SystemRuntimeInfo.CurrentDeviceCaches = null; + InitializeGridData(); + XtraMessageBoxHelper.Info("操作成功！"); + } + } + } + catch (Exception ex) + { + XtraMessageBoxHelper.Error(ex.Message, "出错"); + } } /// @@ -155,7 +178,70 @@ namespace TsSFCDevice.Client.Launch.Device /// private void barEdit_ItemClick(object sender, ItemClickEventArgs e) { + if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_Edit)) + { + XtraMessageBoxHelper.Error("当前账号缺少此操作的权限！"); + return; + } + if (m_CurrentModel == null || m_CurrentModel.AutoID == 0) + { + XtraMessageBoxHelper.Error("请先选择要修改的数据行！"); + return; + } + + try + { + using (Page_DriveInfoEdit view = new Page_DriveInfoEdit("编辑", new View_DriveInfomationModel + { + AutoID = m_CurrentModel.AutoID, + EquipmentName = m_CurrentModel.EquipmentName, + ChangeDate = m_CurrentModel.ChangeDate.HasValue ? m_CurrentModel.ChangeDate.Value : DateTime.MinValue, + ChangeUser = m_CurrentModel.ChangeUser, + CreatDate = m_CurrentModel.CreatDate.HasValue ? m_CurrentModel.CreatDate.Value : DateTime.MinValue, + CreatUser = m_CurrentModel.CreatUser, + EquipmentCategory = m_CurrentModel.EquipmentCategory, + EquipmentID = m_CurrentModel.EquipmentID, + EquipmentOriginalvalue = m_CurrentModel.EquipmentOriginalvalue, + EquipmentStatus = m_CurrentModel.EquipmentStatus, + GUID = m_CurrentModel.GUID, + InstallationLocation = m_CurrentModel.InstallationLocation, + MaintenanceAMFormVersion = m_CurrentModel.MaintenanceAMFormVersion, + MaintenanceAMFormVersionName = m_CurrentModel.MaintenanceAMFormVersionName, + MaintenanceFormStatus = true, + MaintenanceFormVersion = m_CurrentModel.MaintenanceFormVersion, + MaintenanceFormVersionName = m_CurrentModel.MaintenanceFormVersionName, + Manufacturer = m_CurrentModel.Manufacturer, + OperatingParameters = m_CurrentModel.OperatingParameters, + OwningUnit = m_CurrentModel.OwningUnit, + Remarks = m_CurrentModel.Remarks, + Route = m_CurrentModel.RoutePkID, + Weight = m_CurrentModel.Weight, + SerialNumber = m_CurrentModel.SerialNumber, + Specification = m_CurrentModel.Specification, + Totalcapacity = m_CurrentModel.Totalcapacity, + UsingDate = m_CurrentModel.UsingDate, + VersionCode = m_CurrentModel.VersionCode, + VersionRev = m_CurrentModel.VersionRev, + AMVersionCode = m_CurrentModel.AMVersionCode, + AMVersionRev = m_CurrentModel.AMVersionRev, + WarrantyPeriod = m_CurrentModel.WarrantyPeriod, + RouteText = m_CurrentModel.RouteName + })) + { + if (view.ShowDialog(this) == DialogResult.OK) + { + DeviceInformationInfo nItem = view.OperationObject; + Utility.SystemRuntimeInfo.CurrentDeviceCaches = null; + InitializeGridData(); + XtraMessageBoxHelper.Info("操作成功！"); + } + } + } + catch (Exception ex) + { + XtraMessageBoxHelper.Error(ex.Message, "出错"); + } } /// @@ -236,6 +322,11 @@ namespace TsSFCDevice.Client.Launch.Device treeList1.ExpandAll(); treeList1.BestFitColumns(); + if (Datas.Count > 0) + { + treeList1_RowCellClick(treeList1, new DevExpress.XtraTreeList.RowCellClickEventArgs(new DevExpress.Utils.DXMouseEventArgs(MouseButtons.Left, 1, 1, 1, 1), treeList1.GetNodeByVisibleIndex(0), gcEquipmentID)); + } + splashScreenManager1.CloseWaitForm(); } catch (Exception ex) @@ -251,7 +342,7 @@ namespace TsSFCDevice.Client.Launch.Device { m_CurrentModel = treeList1.GetRow(e.Node.Id) as DeviceInformationInfoTree; - if (m_CurrentModel != null) + if (m_CurrentModel != null && m_CurrentModel.AutoID != 0) { barEdit.Enabled = m_CurrentModel.EquipmentStatus > 0; barEditStatus.Enabled = true; @@ -260,6 +351,11 @@ namespace TsSFCDevice.Client.Launch.Device barEditStatus.ImageOptions.Image = m_CurrentModel.EquipmentStatus > 0 ? Icons["Lock"] : Icons["UnLock"]; barEditStatus.ImageOptions.LargeImage = m_CurrentModel.EquipmentStatus > 0 ? Icons["Lock"] : Icons["UnLock"]; } + else + { + barEditStatus.Enabled = false; + barEdit.Enabled = false; + } } } } \ 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 700e00a..80bce79 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceView.Designer.cs @@ -66,13 +66,13 @@ this.OwningUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.colVersionCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.colVersionRev = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.Remarks = new DevExpress.XtraGrid.Columns.GridColumn(); this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true); 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(); @@ -249,7 +249,7 @@ // gridControl1 // this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); - this.gridControl1.Location = new System.Drawing.Point(-1981, 12); + this.gridControl1.Location = new System.Drawing.Point(12, 12); this.gridControl1.MainView = this.gridView1; this.gridControl1.MinimumSize = new System.Drawing.Size(3300, 0); this.gridControl1.Name = "gridControl1"; @@ -567,6 +567,20 @@ this.colVersionRev.VisibleIndex = 16; this.colVersionRev.Width = 94; // + // 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; + // // Remarks // this.Remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); @@ -615,20 +629,6 @@ 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; @@ -638,6 +638,7 @@ this.Controls.Add(this.layoutControl1); this.Controls.Add(this.ribbon); this.Font = new System.Drawing.Font("Tahoma", 12F); + this.IconOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("pageDeviceView.IconOptions.SvgImage"))); this.Margin = new System.Windows.Forms.Padding(4); this.Name = "pageDeviceView"; this.Ribbon = this.ribbon; diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs index 6e47bac..8ff4d68 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs @@ -237,8 +237,6 @@ namespace TsSFCDevice.Client.Launch.Device DeviceInformationInfo nItem = view.OperationObject; Utility.SystemRuntimeInfo.CurrentDeviceCaches = null; InitializeGridData(); - gridView1_RowCellClick(gridControl1, new RowCellClickEventArgs(new DevExpress.Utils.DXMouseEventArgs(MouseButtons.Left, 1, 1, 1, 1), 0, EquipmentID)); - gridView1.FocusedRowHandle = 0; XtraMessageBoxHelper.Info("操作成功！"); } } diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceView.resx b/TsSFCDevice.Client.Launch/Device/pageDeviceView.resx index 63d3b59..15e6ec3 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceView.resx +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceView.resx @@ -448,6 +448,29 @@ 6bQVpZ+3oR8r7QSwhg8xcMBFDnLlmtDrtTgM7wMnGyTl7zQaw/9oaPQ4vWGTZi7RDPzaafxBS3etKm74 KY/V1wDW8CEGDrjIkedCQ2XblQ0BqaAyUfKjczQHMWzlWAZeE8aqNLqxhg8xcKRdRC40+iyubH2RlBvB 10t6PdLIBbCGDzFwPqjw+xrEpGawUyiiDPikou9fuLdJ9v+B+v0LVZMvjm9OYQEAAAAASUVORK5CYII= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJwDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku + WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4 + N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk + aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI5LDJIM0MyLjUs + MiwyLDIuNSwyLDN2MjZjMCwwLjUsMC41LDEsMSwxaDI2YzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwy + OS41LDIsMjksMnogTTI4LDI4SDRWNGgyNFYyOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPGcgY2xhc3M9 + InN0MCI+DQogICAgPHBhdGggZD0iTTI4LDEwVjhoLTRWNGgtMnY0SDEwVjRIOHY0SDR2Mmg0djRINHYy + aDR2NEg0djJoNHY2aDJ2LTZoMTJ2Nmgydi02aDR2LTJoLTR2LTRoNHYtMmgtNHYtNEgyOHogTTEwLDEw + aDEydjQgICBIMTBWMTB6IE0xMCwyMHYtNGgxMnY0SDEweiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+ + DQogIDxyZWN0IHg9IjgiIHk9IjgiIHdpZHRoPSIxNiIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNs + YXNzPSJCbHVlIiAvPg0KPC9zdmc+Cw== \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.Designer.cs b/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.Designer.cs index 12c5877..722d5db 100644 --- a/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.Designer.cs @@ -718,15 +718,16 @@ // // contextMenuStrip1 // + this.contextMenuStrip1.Font = new System.Drawing.Font("Tahoma", 12F); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.查看设备保养详情ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(173, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(207, 50); // // 查看设备保养详情ToolStripMenuItem // this.查看设备保养详情ToolStripMenuItem.Name = "查看设备保养详情ToolStripMenuItem"; - this.查看设备保养详情ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); + this.查看设备保养详情ToolStripMenuItem.Size = new System.Drawing.Size(206, 24); this.查看设备保养详情ToolStripMenuItem.Text = "查看设备保养详情"; this.查看设备保养详情ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); // @@ -744,6 +745,7 @@ this.Controls.Add(this.ribbonStatusBar); this.Controls.Add(this.ribbon); this.Font = new System.Drawing.Font("Tahoma", 12F); + this.IconOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("pageDeviceAMPlanView.IconOptions.LargeImage"))); this.Margin = new System.Windows.Forms.Padding(4); this.Name = "pageDeviceAMPlanView"; this.Ribbon = this.ribbon; diff --git a/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.resx b/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.resx index c61b4c6..f5a0e7d 100644 --- a/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.resx +++ b/TsSFCDevice.Client.Launch/Plan/AM/pageDeviceAMPlanView.resx @@ -440,6 +440,56 @@ - 208, 17 + 205, 17 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0 + bGUASGlzdG9yeTtJdGVtO5A9JW8AAAozSURBVFhHxVZ5VJNXFne0nel0mbZ2s9NO21PbGbV2usmZdmgL + 1qkLddeKWrVUBaG4ASJWRBEBrSIgIjtBlB2CgECABNlXCRAVSEgg7FsIIYABbU9/c98HiWCZ6Zm/Juf8 + znvf+/Ld3+/ed+99bwaA/ytmuLq6/k+g3+8mYeZDMLyb7tvpMO3iw9Ab3ezO/9OuS4UbLYNKY62CysRW + QaVtNMIysKRtV2Bx9c5LxbEWF/I2rnHiPU3/5wRNZ28ypl2cDGZkw/Ho2d9dKvLZHVymO86/g5DiDiTe + 0iBNNgyhchTX6rS4WqXChdxWOMXU4lu/Qt1WL+GFpba+z/+WEMPE/Hze8Skvxr2eud0n19ziYtGAZ7oM + 2YoRCFtHcV2hwzXZXSQ2jCD61hAiawcRJRlC3O0h8OuHESfRwDnhNjafFWnXnUzdQnYe+U8iDJNNXnnY + dO4GJ2KCfNZmL6HbnpAypNYPIIc8TZKOIJ4IYuuGEENkkTWDCL05gNCqCXBzDcLFAyRGi7Cybmzzzscq + l5TTZO9Rwkw9nx4PBJy7AZ9sBTb8KDrByL8+k+22n1dJXg+DLx1GNBFGSbS4UqvlPA4jwoByNQL/C8JI + 0OWbfdjhm49lRxI9yO7vCVMiYZhsPJuL8p778M6SY71nVoLFxUJkEXksEV8mT8MnPAyuUMO3sA/n8/vg + X6ICr1KNK9UDiKrVEIiQ5uFVavpfPy7R+0tlKoSV92KtmwAme3nbJyJhEGEQsOGMCCVd97hQnxc0Ikmi + QtQtLUIqB8ibfviX9sO7oBencrpxWtSFoFIVzgtbYRMqxlqPG1jqIsA/HVJpzMIaerYJE8O/qAd+xb3w + K+mFr6gVXxzma+ab7X+VRVgvwiBg/ekcFHaMUVJpcb1xBFcp1Iz4YnE/edsLV0EHjqS24VRWB87ltGPL + +WJ8Zp+MbSf58IoUIj6rElUSKfjCargGZcH8xDWYOKbhVIYSPoW9ZKcPtqHlMP4+/AKRP0YY7xt6Aes8 + s5HXNgqeWINgCqs/ecg8PiHohAO/BXZJLXBOa4NzkgyfH07HjlOJyLghhlTRga5eDVQDw9AM6aAevIuu + vkGkiCQ4GSyEyQ+Z8MhqIye64ZvXCVP7uNE5Cxe/RORcZXDkbLLGPQuiFh2CKXk44swOjnRffDO+j22G + I4lwjGuA8aFUuAakQ1LXzBGpNCPoJ9IH0KFfo4O8pR/8nFvY55ODdT8WwIsEeOV3YatXLj7a4WNNnH+Y + LGDmqlMCpEuHcDy9HfZEvJ+IbaKbYHVVAZuoJhxLVcLEKQNH/VJxq6EVHb2D6O4fQreKQGMXG1XDBrT3 + aCEolCEuswbLjmXiaLIcZ4SdsIushtGukBTifILx6gXMWuWaiXhqIPZJSs5rayLdFSnHt7xG7I0hMZfv + wPRgDJIFpVC09KGtZ3AK2ru1aOMwiNauQbR0aiAqlSOjoAGOgYWwCKyCh7AdLskyGFlGyInzGcIjegGP + mJ1IR2yNmjxvgjV5zsh3hDdia4gMmwKl2B+nhGVQBSzdE1B0sx6KVhWUHQNoblfTqOHQTGhqZ2sDuCPv + RV5FE4QlcgQnV8PsVB7cstvgmt4CI6uIYeJkbfpRg4AVLmlcPw+rUCGASsc3v4dC1gU3QRdcrnfAKaUd + R9PaYeFfDuszSSgRyxDIS8DWXQcRFJEERZuaRI1DplShXNKGQrES+ZVN4IvqYHo0m/KqFScJiywj6Bye + wRKRNSau7T5qejgFnx9KhrE9H58c4MNoXxI+tE3EezYJWLgnAQss4/G33fF4e2cc5n4XB+tzGTBbtx2H + AtKwcvVm5Ji8C5HxfAiM3kLae2+AP/9VxL/1EqJffx65FQp8cjiDHFHiGOGj3ZyAl6cIIDy35FD8mFUQ + eRhSicVOaeDxixGdWoKE9DIkU52nicQQ5NUiv7wevKhrMDY1g5HxUmz8xhpnL8XCLzwV/hHXERiZieCo + LITG5CA8ToTg2FyYOOfgaGozDic14n2LEB3xzSEYBLCanL3KJVnhliaHu6AV5j6luF6qhLiuE7XSbtxp + 7EFDUx8X3sQUIZav3oq99q5ISMlFVW0j6hXdaGjuo7EXt2U9kNA31fVdqLzdDn6hAmbu+XC61gT7mDq8 + uz2gifjYFjDHDQKeXn44Js0pVgK3jBZYhtXAJ+UOJA1dXEJJybi8tR8J14RYsmIj7H84jaLKBq7cWMYr + CSwBGykHpCRSL6SWRJxJkmDrxUrqJQpYBpRhwddemcT3HMEggLXFJz+z9D2w06+Ay1THRMr+80VobCGD + HLka8cnZ+OyL1Tjg5IGSKil6+oc5dPYOoZ3ASpCJYQkpVfajTtHHiVnlkQebK3VwSFJgJSX73BVHHIiP + 3ZpmGToh4bGXF3w69yvnlDG3NNZ4mrHBuxThQjmU5BkruX98ugx7D7mhXCyl1nsXaup4as1d9A2MoEc9 + Qs1omBrUEFq6xkWwiggWSGHmWQC7hEY4xkvx3o7Qsade+fs84vsjxztJANuGZz+3CQqzCiiBcwrtF32w + wjMfFdJedPZpEcXPRUW1DAPUcgeHRqEdHsMQYUBL7ZdaMBPSTRFp7x1vSCX1PVh8XAQrXi3sScAGj2y8 + vcY9gnjGe8BDAtg2PP7qB8vfWeIQqz2W1EAZq8CeiNtYe6YQYrmKiNlho8Pg8ChG7o5Bp7sP3eh9DN29 + R2tjUGtHSQSdB4RKWR81nxvYEVyDfTEyHLwqwTvfBGqfefPj94lnvA3rBUwSwVQ98+Fmt73LjiRzbdMh + Xo7dPAmWUxZH5jVjaOQedGM/YfTeTxi79zPu3/+Zex7R3SPcpxORTtRcBZacEGF7UA1so6RwoENsEdX+ + 60sOHiT7syd4pt4H2MIE2Cn1wqLtPgFmzqk4ypfBLk6GPZF3sPJsMdafLUJwthziJjVU2jH88ssv6NGM + 4qa8HwFZjVh9ugDLPQvxXdgt2EY3wCG2Hsa20Xjzq+NBZJfVvuEuMEXAJBHsJUuQOR9+4x1qahcPh+jb + cOLLOYMWoRKs9S7HlxQRU/LyU2c6811E+MItD6vPlWIbeb3nSj3tuQwHiPyjneF40+wEj+z9mfD4hP1f + X8kMC+Mi2JWJiXhx3sofDiyy5A2vp+PaMYHlhRwHY6WwudpAUamHJZ2SeyLrYE2k+0jgIUo2+9g6mB27 + jvnm/rrXFu+3IzvMc0ZuuIoZ+CY/GBYfiGDhmv3iwqVGC829kj6wCB/70omPbT4FsOXVUHjruHOedTeb + cDG20NV+sR2dG5sDfpq7yp3/7NsmH9P3LOOZM78i57geXtCD/ZnAwsUS5knCC0+9snDBG/+y2z9vw1nB + gk2+0nnmF9XztwRg3iY/9V/Xe0vfWu2Z8xeTvQeemDP/Hfr/i4SnCKzfTwn7FJ7pFvVgH01AL4SFkV0k + mHG2p+yG+9rEyJ7ZOnvPysxAzDCdfYZpFx+G3giBGWShZGIYAasYtk1sZM9snb3/TeJxuM74N5Op7UHB + IbOtAAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.Designer.cs b/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.Designer.cs index b0d304c..f912509 100644 --- a/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.Designer.cs +++ b/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.Designer.cs @@ -29,27 +29,27 @@ namespace TsSFCDevice.Client.Launch.Plan /// private void InitializeComponent() { - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PagePlanDetail)); - 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(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject(); this.gridControl1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gcEquipmentID = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -72,13 +72,16 @@ namespace TsSFCDevice.Client.Launch.Plan this.gridControl1.Name = "gridControl1"; this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); - this.gridControl1.Size = new System.Drawing.Size(693, 384); + this.gridControl1.Size = new System.Drawing.Size(818, 367); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); // // gridView1 // + this.gridView1.Appearance.HeaderPanel.Font = new System.Drawing.Font("Tahoma", 12F); + this.gridView1.Appearance.HeaderPanel.Options.UseFont = true; + this.gridView1.ColumnPanelRowHeight = 31; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gcEquipmentID, this.gcMonth, @@ -87,11 +90,18 @@ namespace TsSFCDevice.Client.Launch.Plan this.gcCompleteDate, this.gcOperation}); this.gridView1.GridControl = this.gridControl1; + this.gridView1.GroupRowHeight = 31; this.gridView1.Name = "gridView1"; this.gridView1.OptionsView.ShowGroupPanel = false; + this.gridView1.RowHeight = 31; + this.gridView1.ViewCaptionHeight = 31; // // gcEquipmentID // + this.gcEquipmentID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcEquipmentID.AppearanceCell.Options.UseFont = true; + this.gcEquipmentID.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcEquipmentID.AppearanceHeader.Options.UseFont = true; this.gcEquipmentID.Caption = "设备编号"; this.gcEquipmentID.FieldName = "EquipmentDisplayID"; this.gcEquipmentID.Name = "gcEquipmentID"; @@ -102,6 +112,10 @@ namespace TsSFCDevice.Client.Launch.Plan // // gcMonth // + this.gcMonth.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcMonth.AppearanceCell.Options.UseFont = true; + this.gcMonth.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcMonth.AppearanceHeader.Options.UseFont = true; this.gcMonth.Caption = "月份"; this.gcMonth.FieldName = "MaintenanceMonth"; this.gcMonth.Name = "gcMonth"; @@ -112,6 +126,10 @@ namespace TsSFCDevice.Client.Launch.Plan // // gcMaintenanceType // + this.gcMaintenanceType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcMaintenanceType.AppearanceCell.Options.UseFont = true; + this.gcMaintenanceType.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcMaintenanceType.AppearanceHeader.Options.UseFont = true; this.gcMaintenanceType.Caption = "保养类型"; this.gcMaintenanceType.FieldName = "MaintenanceType"; this.gcMaintenanceType.Name = "gcMaintenanceType"; @@ -122,6 +140,10 @@ namespace TsSFCDevice.Client.Launch.Plan // // gcFormVersionCode // + this.gcFormVersionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcFormVersionCode.AppearanceCell.Options.UseFont = true; + this.gcFormVersionCode.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcFormVersionCode.AppearanceHeader.Options.UseFont = true; this.gcFormVersionCode.Caption = "点检表编号"; this.gcFormVersionCode.FieldName = "FormDisplayCode"; this.gcFormVersionCode.Name = "gcFormVersionCode"; @@ -132,6 +154,10 @@ namespace TsSFCDevice.Client.Launch.Plan // // gcCompleteDate // + this.gcCompleteDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcCompleteDate.AppearanceCell.Options.UseFont = true; + this.gcCompleteDate.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcCompleteDate.AppearanceHeader.Options.UseFont = true; this.gcCompleteDate.Caption = "完成时间"; this.gcCompleteDate.FieldName = "CompleteDate"; this.gcCompleteDate.Name = "gcCompleteDate"; @@ -142,6 +168,10 @@ namespace TsSFCDevice.Client.Launch.Plan // // gcOperation // + this.gcOperation.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcOperation.AppearanceCell.Options.UseFont = true; + this.gcOperation.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.gcOperation.AppearanceHeader.Options.UseFont = true; this.gcOperation.Caption = "操作"; this.gcOperation.ColumnEdit = this.repositoryItemButtonEdit1; this.gcOperation.Name = "gcOperation"; @@ -151,15 +181,15 @@ namespace TsSFCDevice.Client.Launch.Plan // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image"))); - editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image"))); - editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image"))); - editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image"))); + editorButtonImageOptions9.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions9.Image"))); + editorButtonImageOptions10.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions10.Image"))); + editorButtonImageOptions11.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions11.Image"))); + editorButtonImageOptions12.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions12.Image"))); this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "设备保养", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "设备保养", null, null, DevExpress.Utils.ToolTipAnchor.Default), - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "保养记录修改", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "保养记录修改", null, null, DevExpress.Utils.ToolTipAnchor.Default), - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "查看", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "查看", null, null, DevExpress.Utils.ToolTipAnchor.Default), - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "打印", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "打印", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "设备保养", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "设备保养", null, null, DevExpress.Utils.ToolTipAnchor.Default), + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "保养记录修改", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "保养记录修改", null, null, DevExpress.Utils.ToolTipAnchor.Default), + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "查看", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "查看", null, null, DevExpress.Utils.ToolTipAnchor.Default), + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "打印", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "打印", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.ContextImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("repositoryItemButtonEdit1.ContextImageOptions.Image"))); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; @@ -167,9 +197,11 @@ namespace TsSFCDevice.Client.Launch.Plan // // PagePlanDetail // + this.Appearance.Options.UseFont = true; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - this.ClientSize = new System.Drawing.Size(693, 384); + this.ClientSize = new System.Drawing.Size(818, 367); this.Controls.Add(this.gridControl1); + this.Font = new System.Drawing.Font("Tahoma", 12F); this.IconOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("PagePlanDetail.IconOptions.LargeImage"))); this.MaximizeBox = false; this.Name = "PagePlanDetail"; diff --git a/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.cs b/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.cs index eee687c..2a8acd7 100644 --- a/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.cs +++ b/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.cs @@ -242,12 +242,12 @@ namespace TsSFCDevice.Client.Launch.Plan if (Belong == EnumDeviceBelong.AM) { - if (CurrentSelectRowData.FormDisplayCode != PreserveTemplate.TemplateConstValue.DailyTemplateV1 - && CurrentSelectRowData.FormDisplayCode != PreserveTemplate.TemplateConstValue.DailyTemplateV2 - ) - { - throw new Exception($"当前保养类型与绑定的点检表不匹配!"); - } + //if (CurrentSelectRowData.FormDisplayCode != PreserveTemplate.TemplateConstValue.DailyTemplateV1 + // && CurrentSelectRowData.FormDisplayCode != PreserveTemplate.TemplateConstValue.DailyTemplateV2 + // ) + //{ + // throw new Exception($"当前保养类型与绑定的点检表不匹配!"); + //} string MonthName = (new System.Globalization.CultureInfo("en-US")).DateTimeFormat.MonthNames[CurrentSelectRowData.MaintenanceMonth - 1].Substring(0, 3); if (CurrentPlan.GetType().GetProperty(($"{MonthName}Status")) == null) diff --git a/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.resx b/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.resx index a74a024..0f0896d 100644 --- a/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.resx +++ b/TsSFCDevice.Client.Launch/Plan/PagePlanDetail.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0 bGUARmlsbDtDb2xvcjucN7beAAACeElEQVQ4T53SXUhTYRgH8DOdOtM2l25T22pifuTXamyGYiYbmYJe @@ -135,7 +135,7 @@ P6kAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0 bGUARWRpdDtCYXJzO1JpYmJvbjtTdGFuZGFyZDswE8PbAAACtUlEQVQ4T2WSW0hUQRjHT97Xy1oIJilt @@ -153,7 +153,7 @@ RmqYj5AS5iP8AQSCmu1rvrSCAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABV0RVh0VGl0 bGUAWm9vbTEwMFBlcmNlbnQ7CDpw8AAAA0FJREFUOE9Vk9lPU0EUxgdjDJgY44N/gnEnxhj3JTxoNGBc @@ -173,7 +173,7 @@ PaEUckzJasZeRWMHAaZNAMD+ANqRqyoLwXY/AAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAFByaW50ZXI7579hxQAAAr9JREFU diff --git a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanEdit.cs b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanEdit.cs index f258b30..110358c 100644 --- a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanEdit.cs +++ b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanEdit.cs @@ -46,6 +46,7 @@ namespace TsSFCDevice.Client.Launch.Plan if (belong == EnumDeviceBelong.AM) { control.Properties.Items.Add("Daily"); + control.Properties.Items.Add("Monthly"); } else if (belong == EnumDeviceBelong.PM) { @@ -119,7 +120,15 @@ namespace TsSFCDevice.Client.Launch.Plan { try { - IList ProgList = PlanRepository.Instance.Get_PM_PLAN_ProgressInfo(CurrentModel.EquipmentID, CurrentModel.MaintenanceYear); + IList ProgList; + if (Belong == EnumDeviceBelong.PM) + { + ProgList = PlanRepository.Instance.Get_PM_PLAN_ProgressInfo(CurrentModel.EquipmentID, CurrentModel.MaintenanceYear); + } + else + { + ProgList = PlanRepository.Instance.Get_AM_PLAN_ProgressInfo(CurrentModel.EquipmentID, CurrentModel.MaintenanceYear); + } if (ProgList != null && ProgList.Count > 0) { diff --git a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs index 73bf3d0..ce08e9e 100644 --- a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs @@ -718,15 +718,16 @@ // // contextMenuStrip1 // + this.contextMenuStrip1.Font = new System.Drawing.Font("Tahoma", 12F); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.查看设备保养详情ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(173, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(207, 50); // // 查看设备保养详情ToolStripMenuItem // this.查看设备保养详情ToolStripMenuItem.Name = "查看设备保养详情ToolStripMenuItem"; - this.查看设备保养详情ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); + this.查看设备保养详情ToolStripMenuItem.Size = new System.Drawing.Size(206, 24); this.查看设备保养详情ToolStripMenuItem.Text = "查看设备保养详情"; this.查看设备保养详情ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); // @@ -744,7 +745,7 @@ this.Controls.Add(this.ribbonStatusBar); this.Controls.Add(this.ribbon); this.Font = new System.Drawing.Font("Tahoma", 12F); - this.IconOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("pageDevicePlanView.IconOptions.SvgImage"))); + this.IconOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("pageDevicePlanView.IconOptions.LargeImage"))); this.Margin = new System.Windows.Forms.Padding(4); this.Name = "pageDevicePlanView"; this.Ribbon = this.ribbon; diff --git a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx index 3bffaf1..1b16a30 100644 --- a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx +++ b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx @@ -440,32 +440,56 @@ - 208, 17 + 205, 17 - + - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFAEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdWRpdF94NUZfQ2hh - bmdlSGlzdG9yeSI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNiwxNiAxNiwxMCAxNCwxMCAxNCwxOCAy - MiwxOCAyMiwxNiAgIiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE2LDJDMTEuNiwyLDcu - Nyw0LDUuMiw3LjJMMiw0djEwaDAuMmg0SDEybC00LTRjMS44LTIuNCw0LjctNCw4LTRjNS41LDAsMTAs - NC41LDEwLDEwYzAsNS41LTQuNSwxMC0xMCwxMCAgIGMtNC44LDAtOC45LTMuNC05LjgtOGgtNGMxLDYu - OCw2LjgsMTIsMTMuOCwxMmM3LjcsMCwxNC02LjMsMTQtMTRTMjMuNywyLDE2LDJ6IiBjbGFzcz0iQmx1 - ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0 + bGUASGlzdG9yeTtJdGVtO5A9JW8AAAozSURBVFhHxVZ5VJNXFne0nel0mbZ2s9NO21PbGbV2usmZdmgL + 1qkLddeKWrVUBaG4ASJWRBEBrSIgIjtBlB2CgECABNlXCRAVSEgg7FsIIYABbU9/c98HiWCZ6Zm/Juf8 + znvf+/Ld3+/ed+99bwaA/ytmuLq6/k+g3+8mYeZDMLyb7tvpMO3iw9Ab3ezO/9OuS4UbLYNKY62CysRW + QaVtNMIysKRtV2Bx9c5LxbEWF/I2rnHiPU3/5wRNZ28ypl2cDGZkw/Ho2d9dKvLZHVymO86/g5DiDiTe + 0iBNNgyhchTX6rS4WqXChdxWOMXU4lu/Qt1WL+GFpba+z/+WEMPE/Hze8Skvxr2eud0n19ziYtGAZ7oM + 2YoRCFtHcV2hwzXZXSQ2jCD61hAiawcRJRlC3O0h8OuHESfRwDnhNjafFWnXnUzdQnYe+U8iDJNNXnnY + dO4GJ2KCfNZmL6HbnpAypNYPIIc8TZKOIJ4IYuuGEENkkTWDCL05gNCqCXBzDcLFAyRGi7Cybmzzzscq + l5TTZO9Rwkw9nx4PBJy7AZ9sBTb8KDrByL8+k+22n1dJXg+DLx1GNBFGSbS4UqvlPA4jwoByNQL/C8JI + 0OWbfdjhm49lRxI9yO7vCVMiYZhsPJuL8p778M6SY71nVoLFxUJkEXksEV8mT8MnPAyuUMO3sA/n8/vg + X6ICr1KNK9UDiKrVEIiQ5uFVavpfPy7R+0tlKoSV92KtmwAme3nbJyJhEGEQsOGMCCVd97hQnxc0Ikmi + QtQtLUIqB8ibfviX9sO7oBencrpxWtSFoFIVzgtbYRMqxlqPG1jqIsA/HVJpzMIaerYJE8O/qAd+xb3w + K+mFr6gVXxzma+ab7X+VRVgvwiBg/ekcFHaMUVJpcb1xBFcp1Iz4YnE/edsLV0EHjqS24VRWB87ltGPL + +WJ8Zp+MbSf58IoUIj6rElUSKfjCargGZcH8xDWYOKbhVIYSPoW9ZKcPtqHlMP4+/AKRP0YY7xt6Aes8 + s5HXNgqeWINgCqs/ecg8PiHohAO/BXZJLXBOa4NzkgyfH07HjlOJyLghhlTRga5eDVQDw9AM6aAevIuu + vkGkiCQ4GSyEyQ+Z8MhqIye64ZvXCVP7uNE5Cxe/RORcZXDkbLLGPQuiFh2CKXk44swOjnRffDO+j22G + I4lwjGuA8aFUuAakQ1LXzBGpNCPoJ9IH0KFfo4O8pR/8nFvY55ODdT8WwIsEeOV3YatXLj7a4WNNnH+Y + LGDmqlMCpEuHcDy9HfZEvJ+IbaKbYHVVAZuoJhxLVcLEKQNH/VJxq6EVHb2D6O4fQreKQGMXG1XDBrT3 + aCEolCEuswbLjmXiaLIcZ4SdsIushtGukBTifILx6gXMWuWaiXhqIPZJSs5rayLdFSnHt7xG7I0hMZfv + wPRgDJIFpVC09KGtZ3AK2ru1aOMwiNauQbR0aiAqlSOjoAGOgYWwCKyCh7AdLskyGFlGyInzGcIjegGP + mJ1IR2yNmjxvgjV5zsh3hDdia4gMmwKl2B+nhGVQBSzdE1B0sx6KVhWUHQNoblfTqOHQTGhqZ2sDuCPv + RV5FE4QlcgQnV8PsVB7cstvgmt4CI6uIYeJkbfpRg4AVLmlcPw+rUCGASsc3v4dC1gU3QRdcrnfAKaUd + R9PaYeFfDuszSSgRyxDIS8DWXQcRFJEERZuaRI1DplShXNKGQrES+ZVN4IvqYHo0m/KqFScJiywj6Bye + wRKRNSau7T5qejgFnx9KhrE9H58c4MNoXxI+tE3EezYJWLgnAQss4/G33fF4e2cc5n4XB+tzGTBbtx2H + AtKwcvVm5Ji8C5HxfAiM3kLae2+AP/9VxL/1EqJffx65FQp8cjiDHFHiGOGj3ZyAl6cIIDy35FD8mFUQ + eRhSicVOaeDxixGdWoKE9DIkU52nicQQ5NUiv7wevKhrMDY1g5HxUmz8xhpnL8XCLzwV/hHXERiZieCo + LITG5CA8ToTg2FyYOOfgaGozDic14n2LEB3xzSEYBLCanL3KJVnhliaHu6AV5j6luF6qhLiuE7XSbtxp + 7EFDUx8X3sQUIZav3oq99q5ISMlFVW0j6hXdaGjuo7EXt2U9kNA31fVdqLzdDn6hAmbu+XC61gT7mDq8 + uz2gifjYFjDHDQKeXn44Js0pVgK3jBZYhtXAJ+UOJA1dXEJJybi8tR8J14RYsmIj7H84jaLKBq7cWMYr + CSwBGykHpCRSL6SWRJxJkmDrxUrqJQpYBpRhwddemcT3HMEggLXFJz+z9D2w06+Ay1THRMr+80VobCGD + HLka8cnZ+OyL1Tjg5IGSKil6+oc5dPYOoZ3ASpCJYQkpVfajTtHHiVnlkQebK3VwSFJgJSX73BVHHIiP + 3ZpmGToh4bGXF3w69yvnlDG3NNZ4mrHBuxThQjmU5BkruX98ugx7D7mhXCyl1nsXaup4as1d9A2MoEc9 + Qs1omBrUEFq6xkWwiggWSGHmWQC7hEY4xkvx3o7Qsade+fs84vsjxztJANuGZz+3CQqzCiiBcwrtF32w + wjMfFdJedPZpEcXPRUW1DAPUcgeHRqEdHsMQYUBL7ZdaMBPSTRFp7x1vSCX1PVh8XAQrXi3sScAGj2y8 + vcY9gnjGe8BDAtg2PP7qB8vfWeIQqz2W1EAZq8CeiNtYe6YQYrmKiNlho8Pg8ChG7o5Bp7sP3eh9DN29 + R2tjUGtHSQSdB4RKWR81nxvYEVyDfTEyHLwqwTvfBGqfefPj94lnvA3rBUwSwVQ98+Fmt73LjiRzbdMh + Xo7dPAmWUxZH5jVjaOQedGM/YfTeTxi79zPu3/+Zex7R3SPcpxORTtRcBZacEGF7UA1so6RwoENsEdX+ + 60sOHiT7syd4pt4H2MIE2Cn1wqLtPgFmzqk4ypfBLk6GPZF3sPJsMdafLUJwthziJjVU2jH88ssv6NGM + 4qa8HwFZjVh9ugDLPQvxXdgt2EY3wCG2Hsa20Xjzq+NBZJfVvuEuMEXAJBHsJUuQOR9+4x1qahcPh+jb + cOLLOYMWoRKs9S7HlxQRU/LyU2c6811E+MItD6vPlWIbeb3nSj3tuQwHiPyjneF40+wEj+z9mfD4hP1f + X8kMC+Mi2JWJiXhx3sofDiyy5A2vp+PaMYHlhRwHY6WwudpAUamHJZ2SeyLrYE2k+0jgIUo2+9g6mB27 + jvnm/rrXFu+3IzvMc0ZuuIoZ+CY/GBYfiGDhmv3iwqVGC829kj6wCB/70omPbT4FsOXVUHjruHOedTeb + cDG20NV+sR2dG5sDfpq7yp3/7NsmH9P3LOOZM78i57geXtCD/ZnAwsUS5knCC0+9snDBG/+y2z9vw1nB + gk2+0nnmF9XztwRg3iY/9V/Xe0vfWu2Z8xeTvQeemDP/Hfr/i4SnCKzfTwn7FJ7pFvVgH01AL4SFkV0k + mHG2p+yG+9rEyJ7ZOnvPysxAzDCdfYZpFx+G3giBGWShZGIYAasYtk1sZM9snb3/TeJxuM74N5Op7UHB + IbOtAAAAAElFTkSuQmCC \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/Preserve/page_DriveMaintenance.cs b/TsSFCDevice.Client.Launch/Preserve/page_DriveMaintenance.cs index ba495f9..cb241c4 100644 --- a/TsSFCDevice.Client.Launch/Preserve/page_DriveMaintenance.cs +++ b/TsSFCDevice.Client.Launch/Preserve/page_DriveMaintenance.cs @@ -914,7 +914,7 @@ namespace TsSFCDevice.Client.Launch.Preserve spreadsheetControl1.Document.Worksheets.ActiveWorksheet = spreadsheetControl1.Document.Worksheets["Table2"]; else { - XtraMessageBox.Show("非标准设备保养表单！", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("非标准设备保养表单！"); this.DialogResult = DialogResult.Cancel; } @@ -966,7 +966,7 @@ namespace TsSFCDevice.Client.Launch.Preserve string watermarkText = CommonRepository.Instance.ServiceTime().ToString("yyyy-MM-dd"); if (string.IsNullOrWhiteSpace(watermarkText)) { - XtraMessageBox.Show("未能获取到服务器时间。", "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error("未能获取到服务器时间。"); return; } @@ -996,7 +996,7 @@ namespace TsSFCDevice.Client.Launch.Preserve } catch (Exception ex) { - XtraMessageBox.Show(ex.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } @@ -1049,7 +1049,7 @@ namespace TsSFCDevice.Client.Launch.Preserve } catch (Exception ex) { - XtraMessageBox.Show(ex.Message, "出错", MessageBoxButtons.OK, MessageBoxIcon.Error); + XtraMessageBoxHelper.Error(ex.Message); } } diff --git a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs index 887ec5f..de25bae 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs @@ -36,7 +36,6 @@ namespace TsSFCDevice.Client.Launch this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl(); this.batBtnRefresh = new DevExpress.XtraBars.BarButtonItem(); this.btn_Import = new DevExpress.XtraBars.BarButtonItem(); - this.btn_Maintenance = new DevExpress.XtraBars.BarButtonItem(); this.btn_Report01 = new DevExpress.XtraBars.BarButtonItem(); this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); @@ -53,7 +52,6 @@ namespace TsSFCDevice.Client.Launch this.Am_Form = new DevExpress.XtraBars.BarButtonItem(); this.Am_Record = new DevExpress.XtraBars.BarButtonItem(); this.barButtonItem6 = new DevExpress.XtraBars.BarButtonItem(); - this.Am_List = new DevExpress.XtraBars.BarButtonItem(); this.barSubItem1 = new DevExpress.XtraBars.BarSubItem(); this.bar_SymptomlDistinction = new DevExpress.XtraBars.BarButtonItem(); this.bar_Maintenance = new DevExpress.XtraBars.BarButtonItem(); @@ -76,14 +74,13 @@ namespace TsSFCDevice.Client.Launch this.btn_treeView = new DevExpress.XtraBars.BarButtonItem(); this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem(); this.btnPlanCheckJump = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItem8 = 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(); - this.ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); this.ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); - this.ribbonPageGroup10 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.ribbonPage2 = new DevExpress.XtraBars.Ribbon.RibbonPage(); this.ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.TagribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage(); @@ -102,7 +99,6 @@ namespace TsSFCDevice.Client.Launch this.pnl_Content = new DevExpress.XtraEditors.PanelControl(); this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true); this.ribbonPage7 = new DevExpress.XtraBars.Ribbon.RibbonPage(); - this.barButtonItem8 = new DevExpress.XtraBars.BarButtonItem(); ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pmLogUser)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemHypertextLabel1)).BeginInit(); @@ -138,7 +134,6 @@ namespace TsSFCDevice.Client.Launch this.ribbonControl.ExpandCollapseItem, this.ribbonControl.SearchEditItem, this.btn_Import, - this.btn_Maintenance, this.btn_Report01, this.barButtonItem1, this.barButtonItem2, @@ -157,7 +152,6 @@ namespace TsSFCDevice.Client.Launch this.Am_Form, this.Am_Record, this.barButtonItem6, - this.Am_List, this.barSubItem1, this.bar_SymptomlDistinction, this.bar_Maintenance, @@ -220,16 +214,6 @@ namespace TsSFCDevice.Client.Launch this.btn_Import.Name = "btn_Import"; this.btn_Import.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_Import_ItemClick); // - // btn_Maintenance - // - this.btn_Maintenance.Caption = "设备的PM表单"; - this.btn_Maintenance.Id = 22; - this.btn_Maintenance.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Maintenance.ImageOptions.Image"))); - this.btn_Maintenance.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btn_Maintenance.ImageOptions.LargeImage"))); - this.btn_Maintenance.Name = "btn_Maintenance"; - this.btn_Maintenance.Tag = ""; - this.btn_Maintenance.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_Maintenance_ItemClick); - // // btn_Report01 // this.btn_Report01.Caption = "设备总台账"; @@ -372,16 +356,6 @@ namespace TsSFCDevice.Client.Launch this.barButtonItem6.Tag = "BIZ_EQUIP_39"; this.barButtonItem6.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem6_ItemClick); // - // Am_List - // - this.Am_List.Caption = "设备的AM表单"; - this.Am_List.Id = 52; - this.Am_List.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("Am_List.ImageOptions.Image"))); - this.Am_List.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("Am_List.ImageOptions.LargeImage"))); - this.Am_List.Name = "Am_List"; - this.Am_List.Tag = "BIZ_EQUIP_AM_DEVICE"; - this.Am_List.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.Am_List_ItemClick); - // // barSubItem1 // this.barSubItem1.Caption = "基础字段配置"; @@ -552,7 +526,7 @@ namespace TsSFCDevice.Client.Launch 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_DEVICE"; + this.btn_treeView.Tag = "BIZ_EQUIP_65"; this.btn_treeView.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; this.btn_treeView.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_treeView_ItemClick); // @@ -572,12 +546,20 @@ namespace TsSFCDevice.Client.Launch this.btnPlanCheckJump.Tag = "BIZ_EQUIP_72"; this.btnPlanCheckJump.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnPlanCheckJump_ItemClick); // + // barButtonItem8 + // + this.barButtonItem8.Caption = "barButtonItem8"; + this.barButtonItem8.Id = 81; + this.barButtonItem8.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.Image"))); + this.barButtonItem8.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.LargeImage"))); + this.barButtonItem8.Name = "barButtonItem8"; + this.barButtonItem8.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem8_ItemClick_1); + // // page_Main // this.page_Main.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { this.pg_Main, - this.ribbonPageGroup1, - this.ribbonPageGroup9}); + this.ribbonPageGroup1}); this.page_Main.Name = "page_Main"; this.page_Main.Tag = "BIZ_EQUIP_PM"; this.page_Main.Text = "PM 保养管理"; @@ -596,18 +578,11 @@ namespace TsSFCDevice.Client.Launch this.ribbonPageGroup1.Name = "ribbonPageGroup1"; this.ribbonPageGroup1.Text = "保养数据"; // - // ribbonPageGroup9 - // - this.ribbonPageGroup9.ItemLinks.Add(this.btn_Maintenance); - this.ribbonPageGroup9.Name = "ribbonPageGroup9"; - this.ribbonPageGroup9.Text = "表单"; - // // ribbonPage1 // this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { this.ribbonPageGroup6, - this.ribbonPageGroup7, - this.ribbonPageGroup10}); + this.ribbonPageGroup7}); this.ribbonPage1.Name = "ribbonPage1"; this.ribbonPage1.Tag = "BIZ_EQUIP_AM"; this.ribbonPage1.Text = "AM 保养管理"; @@ -625,12 +600,6 @@ namespace TsSFCDevice.Client.Launch this.ribbonPageGroup7.Name = "ribbonPageGroup7"; this.ribbonPageGroup7.Text = "保养数据"; // - // ribbonPageGroup10 - // - this.ribbonPageGroup10.ItemLinks.Add(this.Am_List); - this.ribbonPageGroup10.Name = "ribbonPageGroup10"; - this.ribbonPageGroup10.Text = "表单"; - // // ribbonPage2 // this.ribbonPage2.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { @@ -761,15 +730,6 @@ namespace TsSFCDevice.Client.Launch this.ribbonPage7.Name = "ribbonPage7"; this.ribbonPage7.Text = "ribbonPage7"; // - // barButtonItem8 - // - this.barButtonItem8.Caption = "barButtonItem8"; - this.barButtonItem8.Id = 81; - this.barButtonItem8.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.Image"))); - this.barButtonItem8.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.LargeImage"))); - this.barButtonItem8.Name = "barButtonItem8"; - this.barButtonItem8.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem8_ItemClick_1); - // // frm_Launch // this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.True; @@ -803,7 +763,6 @@ namespace TsSFCDevice.Client.Launch private DevExpress.XtraBars.Ribbon.RibbonPage page_Main; private DevExpress.XtraBars.Ribbon.RibbonPageGroup pg_Main; private DevExpress.XtraBars.BarButtonItem btn_Import; - private DevExpress.XtraBars.BarButtonItem btn_Maintenance; private DevExpress.XtraBars.BarButtonItem btn_Report01; private DevExpress.XtraEditors.PanelControl pnl_Content; private DevExpress.XtraEditors.Repository.RepositoryItemHypertextLabel repositoryItemHypertextLabel1; @@ -826,13 +785,10 @@ namespace TsSFCDevice.Client.Launch private DevExpress.XtraBars.BarButtonItem Am_Form; private DevExpress.XtraBars.BarButtonItem Am_Record; private DevExpress.XtraBars.BarButtonItem barButtonItem6; - private DevExpress.XtraBars.BarButtonItem Am_List; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1; - private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9; private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup7; - private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup10; private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage2; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5; private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage3; diff --git a/TsSFCDevice.Client.Launch/frm_Launch.cs b/TsSFCDevice.Client.Launch/frm_Launch.cs index d36f057..c61246f 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.cs @@ -1043,7 +1043,7 @@ namespace TsSFCDevice.Client.Launch { try { - var resRtn = PlanRepository.Instance.Get_EquipmentPlanIsComplete("1206", 1); + var resRtn = PlanRepository.Instance.Get_EquipmentPlanIsComplete("198", 1); if (!resRtn.IsSuccess) { throw new Exception(resRtn.Message); diff --git a/TsSFCDevice.Client.Launch/frm_Launch.resx b/TsSFCDevice.Client.Launch/frm_Launch.resx index 814ed35..8362a3f 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.resx +++ b/TsSFCDevice.Client.Launch/frm_Launch.resx @@ -286,67 +286,6 @@ PHJlY3QgeD0iMTYiIHk9IjIiIHdpZHRoPSI2IiBoZWlnaHQ9IjI2IiByeD0iMCIgcnk9IjAiIGNsYXNz PSJCbHVlIiAvPg0KICAgIDxyZWN0IHg9IjI0IiB5PSI4IiB3aWR0aD0iNiIgaGVpZ2h0PSIyMCIgcng9 IjAiIHJ5PSIwIiBjbGFzcz0iUmVkIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAadEVYdFRpdGxlAFNwcmVhZHNoZWV0O01hbmFnZXI7 - PaUg6wAAApVJREFUOE+FkUlMU1EUhu/GxJ2ucOmCQSXGBUZ3uEFxiAtJBIIM1RZEpjqAMreUlCLQglAo - CBUiAgVBDKitdIJCCaQxAU1waVi4se8VEFDDq8nvve9JYzXEk3w5yT3n/85LHgHwD0+G5l3dg150PZuD - 6eksOvo8MPa60WZ24VG3E4Yuu2t3NxT6s3zLq/Rp76o3WlkLFxj7ZkibedrV0uOG4bETTZ0ONHbY6bIN - ulYrtC1vUK4bZ0Fo9BOshQv0XQ7SaLKzwZ5VUS8JKnQvWAsX1LVaCbvCSq2fRHXDBCofvhSvPtCOYetb - EMXqEXFeUjvMWrhA1TRBqmiA1fb3n9imARba3JbY2BJQWD4gzm9XDbEWLijVjpH7taNsgLuqYbpkQVHl - IArKBpBX2o+1rwJySvpgdb5Hflm/bTcXEtypthClZMb6poB1GmChwAZjR0SmNCOzqCeUYRDfo0vE13yB - LBrOq8rvaZCW24nUHBNSsjuQrGC046qcYURxfiVma87Ao47HK+VJdouQxaZEstB4VuU1pID31vyXjSUj - gus+jOeekATzugTVnD4ZDfERWNHGhvj4V2d86k1CcG0Ry8YkPJfHSoIV8xUIXxwUJwS/CwI3jSDnocxC - 4OcQDHgp8zS4IIbd2iSMKo5hKCNGEnzovIw1TyECMwUITOdT8sC7byHgvgneRXHmgHdkg3PIxQMjsiOU - o+hPjZIES20XxQDPAk5GNg0oKHJw9hvgpq6DeyujPQs7nycxTC+bEg9Bd+qARhS8az5H7Qq6LAc/JQX8 - UzJKFjhbFvy2DHDWdPgpP1YH0Z4Qgdrj+zV1pw9Kv/G1Mu73Z1EyGTGUaHqJkh4NS3qUxLVIWNIiUXh4 - n4ZC1HFMAPILigrawBkS4CoAAAAASUVORK5CYII= - - - - - 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 @@ -794,67 +733,6 @@ B8jHEiCTvVaGeNe2qDhaEubpAE1fgGGA8KnBEAfOll0cwjwdoNMN4MLCbvEHhtwOcGJ3wIXlXPkBhkFn wBZ7BlxYO6xswtDpK3BBGiUX92/qMA37H5Cc4jnWMCrSCKTmd65eYI4VYpvxrgP+hBXMl/T+hC7ASJOS RfCHo0IcWLkqDljDqJCZJilJS/KSpqSjW9yjH+N6biHxByDs0vUvRO1BAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAadEVYdFRpdGxlAFNwcmVhZHNoZWV0O01hbmFnZXI7 - PaUg6wAAApVJREFUOE+FkUlMU1EUhu/GxJ2ucOmCQSXGBUZ3uEFxiAtJBIIM1RZEpjqAMreUlCLQglAo - CBUiAgVBDKitdIJCCaQxAU1waVi4se8VEFDDq8nvve9JYzXEk3w5yT3n/85LHgHwD0+G5l3dg150PZuD - 6eksOvo8MPa60WZ24VG3E4Yuu2t3NxT6s3zLq/Rp76o3WlkLFxj7ZkibedrV0uOG4bETTZ0ONHbY6bIN - ulYrtC1vUK4bZ0Fo9BOshQv0XQ7SaLKzwZ5VUS8JKnQvWAsX1LVaCbvCSq2fRHXDBCofvhSvPtCOYetb - EMXqEXFeUjvMWrhA1TRBqmiA1fb3n9imARba3JbY2BJQWD4gzm9XDbEWLijVjpH7taNsgLuqYbpkQVHl - IArKBpBX2o+1rwJySvpgdb5Hflm/bTcXEtypthClZMb6poB1GmChwAZjR0SmNCOzqCeUYRDfo0vE13yB - LBrOq8rvaZCW24nUHBNSsjuQrGC046qcYURxfiVma87Ao47HK+VJdouQxaZEstB4VuU1pID31vyXjSUj - gus+jOeekATzugTVnD4ZDfERWNHGhvj4V2d86k1CcG0Ry8YkPJfHSoIV8xUIXxwUJwS/CwI3jSDnocxC - 4OcQDHgp8zS4IIbd2iSMKo5hKCNGEnzovIw1TyECMwUITOdT8sC7byHgvgneRXHmgHdkg3PIxQMjsiOU - o+hPjZIES20XxQDPAk5GNg0oKHJw9hvgpq6DeyujPQs7nycxTC+bEg9Bd+qARhS8az5H7Qq6LAc/JQX8 - UzJKFjhbFvy2DHDWdPgpP1YH0Z4Qgdrj+zV1pw9Kv/G1Mu73Z1EyGTGUaHqJkh4NS3qUxLVIWNIiUXh4 - n4ZC1HFMAPILigrawBkS4CoAAAAASUVORK5CYII= - - - - - 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 @@ -1239,76 +1117,76 @@ - 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 diff --git a/TsSFCDeviceSvc/MainService.asmx.cs b/TsSFCDeviceSvc/MainService.asmx.cs index 31851d7..d3c0e0d 100644 --- a/TsSFCDeviceSvc/MainService.asmx.cs +++ b/TsSFCDeviceSvc/MainService.asmx.cs @@ -554,12 +554,12 @@ namespace TsSFCDeviceSvc } /// - /// 获取计划任务进度 + /// 获取PM计划任务进度 /// /// /// /// - [WebMethod(Description = "获取计划任务进度")] + [WebMethod(Description = "获取PM计划任务进度")] [SoapHeader("auth")] public APIResponseData Get_PM_PLAN_ProgressInfo(string inParams, out byte[] btResults) { @@ -591,6 +591,44 @@ namespace TsSFCDeviceSvc } } + /// + /// 获取AM计划任务进度 + /// + /// + /// + /// + [WebMethod(Description = "获取AM计划任务进度")] + [SoapHeader("auth")] + public APIResponseData Get_AM_PLAN_ProgressInfo(string inParams, out byte[] btResults) + { + HttpAuthtication(); + btResults = new byte[] { }; + Dictionary Parameters = GetParameters(inParams); + DataSet dsResults = new DataSet("DataResults"); + try + { + #region 检查APP版本是否是最新版本，否则返回错误 + + AppVersionValid(Parameters); + + #endregion + + PlanDa rdPlan = new PlanDa(Parameters); + APIResponseData apiResponseData = rdPlan.Get_AM_PLAN_ProgressInfo(out dsResults); + if (apiResponseData.IsSuccess) + { + btResults = DataCompressHelper.AddDataSet(dsResults); + } + + return apiResponseData; + } + catch (Exception ex) + { + log.Error(ex); + return new APIResponseData { Code = -1, Message = ex.Message }; + } + } + [WebMethod(Description = "获取单计划数据")] [SoapHeader("auth")] public APIResponseData Get_PLAN_Single(string inParams, out byte[] btResults) diff --git a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user index 4cf42a4..b7985bd 100644 --- a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,36 +5,36 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Users\Clove\Desktop\WebSVC - True|2024-08-08T05:33:22.9996323Z||;True|2024-08-07T09:52:28.1648821+08:00||;True|2024-07-31T14:35:03.5193183+08:00||;True|2024-07-30T14:28:13.0791440+08:00||;True|2024-07-30T10:59:11.3180131+08:00||;True|2024-07-29T17:09:46.7471489+08:00||;True|2024-07-29T15:26:48.9648578+08:00||;True|2024-07-29T09:23:55.9996131+08:00||;True|2024-07-26T07:08:01.2867511+08:00||; + True|2024-08-13T07:32:51.3796384Z||;True|2024-08-08T13:33:22.9996323+08:00||;True|2024-08-07T09:52:28.1648821+08:00||;True|2024-07-31T14:35:03.5193183+08:00||;True|2024-07-30T14:28:13.0791440+08:00||;True|2024-07-30T10:59:11.3180131+08:00||;True|2024-07-29T17:09:46.7471489+08:00||;True|2024-07-29T15:26:48.9648578+08:00||;True|2024-07-29T09:23:55.9996131+08:00||;True|2024-07-26T07:08:01.2867511+08:00||; - 08/08/2024 13:33:21 + 08/13/2024 15:32:49 07/18/2024 13:30:47 - 08/08/2024 13:33:21 + 08/13/2024 15:32:49 - 08/07/2024 17:16:13 + 08/13/2024 15:32:49 05/30/2024 11:42:20 - 08/07/2024 17:16:13 + 08/13/2024 15:32:49 - 08/08/2024 13:33:20 + 08/13/2024 15:32:49 07/04/2024 09:35:30 - 08/08/2024 13:33:20 + 08/13/2024 15:32:49 06/12/2023 14:20:18 @@ -100,10 +100,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/28/2024 22:39:54 - 08/08/2024 13:33:21 + 08/13/2024 15:32:50 - 08/08/2024 13:33:21 + 08/13/2024 15:32:50 07/21/2024 00:35:30