From 33bad91e0e65daf6dad567ab776b2d4508c30ec1 Mon Sep 17 00:00:00 2001 From: clovejunti Date: Sun, 29 Sep 2024 22:22:39 +0800 Subject: [PATCH] 22 --- DeviceRepair.Api/DeviceRepair.Api.csproj.user | 2 +- DeviceRepair.DataAccess/Tag/TagDa.cs | 8 +- .../Pages/Maintain/pageMaintainEdit.cs | 4 +- .../Impl/MaintenanceRepository.cs | 8 +- TsSFCDevice.Client.Launch/App.config | 7 +- .../Device/pageDeviceTreeView.cs | 2 +- .../Device/pageDeviceView.cs | 4 +- .../Maintain/dlgAccessoriesEdit.Designer.cs | 34 +++--- .../Maintain/dlgAccessoriesEdit.resx | 4 +- .../Maintain/dlgAccessoriesLst.cs | 29 ++--- .../Maintain/pageDeviceMaintenanceFormView.cs | 3 +- .../Maintain/pageMaintainEdit.cs | 4 +- .../Maintain/pageMaintainView.cs | 6 +- .../Plan/pageDevicePlanView.Designer.cs | 25 ++--- .../Plan/pageDevicePlanView.resx | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Tag/TagFormView.Designer.cs | 20 ++-- TsSFCDevice.Client.Launch/Tag/TagFormView.cs | 64 +++++++++-- .../Tag/TagFormView.resx | 100 +++++++++--------- .../TsSFCDevice.Client.Launch.csproj | 8 +- .../frm_Launch.Designer.cs | 22 ++-- TsSFCDevice.Client.Launch/frm_Launch.cs | 2 + TsSFCDevice.Client.Launch/frm_Launch.resx | 2 +- TsSFCDevice.Client.Launch/packages.config | 4 +- TsSFCDeviceSvc/MainService.asmx.cs | 21 ++++ .../PublishProfiles/FolderProfile.pubxml | 18 ---- .../Properties/PublishProfiles/default.pubxml | 17 +++ ...rofile.pubxml.user => default.pubxml.user} | 47 ++------ TsSFCDeviceSvc/TsSFCDeviceSvc.csproj | 5 +- TsSFCDeviceSvc/TsSFCDeviceSvc.csproj.user | 4 +- TsSFCDeviceSvc/Web.config | 1 + 31 files changed, 269 insertions(+), 212 deletions(-) delete mode 100644 TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml create mode 100644 TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml rename TsSFCDeviceSvc/Properties/PublishProfiles/{FolderProfile.pubxml.user => default.pubxml.user} (61%) diff --git a/DeviceRepair.Api/DeviceRepair.Api.csproj.user b/DeviceRepair.Api/DeviceRepair.Api.csproj.user index 47bebce..03fd8b3 100644 --- a/DeviceRepair.Api/DeviceRepair.Api.csproj.user +++ b/DeviceRepair.Api/DeviceRepair.Api.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true diff --git a/DeviceRepair.DataAccess/Tag/TagDa.cs b/DeviceRepair.DataAccess/Tag/TagDa.cs index 0d7b8f9..ed5c9fb 100644 --- a/DeviceRepair.DataAccess/Tag/TagDa.cs +++ b/DeviceRepair.DataAccess/Tag/TagDa.cs @@ -27,7 +27,7 @@ namespace DeviceRepair.DataAccess.Tag try { DateTime sDate = DateTime.Today.AddMonths(-1); - if (!ApiParameters.ContainsKey("sDate")) + if (ApiParameters.ContainsKey("sDate")) { sDate = base.GetParamDateTime("sDate", "开始时间"); if (sDate < new DateTime(1900, 01, 01)) @@ -37,7 +37,7 @@ namespace DeviceRepair.DataAccess.Tag } DateTime eDate = DateTime.Today.AddDays(1).AddMilliseconds(-1); - if (!ApiParameters.ContainsKey("eDate")) + if (ApiParameters.ContainsKey("eDate")) { eDate = base.GetParamDateTime("eDate", "结束时间"); if (eDate.Date > DateTime.Today) @@ -47,13 +47,13 @@ namespace DeviceRepair.DataAccess.Tag } string EquipmentDisPlayID = string.Empty; - if (!ApiParameters.ContainsKey("EquipmentDisPlayID")) + if (ApiParameters.ContainsKey("EquipmentDisPlayID")) { EquipmentDisPlayID = base.GetParamString("EquipmentDisPlayID", "设备编号"); } string TagFormStatus = string.Empty; - if (!ApiParameters.ContainsKey("TagFormStatus")) + if (ApiParameters.ContainsKey("TagFormStatus")) { TagFormStatus = base.GetParamString("TagFormStatus", "表单状态"); } diff --git a/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs b/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs index c52cafd..9eeb88d 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs +++ b/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs @@ -182,7 +182,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain List SelectionDatas = apiResponseData.ToDeserializeObject>(); - ddlSymptomlDistinction.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode == "SymptomlDistinction" && x.Status).ToList(); + ddlSymptomlDistinction.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode.Equals("SymptomlDistinction", StringComparison.CurrentCultureIgnoreCase) && x.Status).ToList(); ddlSymptomlDistinction.Properties.DisplayMember = "FieldText"; ddlSymptomlDistinction.Properties.ValueMember = "AutoID"; ddlSymptomlDistinction.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; @@ -191,7 +191,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain ddlSymptomlDistinction.EditValue = (ddlSymptomlDistinction.Properties.DataSource as List)[0].AutoID; } - ddlMaintenance.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode == "Maintenance" && x.Status).ToList(); + ddlMaintenance.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode.Equals("Maintenance", StringComparison.CurrentCultureIgnoreCase) && x.Status).ToList(); ddlMaintenance.Properties.DisplayMember = "FieldText"; ddlMaintenance.Properties.ValueMember = "AutoID"; ddlMaintenance.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; diff --git a/TsSFCDevice.Client.Biz/Impl/MaintenanceRepository.cs b/TsSFCDevice.Client.Biz/Impl/MaintenanceRepository.cs index d70e120..80f63bd 100644 --- a/TsSFCDevice.Client.Biz/Impl/MaintenanceRepository.cs +++ b/TsSFCDevice.Client.Biz/Impl/MaintenanceRepository.cs @@ -84,12 +84,12 @@ namespace TsSFCDevice.Client.Biz.Impl ApiParameters.Add("DownStatus", ((int)filter.DownStatus) + ""); if (filter.StartTime.HasValue) { - ApiParameters.Add("StartTime", filter.StartTime.Value.ToString("yyyy-MM-dd hh:mm:ss")); + ApiParameters.Add("StartTime", filter.StartTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); } if (filter.EndTime.HasValue) { - ApiParameters.Add("EndTime", filter.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss")); + ApiParameters.Add("EndTime", filter.EndTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); } var Rtn = Utility.SfcBizService.CurrentSvc.GetDatas(DeviceSvc.SysModelType.Maintenance, GetParameters(), out btResults); @@ -276,12 +276,12 @@ namespace TsSFCDevice.Client.Biz.Impl if (filter.StartTime.HasValue) { - ApiParameters.Add("StartTime", filter.StartTime.Value.ToString("yyyy-MM-dd hh:mm:ss")); + ApiParameters.Add("StartTime", filter.StartTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); } if (filter.EndTime.HasValue) { - ApiParameters.Add("EndTime", filter.EndTime.Value.ToString("yyyy-MM-dd hh:mm:ss")); + ApiParameters.Add("EndTime", filter.EndTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); } var Rtn = Utility.SfcBizService.CurrentSvc.Get_Maintenance_Xlsx_Datas(GetParameters(), out btResults); if (Rtn.Code != 1) diff --git a/TsSFCDevice.Client.Launch/App.config b/TsSFCDevice.Client.Launch/App.config index b1b83d2..c3175dc 100644 --- a/TsSFCDevice.Client.Launch/App.config +++ b/TsSFCDevice.Client.Launch/App.config @@ -4,9 +4,10 @@ - - - + + + diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs index 2b8b4f1..88df364 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs @@ -215,7 +215,7 @@ namespace TsSFCDevice.Client.Launch.Device OperatingParameters = m_CurrentModel.OperatingParameters, OwningUnit = m_CurrentModel.OwningUnit, Remarks = m_CurrentModel.Remarks, - Route = m_CurrentModel.RoutePkID, + Route = Utility.SystemRuntimeInfo.CurrentDeviceCaches.FirstOrDefault(x => x.AutoID == m_CurrentModel.AutoID)?.Route ?? 0, Weight = m_CurrentModel.Weight, SerialNumber = m_CurrentModel.SerialNumber, Specification = m_CurrentModel.Specification, diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs index 8ff4d68..44a75f3 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceView.cs @@ -302,7 +302,7 @@ namespace TsSFCDevice.Client.Launch.Device { DevExpress.XtraPrinting.XlsxExportOptionsEx options = new DevExpress.XtraPrinting.XlsxExportOptionsEx(); options.ExportType = DevExpress.Export.ExportType.WYSIWYG; - + gridView1.OptionsPrint.AutoWidth = false; gridControl1.ExportToXlsx(saveFileDialog.FileName, options); XtraMessageBoxHelper.Info("导出成功！", "提示"); } @@ -372,6 +372,8 @@ namespace TsSFCDevice.Client.Launch.Device if (item.MaintenanceAMFormVersion > 0 && checkFormkeyValuePairs.ContainsKey(item.MaintenanceAMFormVersion)) { item.MaintenanceAMFormVersionName = checkFormkeyValuePairs[item.MaintenanceAMFormVersion].FormName; + item.AMVersionCode = checkFormkeyValuePairs[item.MaintenanceAMFormVersion].VersionCode; + item.AMVersionRev = checkFormkeyValuePairs[item.MaintenanceAMFormVersion].VersionRev; } ViewDatas.Add(item); diff --git a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.Designer.cs b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.Designer.cs index d64c663..b01f04b 100644 --- a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.Designer.cs +++ b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.Designer.cs @@ -164,9 +164,9 @@ namespace TsSFCDevice.Client.Launch.Maintain // this.barDockControlTop.CausesValidation = false; this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; - this.barDockControlTop.Location = new System.Drawing.Point(0, 31); + this.barDockControlTop.Location = new System.Drawing.Point(0, 39); this.barDockControlTop.Manager = this.barManager1; - this.barDockControlTop.Size = new System.Drawing.Size(907, 26); + this.barDockControlTop.Size = new System.Drawing.Size(907, 33); // // barDockControlBottom // @@ -180,24 +180,24 @@ namespace TsSFCDevice.Client.Launch.Maintain // this.barDockControlLeft.CausesValidation = false; this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; - this.barDockControlLeft.Location = new System.Drawing.Point(0, 57); + this.barDockControlLeft.Location = new System.Drawing.Point(0, 72); this.barDockControlLeft.Manager = this.barManager1; - this.barDockControlLeft.Size = new System.Drawing.Size(0, 381); + this.barDockControlLeft.Size = new System.Drawing.Size(0, 366); // // barDockControlRight // this.barDockControlRight.CausesValidation = false; this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(907, 57); + this.barDockControlRight.Location = new System.Drawing.Point(907, 72); this.barDockControlRight.Manager = this.barManager1; - this.barDockControlRight.Size = new System.Drawing.Size(0, 381); + this.barDockControlRight.Size = new System.Drawing.Size(0, 366); // // toolbarFormControl1 // this.toolbarFormControl1.Location = new System.Drawing.Point(0, 0); this.toolbarFormControl1.Manager = this.toolbarFormManager1; this.toolbarFormControl1.Name = "toolbarFormControl1"; - this.toolbarFormControl1.Size = new System.Drawing.Size(907, 31); + this.toolbarFormControl1.Size = new System.Drawing.Size(907, 39); this.toolbarFormControl1.TabIndex = 4; this.toolbarFormControl1.TabStop = false; this.toolbarFormControl1.TitleItemLinks.Add(this.btn_SaveAccessories); @@ -218,7 +218,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // this.barDockControl1.CausesValidation = false; this.barDockControl1.Dock = System.Windows.Forms.DockStyle.Top; - this.barDockControl1.Location = new System.Drawing.Point(0, 31); + this.barDockControl1.Location = new System.Drawing.Point(0, 39); this.barDockControl1.Manager = this.toolbarFormManager1; this.barDockControl1.Size = new System.Drawing.Size(907, 0); // @@ -234,17 +234,17 @@ namespace TsSFCDevice.Client.Launch.Maintain // this.barDockControl3.CausesValidation = false; this.barDockControl3.Dock = System.Windows.Forms.DockStyle.Left; - this.barDockControl3.Location = new System.Drawing.Point(0, 31); + this.barDockControl3.Location = new System.Drawing.Point(0, 39); this.barDockControl3.Manager = this.toolbarFormManager1; - this.barDockControl3.Size = new System.Drawing.Size(0, 407); + this.barDockControl3.Size = new System.Drawing.Size(0, 399); // // barDockControl4 // this.barDockControl4.CausesValidation = false; this.barDockControl4.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControl4.Location = new System.Drawing.Point(907, 31); + this.barDockControl4.Location = new System.Drawing.Point(907, 39); this.barDockControl4.Manager = this.toolbarFormManager1; - this.barDockControl4.Size = new System.Drawing.Size(0, 407); + this.barDockControl4.Size = new System.Drawing.Size(0, 399); // // btn_SaveAccessories // @@ -268,10 +268,10 @@ namespace TsSFCDevice.Client.Launch.Maintain // this.layoutControl1.Controls.Add(this.gridControl1); this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.Location = new System.Drawing.Point(0, 57); + this.layoutControl1.Location = new System.Drawing.Point(0, 72); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(907, 381); + this.layoutControl1.Size = new System.Drawing.Size(907, 366); this.layoutControl1.TabIndex = 5; this.layoutControl1.Text = "layoutControl1"; // @@ -281,7 +281,7 @@ namespace TsSFCDevice.Client.Launch.Maintain this.gridControl1.MainView = this.gridView1; this.gridControl1.MenuManager = this.barManager1; this.gridControl1.Name = "gridControl1"; - this.gridControl1.Size = new System.Drawing.Size(883, 357); + this.gridControl1.Size = new System.Drawing.Size(883, 342); this.gridControl1.TabIndex = 4; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -358,7 +358,7 @@ namespace TsSFCDevice.Client.Launch.Maintain rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1}); - this.Root.Size = new System.Drawing.Size(907, 381); + this.Root.Size = new System.Drawing.Size(907, 366); this.Root.TextVisible = false; // // layoutControlItem1 @@ -366,7 +366,7 @@ namespace TsSFCDevice.Client.Launch.Maintain this.layoutControlItem1.Control = this.gridControl1; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(887, 361); + this.layoutControlItem1.Size = new System.Drawing.Size(887, 346); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // diff --git a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx index 3d9ce75..bbbee2c 100644 --- a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx +++ b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 205, 17 + 245, 17 @@ -302,7 +302,7 @@ - 336, 17 + 401, 17 diff --git a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesLst.cs b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesLst.cs index e42f793..28fb348 100644 --- a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesLst.cs +++ b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesLst.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Windows.Forms; using TsSFCDevice.Client.Biz.Base.Utils; using TsSFCDevice.Client.Biz.Impl; +using TsSFCDevice.Client.Launch.CustomField; namespace TsSFCDevice.Client.Launch.Maintain { @@ -251,21 +252,21 @@ namespace TsSFCDevice.Client.Launch.Maintain { throw new Exception($"当前账号缺少此操作的权限"); } - //pageFieldEdit view = new pageFieldEdit("Accessories"); + pageFieldEdit view = new pageFieldEdit("Accessories"); - //DialogResult Dr = view.ShowDialog(this); - //if (Dr == DialogResult.OK) - //{ - // InitializeGridDatas(); - //} - //else if (Dr == DialogResult.Abort) - //{ - // throw new Exception(view.ErrorMsg); - //} - //else - //{ - // InitializeGridDatas(); - //} + DialogResult Dr = view.ShowDialog(this); + if (Dr == DialogResult.OK) + { + InitializeGridDatas(); + } + else if (Dr == DialogResult.Abort) + { + throw new Exception(view.ErrorMsg); + } + else + { + InitializeGridDatas(); + } } catch (Exception ex) { diff --git a/TsSFCDevice.Client.Launch/Maintain/pageDeviceMaintenanceFormView.cs b/TsSFCDevice.Client.Launch/Maintain/pageDeviceMaintenanceFormView.cs index 7e10c6e..cebbd70 100644 --- a/TsSFCDevice.Client.Launch/Maintain/pageDeviceMaintenanceFormView.cs +++ b/TsSFCDevice.Client.Launch/Maintain/pageDeviceMaintenanceFormView.cs @@ -222,8 +222,7 @@ namespace TsSFCDevice.Client.Launch.Maintain } gridControl1.BeginUpdate(); - gridControl1.DataSource = null; - gridControl1.DataSource = table; + gridControl1.DataSource = (table.Rows?.Count ?? 0) == 0 ? null : table; if (table != null && table.Rows.Count > 0) { diff --git a/TsSFCDevice.Client.Launch/Maintain/pageMaintainEdit.cs b/TsSFCDevice.Client.Launch/Maintain/pageMaintainEdit.cs index 2a69d98..06b2238 100644 --- a/TsSFCDevice.Client.Launch/Maintain/pageMaintainEdit.cs +++ b/TsSFCDevice.Client.Launch/Maintain/pageMaintainEdit.cs @@ -179,7 +179,7 @@ namespace TsSFCDevice.Client.Launch.Maintain IList SelectionDatas = CustomFieldRepository.Instance.GetDatas(("SymptomlDistinction,Maintenance").Split(',')); - ddlSymptomlDistinction.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode == "SymptomlDistinction" && x.Status).ToList(); + ddlSymptomlDistinction.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode.Equals("SymptomlDistinction", StringComparison.CurrentCultureIgnoreCase) && x.Status).ToList(); ddlSymptomlDistinction.Properties.DisplayMember = "FieldText"; ddlSymptomlDistinction.Properties.ValueMember = "AutoID"; ddlSymptomlDistinction.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; @@ -188,7 +188,7 @@ namespace TsSFCDevice.Client.Launch.Maintain ddlSymptomlDistinction.EditValue = (ddlSymptomlDistinction.Properties.DataSource as List)[0].AutoID; } - ddlMaintenance.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode == "Maintenance" && x.Status).ToList(); + ddlMaintenance.Properties.DataSource = SelectionDatas.Where(x => x.FieldCode.Equals("Maintenance", StringComparison.CurrentCultureIgnoreCase) && x.Status).ToList(); ddlMaintenance.Properties.DisplayMember = "FieldText"; ddlMaintenance.Properties.ValueMember = "AutoID"; ddlMaintenance.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; diff --git a/TsSFCDevice.Client.Launch/Maintain/pageMaintainView.cs b/TsSFCDevice.Client.Launch/Maintain/pageMaintainView.cs index 2777658..6cf3133 100644 --- a/TsSFCDevice.Client.Launch/Maintain/pageMaintainView.cs +++ b/TsSFCDevice.Client.Launch/Maintain/pageMaintainView.cs @@ -836,8 +836,7 @@ namespace TsSFCDevice.Client.Launch.Maintain IList views = MaintenanceRepository.Instance.Get_Maintenance_Xlsx_Datas(FilterInfo); ;// MaintenanceManager.Instance.GetXlsxData(FilterInfo); if (views == null || views.Count == 0) { - XtraMessageBoxHelper.Warn("没有查询到数据!"); - return; + throw new Exception("没有查询到数据!"); } DataTable dataTable = views?.ToList()?.ToDataTable(); @@ -864,7 +863,7 @@ namespace TsSFCDevice.Client.Launch.Maintain { Filter = "xlsx file（*.xlsx）|*.xlsx" }; - SelectPath: + SelectPath: if (xofd.ShowDialog(this) == DialogResult.OK) { if (File.Exists(xofd.FileName)) @@ -878,6 +877,7 @@ namespace TsSFCDevice.Client.Launch.Maintain Common.dlgProgressBar view = new Common.dlgProgressBar(btRtn, xofd.FileName); view.ShowDialog(this); + splashScreenManager1.TryCloseWait(); XtraMessageBoxHelper.Info("操作成功！"); } } diff --git a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs index ce08e9e..e644d7a 100644 --- a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.Designer.cs @@ -127,7 +127,7 @@ this.ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide; this.ribbon.ShowQatLocationSelector = false; this.ribbon.ShowToolbarCustomizeItem = false; - this.ribbon.Size = new System.Drawing.Size(1331, 133); + this.ribbon.Size = new System.Drawing.Size(1331, 164); this.ribbon.StatusBar = this.ribbonStatusBar; this.ribbon.Toolbar.ShowCustomizeItem = false; this.ribbon.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; @@ -361,11 +361,11 @@ // ribbonStatusBar // this.ribbonStatusBar.ItemLinks.Add(this.barScheduler); - this.ribbonStatusBar.Location = new System.Drawing.Point(0, 743); + this.ribbonStatusBar.Location = new System.Drawing.Point(0, 737); this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(4); this.ribbonStatusBar.Name = "ribbonStatusBar"; this.ribbonStatusBar.Ribbon = this.ribbon; - this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 24); + this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 30); // // gridControl // @@ -374,7 +374,7 @@ this.gridControl.MainView = this.gridView1; this.gridControl.MinimumSize = new System.Drawing.Size(3300, 0); this.gridControl.Name = "gridControl"; - this.gridControl.Size = new System.Drawing.Size(3300, 569); + this.gridControl.Size = new System.Drawing.Size(3300, 528); this.gridControl.TabIndex = 2; this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -690,10 +690,10 @@ // this.layoutControl1.Controls.Add(this.gridControl); this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.Location = new System.Drawing.Point(0, 133); + this.layoutControl1.Location = new System.Drawing.Point(0, 164); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1331, 610); + this.layoutControl1.Size = new System.Drawing.Size(1331, 573); this.layoutControl1.TabIndex = 5; this.layoutControl1.Text = "layoutControl1"; // @@ -704,7 +704,7 @@ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1}); this.Root.Name = "Root"; - this.Root.Size = new System.Drawing.Size(3324, 593); + this.Root.Size = new System.Drawing.Size(3324, 552); this.Root.TextVisible = false; // // layoutControlItem1 @@ -712,22 +712,23 @@ this.layoutControlItem1.Control = this.gridControl; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(3304, 573); + this.layoutControlItem1.Size = new System.Drawing.Size(3304, 532); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // // contextMenuStrip1 // this.contextMenuStrip1.Font = new System.Drawing.Font("Tahoma", 12F); + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.查看设备保养详情ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(207, 50); + this.contextMenuStrip1.Size = new System.Drawing.Size(241, 32); // // 查看设备保养详情ToolStripMenuItem // this.查看设备保养详情ToolStripMenuItem.Name = "查看设备保养详情ToolStripMenuItem"; - this.查看设备保养详情ToolStripMenuItem.Size = new System.Drawing.Size(206, 24); + this.查看设备保养详情ToolStripMenuItem.Size = new System.Drawing.Size(240, 28); this.查看设备保养详情ToolStripMenuItem.Text = "查看设备保养详情"; this.查看设备保养详情ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); // @@ -738,7 +739,7 @@ // pageDevicePlanView // this.Appearance.Options.UseFont = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1331, 767); this.Controls.Add(this.layoutControl1); @@ -751,7 +752,7 @@ this.Ribbon = this.ribbon; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StatusBar = this.ribbonStatusBar; - this.Text = "设备的PM维护计划"; + this.Text = "设备的PM保养计划"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.pageDevicePlanView_Load); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit(); diff --git a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx index 1b16a30..8c6d11b 100644 --- a/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx +++ b/TsSFCDevice.Client.Launch/Plan/pageDevicePlanView.resx @@ -440,7 +440,7 @@ - 205, 17 + 245, 17 diff --git a/TsSFCDevice.Client.Launch/Properties/AssemblyInfo.cs b/TsSFCDevice.Client.Launch/Properties/AssemblyInfo.cs index 34d82cc..1a37a4d 100644 --- a/TsSFCDevice.Client.Launch/Properties/AssemblyInfo.cs +++ b/TsSFCDevice.Client.Launch/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.0.3")] -[assembly: AssemblyFileVersion("5.0.0.3")] +[assembly: AssemblyVersion("5.0.0.5")] +[assembly: AssemblyFileVersion("5.0.0.5")] diff --git a/TsSFCDevice.Client.Launch/Tag/TagFormView.Designer.cs b/TsSFCDevice.Client.Launch/Tag/TagFormView.Designer.cs index 8357c33..5a812f3 100644 --- a/TsSFCDevice.Client.Launch/Tag/TagFormView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Tag/TagFormView.Designer.cs @@ -82,7 +82,7 @@ this.gcReceiptDetailsOfIssue = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.xueTagForm1 = new xueTagForm(); + this.xueTagForm1 = new TsSFCDevice.Client.Launch.Tag.xueTagForm(); this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components); this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit(); @@ -205,7 +205,7 @@ this.btnEdit, this.btnCreat}); this.ribbonControl1.Location = new System.Drawing.Point(0, 0); - this.ribbonControl1.MaxItemId = 16; + this.ribbonControl1.MaxItemId = 17; this.ribbonControl1.Name = "ribbonControl1"; this.ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { this.ribbonPage1}); @@ -219,7 +219,7 @@ this.ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide; this.ribbonControl1.ShowQatLocationSelector = false; this.ribbonControl1.ShowToolbarCustomizeItem = false; - this.ribbonControl1.Size = new System.Drawing.Size(1331, 133); + this.ribbonControl1.Size = new System.Drawing.Size(1331, 164); this.ribbonControl1.StatusBar = this.ribbonStatusBar1; this.ribbonControl1.Toolbar.ShowCustomizeItem = false; this.ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; @@ -442,7 +442,7 @@ this.btnMainte.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnMainte.ImageOptions.Image"))); this.btnMainte.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnMainte.ImageOptions.LargeImage"))); this.btnMainte.Name = "btnMainte"; - this.btnMainte.Tag = "BIZ_EQUIP_TAG_04"; + this.btnMainte.Tag = "BIZ_EQUIP_63"; this.btnMainte.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnMainte_ItemClick); // // btnExportPdf @@ -540,10 +540,10 @@ // // ribbonStatusBar1 // - this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 743); + this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 737); this.ribbonStatusBar1.Name = "ribbonStatusBar1"; this.ribbonStatusBar1.Ribbon = this.ribbonControl1; - this.ribbonStatusBar1.Size = new System.Drawing.Size(1331, 24); + this.ribbonStatusBar1.Size = new System.Drawing.Size(1331, 30); // // ribbonPage2 // @@ -554,7 +554,7 @@ // this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainerControl1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; - this.splitContainerControl1.Location = new System.Drawing.Point(0, 133); + this.splitContainerControl1.Location = new System.Drawing.Point(0, 164); this.splitContainerControl1.Name = "splitContainerControl1"; // // splitContainerControl1.Panel1 @@ -566,7 +566,7 @@ // this.splitContainerControl1.Panel2.Controls.Add(this.xueTagForm1); this.splitContainerControl1.Panel2.Text = "Panel2"; - this.splitContainerControl1.Size = new System.Drawing.Size(1331, 610); + this.splitContainerControl1.Size = new System.Drawing.Size(1331, 573); this.splitContainerControl1.SplitterPosition = 455; this.splitContainerControl1.TabIndex = 10; // @@ -577,7 +577,7 @@ this.gridControl1.MainView = this.gridView1; this.gridControl1.MenuManager = this.barManager1; this.gridControl1.Name = "gridControl1"; - this.gridControl1.Size = new System.Drawing.Size(866, 610); + this.gridControl1.Size = new System.Drawing.Size(864, 573); this.gridControl1.TabIndex = 0; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -736,7 +736,7 @@ this.xueTagForm1.Margin = new System.Windows.Forms.Padding(4); this.xueTagForm1.Name = "xueTagForm1"; this.xueTagForm1.Padding = new System.Windows.Forms.Padding(19); - this.xueTagForm1.Size = new System.Drawing.Size(455, 610); + this.xueTagForm1.Size = new System.Drawing.Size(455, 573); this.xueTagForm1.TabIndex = 0; this.xueTagForm1.Visible = false; // diff --git a/TsSFCDevice.Client.Launch/Tag/TagFormView.cs b/TsSFCDevice.Client.Launch/Tag/TagFormView.cs index d55f9a2..861c13d 100644 --- a/TsSFCDevice.Client.Launch/Tag/TagFormView.cs +++ b/TsSFCDevice.Client.Launch/Tag/TagFormView.cs @@ -214,7 +214,7 @@ namespace TsSFCDevice.Client.Launch.Tag if (status == "N") { btnMainte.Enabled = true; - btnExportXlsx.Enabled = false; + //btnExportXlsx.Enabled = false; btnExportPdf.Enabled = false; btnPrint.Enabled = false; btnEdit.Enabled = true; @@ -222,7 +222,7 @@ namespace TsSFCDevice.Client.Launch.Tag else if (status == "C") { btnMainte.Enabled = false; - btnExportXlsx.Enabled = true; + //btnExportXlsx.Enabled = true; btnExportPdf.Enabled = true; btnPrint.Enabled = true; btnEdit.Enabled = false; @@ -275,7 +275,7 @@ namespace TsSFCDevice.Client.Launch.Tag using (Common.pageSignature view = new Common.pageSignature()) { - view.AuthString = "BIZ_EQUIP_TAG_04"; + view.AuthString = OperationAuthConstValue.Device_TAG_Receipt; view.ConfirmContent = $"Tag表单接收确认"; view.ConfirmModel = UserConfirmModel.TagReceipt; view.CanNa = false; @@ -295,7 +295,7 @@ namespace TsSFCDevice.Client.Launch.Tag m_CurrentObject.TagFormStatus = Rtn.TagFormStatus; btnMainte.Enabled = false; - btnExportXlsx.Enabled = true; + //btnExportXlsx.Enabled = true; btnExportPdf.Enabled = true; btnPrint.Enabled = true; @@ -566,7 +566,7 @@ namespace TsSFCDevice.Client.Launch.Tag { splashScreenManager1.ShowWaitForm(); TagRecordInfo tagRecord; - APIResponseData apiResponseData = TagRepository.Instance.Edit(m_CurrentObject, out tagRecord); + APIResponseData apiResponseData = TagRepository.Instance.Edit(tag, out tagRecord); if (!apiResponseData.IsSuccess) throw new Exception(apiResponseData.Message); @@ -723,6 +723,8 @@ namespace TsSFCDevice.Client.Launch.Tag int _colIndex = 0; int ColLastIndex = 0; + bool creatItemsHead = false; + int ItemsIndex = 0; for (int i = 0; i < properties.Length; i++) { DisplayNameAttribute[] attrs = @@ -733,8 +735,25 @@ namespace TsSFCDevice.Client.Launch.Tag continue; } - ICell cell = headerRow.CreateCell(_colIndex); - cell.SetCellValue(attrs[0].DisplayName); + if (properties[i].PropertyType == typeof(bool)) + { + if (creatItemsHead) + { + continue; + } + else + { + ICell cell = headerRow.CreateCell(_colIndex); + cell.SetCellValue("Checked Items"); + ItemsIndex = _colIndex; + creatItemsHead = true; + } + } + else + { + ICell cell = headerRow.CreateCell(_colIndex); + cell.SetCellValue(attrs[0].DisplayName); + } ICellStyle styleContent = workbook.CreateCellStyle(); styleContent.CloneStyleFrom(headStyle); @@ -753,6 +772,7 @@ namespace TsSFCDevice.Client.Launch.Tag { IRow dataRow = sheet.CreateRow(rowIndex + 1); _colIndex = 0; + var itemValue = ""; for (int i = 0; i < properties.Length; i++) { @@ -764,6 +784,36 @@ namespace TsSFCDevice.Client.Launch.Tag continue; } + if (properties[i].PropertyType == typeof(bool)) + { + bool bCheck = ((bool)properties[i].GetValue(Datas[rowIndex])); + if (bCheck) + itemValue += attrs[0].DisplayName + ";"; + continue; + } + if (_colIndex == ItemsIndex) + { + ICell cell2 = dataRow.CreateCell(_colIndex); + object value2 = properties[i].GetValue(Datas[rowIndex]); + + cell2.SetCellValue(itemValue + ""); + + ICellStyle styleContent2 = workbook.CreateCellStyle(); + styleContent2.CloneStyleFrom(contentStyle); + dataRow.GetCell(_colIndex).CellStyle = styleContent2; + + // 第一列 + if (_colIndex == 0) + dataRow.GetCell(_colIndex).CellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Medium; + else if (_colIndex == ColLastIndex) + { + // 最后一列 + dataRow.GetCell(_colIndex).CellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Medium; + } + + _colIndex++; + } + ICell cell = dataRow.CreateCell(_colIndex); object value = properties[i].GetValue(Datas[rowIndex]); diff --git a/TsSFCDevice.Client.Launch/Tag/TagFormView.resx b/TsSFCDevice.Client.Launch/Tag/TagFormView.resx index 03310d1..f8e8e61 100644 --- a/TsSFCDevice.Client.Launch/Tag/TagFormView.resx +++ b/TsSFCDevice.Client.Launch/Tag/TagFormView.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 205, 17 + 245, 17 @@ -470,61 +470,61 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAqdEVYdFRpdGxlAEZvb3RlcjtBZGQgR3JvdXAgRm9vdGVyO0Zvb3RlcjtHcm91cJUbm8kAAAKa - SURBVDhPbZJpTxNRFIYre9T/YSAIMSiK/AE/aOInNTEakUhkhxCLLC2KNYS9bLU4LSUsCpRKhIhbSCWI - C2ChFWOA6AeN0QgButr99ZxpUQjc5Jlz58yc59w7cyU0IoTBeaNGvwCRoQUIzOA87hOdzABjgpqiqnf2 - FdVEApAwPCIbu2ZoHhrBLeiyF3XCe66Kolf+CzjJD3tHP6FndBHdjxehG/kIrcECjcEMgVbWrHsnvlOj - fstV0dsFUTXqN+JD5x8/nC4fRR8cLj8cHMV5iEAgCIVqmqtidgg4GSSD9pEZmmHaP3XsHOL9m3CP9q56 - aEKtMA0/CW63Te0SRHOS7TaHDzanF9Z/+GClnNXhxSbh8wchb57kqtgdArlyUrSrw906HpjQ3v8BbX1E - 7xxae+ZwVzUFry+AikbjLkEMJ9m+bvdiw8Z4sE5x/V/00uq8CNA2bXYPV8XtENysmxDt2zu2EMruWTQz - uhn8WnVAGCtAqTodN9pPGqWqNIm0I00UxEprXsJDglWrG2vMplucr1LcoFV5vAGxe0n7CXz+LaC49TiM - X4slRcrUkKBE8QJuTwDykS8hDFus4CdJWoayUdB0DPlNqRhfykRew1Hk1hO1KRMsiCusfgaXxw/Z8DJk - +hVU6pfDLMFG5yCnPkXsrLecxaDlDAbMp9G/cApZiiPiR4jLrxqH0+1HkW4RhV2E1owCrQV5GjO+r7nQ - 0JeDzDvJuFqdDO1sOjJuJSGjKglX5IefioJc2RPYqZOdThtjo/+/hdPtE38xn9TLskS0TifgUmUilK8P - SS6WJ3C9JCZLapjIrhjD9fIwZaMhysOxbAzffmxCIVzDhdJ4nJMmPD8vjZcwPPaxhNhPHNiDg9vg+1gi - InQOIPkL2iOqeEQYttMAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACp0RVh0VGl0 + bGUARm9vdGVyO0FkZCBHcm91cCBGb290ZXI7Rm9vdGVyO0dyb3VwlRubyQAAAppJREFUOE9tkmlPE1EU + hit71P9hIAgxKIr8AT9o4ic1MRqRSGSHEIssLYo1hL1stTgtJSwKlEqEiFtIJYgLYKEVY4DoB43RCAG6 + 2v31nGlRCNzkmXPnzJzn3DtzJTQihMF5o0a/AJGhBQjM4DzuE53MAGOCmqKqd/YV1UQCkDA8Ihu7Zmge + GsEt6LIXdcJ7roqiV/4LOMkPe0c/oWd0Ed2PF6Eb+QitwQKNwQyBVtaseye+U6N+y1XR2wVRNeo34kPn + Hz+cLh9FHxwuPxwcxXmIQCAIhWqaq2J2CDgZJIP2kRmaYdo/dewc4v2bcI/2rnpoQq0wDT8JbrdN7RJE + c5LtNocPNqcX1n/4YKWc1eHFJuHzByFvnuSq2B0CuXJStKvD3ToemNDe/wFtfUTvHFp75nBXNQWvL4CK + RuMuQQwn2b5u92LDxniwTnH9X/TS6rwI0DZtdg9Xxe0Q3KybEO3bO7YQyu5ZNDO6GfxadUAYK0CpOh03 + 2k8apao0ibQjTRTESmtewkOCVasba8ymW5yvUtygVXm8AbF7SfsJfP4toLj1OIxfiyVFytSQoETxAm5P + APKRLyEMW6zgJ0lahrJR0HQM+U2pGF/KRF7DUeTWE7UpEyyIK6x+BpfHD9nwMmT6FVTql8MswUbnIKc+ + Reyst5zFoOUMBsyn0b9wClmKI+JHiMuvGofT7UeRbhGFXYTWjAKtBXkaM76vudDQl4PMO8m4Wp0M7Ww6 + Mm4lIaMqCVfkh5+KglzZE9ipk51OG2Oj/7+F0+0TfzGf1MuyRLROJ+BSZSKUrw9JLpYncL0kJktqmMiu + GMP18jBloyHKw7FsDN9+bEIhXMOF0nickyY8Py+NlzA89rGE2E8c2IOD2+D7WCIidA4g+QvaI6p4RBi2 + 0wAAAABJRU5ErkJggg== - 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 - hPEXWo1Mhkkx8hAAAAAASUVORK5CYII= + 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 + AABJRU5ErkJggg== - 336, 17 + 401, 17 @@ -546,6 +546,6 @@ - 522, 17 + 625, 17 \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj index 2635ddc..f6ad9f0 100644 --- a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj +++ b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj @@ -85,11 +85,11 @@ ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - - ..\packages\MailKit.3.0.0\lib\net452\MailKit.dll + + ..\packages\MailKit.2.5.0\lib\net45\MailKit.dll - - ..\packages\MimeKit.3.0.0\lib\net452\MimeKit.dll + + ..\packages\MimeKit.2.5.0\lib\net45\MimeKit.dll ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs index de25bae..8ba99fd 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs @@ -175,9 +175,10 @@ namespace TsSFCDevice.Client.Launch this.btnPlanCheckJump, this.barButtonItem8}); this.ribbonControl.Location = new System.Drawing.Point(0, 0); + this.ribbonControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ribbonControl.MaxItemId = 82; this.ribbonControl.Name = "ribbonControl"; - this.ribbonControl.OptionsMenuMinWidth = 385; + this.ribbonControl.OptionsMenuMinWidth = 440; this.ribbonControl.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { this.page_Main, this.ribbonPage1, @@ -193,7 +194,7 @@ namespace TsSFCDevice.Client.Launch this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; this.ribbonControl.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show; - this.ribbonControl.Size = new System.Drawing.Size(1165, 160); + this.ribbonControl.Size = new System.Drawing.Size(1331, 197); this.ribbonControl.StatusBar = this.ribbonStatusBar; this.ribbonControl.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // @@ -553,6 +554,7 @@ namespace TsSFCDevice.Client.Launch 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.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; this.barButtonItem8.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem8_ItemClick_1); // // page_Main @@ -707,18 +709,19 @@ namespace TsSFCDevice.Client.Launch this.ribbonStatusBar.ItemLinks.Add(this.btn_PlanCount); this.ribbonStatusBar.ItemLinks.Add(this.btn_VerNo); this.ribbonStatusBar.ItemLinks.Add(this.bSubLblUser); - this.ribbonStatusBar.Location = new System.Drawing.Point(0, 591); + this.ribbonStatusBar.Location = new System.Drawing.Point(0, 761); + this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ribbonStatusBar.Name = "ribbonStatusBar"; this.ribbonStatusBar.Ribbon = this.ribbonControl; - this.ribbonStatusBar.Size = new System.Drawing.Size(1165, 24); + this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 30); // // pnl_Content // this.pnl_Content.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnl_Content.Location = new System.Drawing.Point(0, 160); - this.pnl_Content.Margin = new System.Windows.Forms.Padding(2); + this.pnl_Content.Location = new System.Drawing.Point(0, 197); + this.pnl_Content.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.pnl_Content.Name = "pnl_Content"; - this.pnl_Content.Size = new System.Drawing.Size(1165, 431); + this.pnl_Content.Size = new System.Drawing.Size(1331, 564); this.pnl_Content.TabIndex = 4; // // splashScreenManager1 @@ -733,13 +736,14 @@ namespace TsSFCDevice.Client.Launch // frm_Launch // this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.True; - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1165, 615); + this.ClientSize = new System.Drawing.Size(1331, 791); this.Controls.Add(this.pnl_Content); this.Controls.Add(this.ribbonStatusBar); this.Controls.Add(this.ribbonControl); this.IconOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("frm_Launch.IconOptions.SvgImage"))); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "frm_Launch"; this.Ribbon = this.ribbonControl; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; diff --git a/TsSFCDevice.Client.Launch/frm_Launch.cs b/TsSFCDevice.Client.Launch/frm_Launch.cs index c61246f..a702c26 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.cs @@ -24,6 +24,8 @@ namespace TsSFCDevice.Client.Launch { InitializeComponent(); AuthLayOut(false); + barButtonItem8.Visibility = BarItemVisibility.Never; + btn_treeView.Visibility = BarItemVisibility.Never; } private void frm_Launch_Load(object sender, EventArgs e) diff --git a/TsSFCDevice.Client.Launch/frm_Launch.resx b/TsSFCDevice.Client.Launch/frm_Launch.resx index 8362a3f..9a6516c 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.resx +++ b/TsSFCDevice.Client.Launch/frm_Launch.resx @@ -897,7 +897,7 @@ - 205, 17 + 245, 17 diff --git a/TsSFCDevice.Client.Launch/packages.config b/TsSFCDevice.Client.Launch/packages.config index 25df672..8bf6abd 100644 --- a/TsSFCDevice.Client.Launch/packages.config +++ b/TsSFCDevice.Client.Launch/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/TsSFCDeviceSvc/MainService.asmx.cs b/TsSFCDeviceSvc/MainService.asmx.cs index d3c0e0d..6166449 100644 --- a/TsSFCDeviceSvc/MainService.asmx.cs +++ b/TsSFCDeviceSvc/MainService.asmx.cs @@ -38,6 +38,25 @@ namespace TsSFCDeviceSvc public App_Code.SFCAuthorize auth; private static readonly Logger log = LogManager.GetCurrentClassLogger(); + #region 是否开启版本校验 + private static bool? _ckAppVer; + private static bool ckAppVer + { + get + { + if (!_ckAppVer.HasValue) + { + var bCheckAppVer = System.Configuration.ConfigurationManager.AppSettings?.Get("bckAppVer") ?? "true"; + var b = true; + bool.TryParse(bCheckAppVer, out b); + _ckAppVer = b; + } + + return _ckAppVer.Value; + } + } + #endregion + public MainService() { } @@ -668,6 +687,8 @@ namespace TsSFCDeviceSvc /// private static void AppVersionValid(Dictionary Parameters) { + if (!ckAppVer) return; + if (Parameters.ContainsKey("APPVERSION")) { var vServerVersion = System.Configuration.ConfigurationManager.AppSettings.Get("Version").ToString(); diff --git a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index e6a08e2..0000000 --- a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - false - false - true - Release - Any CPU - FileSystem - C:\Users\Clove\Desktop\WebSVC - FileSystem - <_TargetId>Folder - - - \ No newline at end of file diff --git a/TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml b/TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml new file mode 100644 index 0000000..c22df0a --- /dev/null +++ b/TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml @@ -0,0 +1,17 @@ + + + + + FileSystem + Release + Any CPU + + True + False + C:\Users\Clove\Desktop\TsSFCDeviceSvc + False + + \ No newline at end of file diff --git a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user b/TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml.user similarity index 61% rename from TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user rename to TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml.user index b7985bd..8292235 100644 --- a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/TsSFCDeviceSvc/Properties/PublishProfiles/default.pubxml.user @@ -1,40 +1,22 @@  - + - <_PublishTargetUrl>C:\Users\Clove\Desktop\WebSVC - 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||; - + + <_PublishTargetUrl>C:\Users\Clove\Desktop\TsSFCDeviceSvc - 08/13/2024 15:32:49 - - - 07/18/2024 13:30:47 - - - 08/13/2024 15:32:49 + 09/27/2024 15:14:02 - 08/13/2024 15:32:49 - - - 05/30/2024 11:42:20 - - - 08/13/2024 15:32:49 + 09/27/2024 14:13:44 - 08/13/2024 15:32:49 - - - 07/04/2024 09:35:30 - - - 08/13/2024 15:32:49 + 09/27/2024 14:13:44 06/12/2023 14:20:18 @@ -42,18 +24,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/15/2024 21:55:50 - - 07/15/2024 21:55:50 - 05/28/2024 22:39:56 11/28/2018 02:07:34 - - 11/28/2018 01:59:08 - 07/21/2024 01:05:22 @@ -100,10 +76,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/28/2024 22:39:54 - 08/13/2024 15:32:50 - - - 08/13/2024 15:32:50 + 09/27/2024 15:14:02 07/21/2024 00:35:30 @@ -115,7 +88,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/22/2024 15:41:30 - 08/08/2024 13:33:22 + 09/27/2024 10:23:16 \ No newline at end of file diff --git a/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj b/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj index 90d6f71..f334756 100644 --- a/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj +++ b/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj @@ -83,6 +83,7 @@ PreserveNewest + Web.config @@ -91,7 +92,9 @@ - + + Designer + diff --git a/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj.user b/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj.user index 2c1520a..b8a63d4 100644 --- a/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj.user +++ b/TsSFCDeviceSvc/TsSFCDeviceSvc.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true @@ -9,7 +9,7 @@ - D:\UGit\DeviceManager\TsSFCDeviceSvc\Properties\PublishProfiles\FolderProfile.pubxml + default diff --git a/TsSFCDeviceSvc/Web.config b/TsSFCDeviceSvc/Web.config index 9a6327a..da741d9 100644 --- a/TsSFCDeviceSvc/Web.config +++ b/TsSFCDeviceSvc/Web.config @@ -12,6 +12,7 @@ +