diff --git a/DeviceRepair.Api/Controllers/DeviceController.cs b/DeviceRepair.Api/Controllers/DeviceController.cs index 874a062..9fd797d 100644 --- a/DeviceRepair.Api/Controllers/DeviceController.cs +++ b/DeviceRepair.Api/Controllers/DeviceController.cs @@ -87,12 +87,12 @@ namespace DeviceRepair.Api.Controllers [HttpGet] [Route("GetDeviceTreeDatas")] [HttpAuthorize] - public APIResponseData GetDeviceTreeDatas(string FilterString) + public APIResponseData GetDeviceTreeDatas(string FilterString, string OEMORKH = "ALL") { APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "未能获取到数据！" }; try { - return DeviceAccess.Instance.GetDeviceTreeDatas(FilterString); + return DeviceAccess.Instance.GetDeviceTreeDatas(FilterString, OEMORKH); } catch (Exception ex) { diff --git a/DeviceRepair.Api/Controllers/MaintenanceController.cs b/DeviceRepair.Api/Controllers/MaintenanceController.cs index bd108f5..523603f 100644 --- a/DeviceRepair.Api/Controllers/MaintenanceController.cs +++ b/DeviceRepair.Api/Controllers/MaintenanceController.cs @@ -55,7 +55,7 @@ namespace DeviceRepair.Api.Controllers apiResponseData.Message = ex.Message; } - return new GzipCompressedResult(apiResponseData.ToJson(), Request); ; + return new GzipCompressedResult(apiResponseData.ToJson(), Request); } /// diff --git a/DeviceRepair.Api/Models/CompressedContentResult.cs b/DeviceRepair.Api/Models/CompressedContentResult.cs index 4a8eeee..2daee8e 100644 --- a/DeviceRepair.Api/Models/CompressedContentResult.cs +++ b/DeviceRepair.Api/Models/CompressedContentResult.cs @@ -24,7 +24,7 @@ namespace DeviceRepair.Api.Models public async Task ExecuteAsync(CancellationToken cancellationToken) { var response = new HttpResponseMessage(HttpStatusCode.OK); - var contentBytes = Encoding.UTF8.GetBytes(_content).Compress(); + var contentBytes = Encoding.UTF8.GetBytes(_content); using (var outputStream = new MemoryStream()) { @@ -34,8 +34,10 @@ namespace DeviceRepair.Api.Models } response.Content = new ByteArrayContent(outputStream.ToArray()); - response.Content.Headers.ContentEncoding.Add("gzip"); - response.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"); + response.Content = new StringContent(System.Convert.ToBase64String(outputStream.ToArray()), Encoding.UTF8, "text/html"); + //response.Content.Headers.ContentEncoding.Add("gzip"); + //response.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"); + //response.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"); } response.RequestMessage = _request; diff --git a/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml b/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml index 98d2c9a..6d941ed 100644 --- a/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml +++ b/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Debug Any CPU FileSystem - C:\Users\Clove\Desktop\20240603_Release\WebApi_20240603 + C:\Users\Clove\Desktop\20240603_Release\WebApi_20240604 FileSystem diff --git a/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user b/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user index 5a0ea79..76c2d0b 100644 --- a/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240603 - True|2024-06-03T17:16:03.9124219Z;True|2024-06-03T15:22:33.9888519+08:00;True|2024-06-03T10:04:55.1562939+08:00;True|2024-06-03T09:51:46.3653303+08:00;True|2024-05-31T10:08:51.2865889+08:00;True|2024-05-31T01:21:35.1603933+08:00;True|2024-05-30T17:42:28.4008960+08:00;True|2024-05-30T17:35:13.0117556+08:00;True|2024-05-30T17:28:00.7834102+08:00;True|2024-05-30T17:10:05.9943745+08:00;True|2024-05-29T13:43:17.4797209+08:00; + <_PublishTargetUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240604 + True|2024-06-04T08:24:57.6501582Z;True|2024-06-04T14:30:31.7472780+08:00;True|2024-06-04T01:16:03.9124219+08:00;True|2024-06-03T15:22:33.9888519+08:00;True|2024-06-03T10:04:55.1562939+08:00;True|2024-06-03T09:51:46.3653303+08:00;True|2024-05-31T10:08:51.2865889+08:00;True|2024-05-31T01:21:35.1603933+08:00;True|2024-05-30T17:42:28.4008960+08:00;True|2024-05-30T17:35:13.0117556+08:00;True|2024-05-30T17:28:00.7834102+08:00;True|2024-05-30T17:10:05.9943745+08:00;True|2024-05-29T13:43:17.4797209+08:00; @@ -78,37 +78,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/28/2024 22:39:54 - 06/04/2024 01:16:03 + 06/04/2024 16:23:04 - 06/04/2024 01:16:03 + 06/04/2024 16:23:04 - 06/04/2024 00:50:39 + 06/04/2024 16:23:04 05/30/2024 11:42:20 - 06/04/2024 00:50:39 + 06/04/2024 16:23:04 - 06/04/2024 00:50:39 + 06/04/2024 16:23:03 05/30/2024 11:42:20 - 06/04/2024 00:50:39 + 06/04/2024 16:23:03 - 06/04/2024 00:50:39 + 06/04/2024 16:23:04 05/30/2024 11:42:20 - 06/04/2024 00:50:39 + 06/04/2024 16:23:04 05/28/2024 22:39:54 @@ -414,7 +414,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/16/2024 09:58:38 - 06/04/2024 01:16:03 + 06/04/2024 16:24:57 \ No newline at end of file diff --git a/DeviceRepair.DataAccess/DeviceAccess.cs b/DeviceRepair.DataAccess/DeviceAccess.cs index 1f6ecf9..26b5b73 100644 --- a/DeviceRepair.DataAccess/DeviceAccess.cs +++ b/DeviceRepair.DataAccess/DeviceAccess.cs @@ -284,7 +284,7 @@ namespace DeviceRepair.DataAccess /// /// /// - public APIResponseData GetDeviceTreeDatas(string FilterValue) + public APIResponseData GetDeviceTreeDatas(string FilterValue, string OEMORKH = "ALL") { APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "没有查询到数据！" }; try @@ -293,18 +293,31 @@ namespace DeviceRepair.DataAccess int aid = 0; int.TryParse(FilterValue, out aid); + List RootDatas = db.Queryable().Where(x => x.Status).OrderBy(x => x.AutoID).ToList(); - var exp = Expressionable.Create() - .OrIF(aid > 0, t1 => t1.AutoID == aid) - .OrIF(!string.IsNullOrEmpty(FilterValue), - t1 => t1.EquipmentID.Equals(FilterValue, StringComparison.CurrentCultureIgnoreCase) - || t1.EquipmentName.Contains(FilterValue) - || t1.Remarks.Contains(FilterValue) - || t1.Specification.Contains(FilterValue)).ToExpression();//拼接表达式 - var Root = db.Queryable().Where(x => x.Status).OrderBy(x => x.AutoID).ToList().ToDictionary(x => x.AutoID, x => x); + if (OEMORKH != "All") + { + List waitDel = new List(); + foreach (var item in RootDatas) + { + if (item.ParentID == 0 && item.Name != OEMORKH) + { + waitDel.Add(item.AutoID); + continue; + } + + if (waitDel.Any(x => x == item.ParentID)) + { + waitDel.Add(item.AutoID); + } + } + RootDatas.RemoveAll(x => waitDel.Contains(x.AutoID)); + } + var Root = RootDatas.ToDictionary(x => x.AutoID, x => x); List Menus = new List(); + foreach (KeyValuePair item in Root) { DeviceRouteInfo dev = item.Value; @@ -317,6 +330,16 @@ namespace DeviceRepair.DataAccess } int[] RouteIds = Root.Keys.ToArray(); + + var exp = Expressionable.Create() + .OrIF(aid > 0, t1 => t1.AutoID == aid) + .OrIF(!string.IsNullOrEmpty(FilterValue), + t1 => t1.EquipmentID.Equals(FilterValue, StringComparison.CurrentCultureIgnoreCase) + || t1.EquipmentName.Contains(FilterValue) + || t1.Remarks.Contains(FilterValue) + || t1.Specification.Contains(FilterValue)) + .And(t1 => SqlFunc.ContainsArray(RouteIds, t1.Route)).ToExpression();//拼接表达式 + var Datas = db.Queryable( (t1, t2, t3) => new object[] { JoinType.Left, t1.MaintenanceFormVersion == t2.AutoID, @@ -363,6 +386,8 @@ namespace DeviceRepair.DataAccess return apiResponseData; } + bool hasEmpty = Menus.Any(x => x.RouteAutoId == Guid.Empty); + foreach (DeviceInformationInfoTree item in Datas) { item.ParentRouteId = RouteIds.Contains(item.Route) ? Root[item.Route].GUID : Guid.Empty; @@ -380,9 +405,7 @@ namespace DeviceRepair.DataAccess HasValues.AddRange(gids); } while (gids.All(x => x == Guid.Empty)); - Menus.RemoveAll(x => !HasValues.Contains(x.RouteAutoId)); - - + Menus.RemoveAll(x => !HasValues.Contains(x.RouteAutoId) && x.ParentRouteId != Guid.Empty); Menus.AddRange(Datas); apiResponseData.Code = 1; diff --git a/DeviceRepair.DataAccess/PlanAccess.cs b/DeviceRepair.DataAccess/PlanAccess.cs index fd758aa..2e7bb7f 100644 --- a/DeviceRepair.DataAccess/PlanAccess.cs +++ b/DeviceRepair.DataAccess/PlanAccess.cs @@ -353,7 +353,7 @@ namespace DeviceRepair.DataAccess item.EquipmentName = devDict[data.EquipmentID].EquipmentName; item.VersionCode = formDict.ContainsKey(devDict[data.EquipmentID].MaintenanceFormVersion) ? formDict[devDict[data.EquipmentID].MaintenanceFormVersion].VersionCode : ""; item.MaintenanceYear = data.MaintenanceYear; - item.PMStartMonth = data.PMStartMonth.ToString("yyyy-MM-dd"); + item.PMStartMonth = data.PMStartMonth?.ToString("yyyy-MM-dd") ?? ""; item.CreatUser = data.CreatUser; item.CreatUserName = usDict[data.CreatUser].RealName; item.CreatDate = first.CreatDate; @@ -369,7 +369,7 @@ namespace DeviceRepair.DataAccess item.ChangeUser = last.ChangeUser; item.ChangeUserName = usDict[last.ChangeUser].RealName; item.Remarks = last.Remarks; - item.PMStartMonth = last.PMStartMonth.ToString("yyyy-MM-dd"); + item.PMStartMonth = last.PMStartMonth?.ToString("yyyy-MM-dd") ?? ""; } lst.Add(item); diff --git a/DeviceRepair.DataAccess/TsSFCAccess.cs b/DeviceRepair.DataAccess/TsSFCAccess.cs index bea5aba..5f2e0e1 100644 --- a/DeviceRepair.DataAccess/TsSFCAccess.cs +++ b/DeviceRepair.DataAccess/TsSFCAccess.cs @@ -63,11 +63,22 @@ namespace DeviceRepair.DataAccess try { db.ChangeDatabase("addon"); - int Count = db.Queryable().Count(x => x.UserCode == UserCode); + + List Datas = db.Queryable((t1, t2) => new object[] { + JoinType.Left,t1.Post == t2.Guid + }).Select((t1, t2) => t2).ToList(); + + int PostType = -1; + + if (Datas.Any(x => x.PostName == "OEM-QE")) + PostType = 1; + + if (Datas.Any(x => x.PostName == "OEM-PE")) + PostType = 1; apiResponseData.Code = 1; apiResponseData.Message = ""; - apiResponseData.Data = Count; + apiResponseData.Data = PostType; } catch (SqlSugarException ex) { diff --git a/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs b/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs index 21925c4..01c15c2 100644 --- a/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs +++ b/DeviceRepair.Models/Device/DeviceInformationInfoTree.cs @@ -111,6 +111,7 @@ namespace DeviceRepair.Models.Device /// public virtual int Route { get; set; } + /// /// 控件用ID /// diff --git a/DeviceRepair.Models/DeviceRepair.Models.csproj b/DeviceRepair.Models/DeviceRepair.Models.csproj index 9eef4ca..bd447b7 100644 --- a/DeviceRepair.Models/DeviceRepair.Models.csproj +++ b/DeviceRepair.Models/DeviceRepair.Models.csproj @@ -122,6 +122,7 @@ + diff --git a/DeviceRepair.Models/Plan/DriveMaintencePlanInfo.cs b/DeviceRepair.Models/Plan/DriveMaintencePlanInfo.cs index 2f2d47b..4bfefee 100644 --- a/DeviceRepair.Models/Plan/DriveMaintencePlanInfo.cs +++ b/DeviceRepair.Models/Plan/DriveMaintencePlanInfo.cs @@ -56,7 +56,7 @@ namespace DeviceRepair.Models /// /// 新PM起始月份 /// - public virtual DateTime PMStartMonth { get; set; } + public virtual DateTime? PMStartMonth { get; set; } public virtual DateTime CreatDate { get; set; } diff --git a/DeviceRepair.Models/SFC/Addon/PostsInfo.cs b/DeviceRepair.Models/SFC/Addon/PostsInfo.cs new file mode 100644 index 0000000..7f6408f --- /dev/null +++ b/DeviceRepair.Models/SFC/Addon/PostsInfo.cs @@ -0,0 +1,75 @@ +using SqlSugar; +using System; + +namespace DeviceRepair.Models.SFC +{ + /// + /// + /// + [SugarTable("Posts")] + public class PostsInfo + { + /// + /// + /// + [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)] + public Guid Guid { get; set; } + + /// + /// 岗位名称 + /// + [SugarColumn(ColumnName = "PostName")] + public string PostName { get; set; } + + /// + /// 岗位描述 + /// + [SugarColumn(ColumnName = "PostDesc")] + public string PostDesc { get; set; } + + /// + /// 是否检验作业豁免（即不控制技能矩阵） + /// 默认值: ((0)) + /// + [SugarColumn(ColumnName = "InspectionExempt")] + public bool InspectionExempt { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CreateBy")] + public string CreateBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CreateOn")] + public DateTime CreateOn { get; set; } + + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "ModifyBy")] + public string ModifyBy { get; set; } + + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "ModifyOn")] + public DateTime? ModifyOn { get; set; } + + /// + /// 状态 + /// 默认值: ('A') + /// + [SugarColumn(ColumnName = "Status")] + public string Status { get; set; } + + /// + /// 备注 + /// + [SugarColumn(ColumnName = "Note")] + public string Note { get; set; } + + } +} diff --git a/DeviceRepairAndOptimization/BaseControl/GridControlExtend.cs b/DeviceRepairAndOptimization/BaseControl/GridControlExtend.cs new file mode 100644 index 0000000..ffe6738 --- /dev/null +++ b/DeviceRepairAndOptimization/BaseControl/GridControlExtend.cs @@ -0,0 +1,11 @@ +namespace DeviceRepairAndOptimization.BaseControl +{ + public static class GridControlExtend + { + public static void CustomDrawColumnHeader(this DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) + { + if (e.Column != null && (e.Column.Caption == "Selection" || e.Column.FieldName == "DX$CheckboxSelectorColumn")) + e.Info.Caption = "选择"; + } + } +} diff --git a/DeviceRepairAndOptimization/Biz/DeviceManager.cs b/DeviceRepairAndOptimization/Biz/DeviceManager.cs index 771fdbb..67e7d3f 100644 --- a/DeviceRepairAndOptimization/Biz/DeviceManager.cs +++ b/DeviceRepairAndOptimization/Biz/DeviceManager.cs @@ -133,7 +133,7 @@ namespace DeviceRepairAndOptimization.Biz /// /// /// - public APIResponseData GetDeviceTreeDatas(string FilterValue) + public APIResponseData GetDeviceTreeDatas(string FilterValue, string OEMORKH = "ALL") { APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "查询失败！" }; try @@ -143,7 +143,7 @@ namespace DeviceRepairAndOptimization.Biz case "api": apiResponseData = ApiHelper.Instance.SendMessage(new HttpItem { - URL = $"{ServiceRouteConstValue.GetDeviceTreeDatas}?FilterString={FilterValue}", + URL = $"{ServiceRouteConstValue.GetDeviceTreeDatas}?FilterString={FilterValue}&OEMORKH={OEMORKH}", Method = "Get", ContentType = "application/json;charset=utf-8", }); diff --git a/DeviceRepairAndOptimization/Biz/MaintenanceManager.cs b/DeviceRepairAndOptimization/Biz/MaintenanceManager.cs index b871fea..adf25b0 100644 --- a/DeviceRepairAndOptimization/Biz/MaintenanceManager.cs +++ b/DeviceRepairAndOptimization/Biz/MaintenanceManager.cs @@ -33,23 +33,17 @@ namespace DeviceRepairAndOptimization.Biz switch (DeviceRepair.Utils.Config.Configurations.Properties.ConnType?.ToLower()) { case "api": - HttpItem item = new HttpItem + apiResponseData = ApiHelper.Instance.SendMessage(new HttpItem { URL = $"{ServiceRouteConstValue.GetMaintenanceDatas}", Method = "Post", - ContentType = "text/json", + ContentType = "application/json; charset=utf-8", Postdata = JsonConvert.SerializeObject(FilterInfo), - ResultType = ResultType.Byte - }; - - apiResponseData = ApiHelper.Instance.SendMessage(item, true); - + }); break; default: - apiResponseData = MaintenanceAccess.Instance.GetDatas(FilterInfo); - break; } } diff --git a/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj b/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj index a99f019..fa9e74e 100644 --- a/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj +++ b/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj @@ -327,6 +327,7 @@ + Component diff --git a/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.Designer.cs b/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.Designer.cs index aa9fc33..5523225 100644 --- a/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.Designer.cs @@ -104,7 +104,7 @@ this.toolbarFormControl1.Manager = this.toolbarFormManager1; this.toolbarFormControl1.Margin = new System.Windows.Forms.Padding(2); this.toolbarFormControl1.Name = "toolbarFormControl1"; - this.toolbarFormControl1.Size = new System.Drawing.Size(1035, 31); + this.toolbarFormControl1.Size = new System.Drawing.Size(1048, 31); this.toolbarFormControl1.TabIndex = 4; this.toolbarFormControl1.TabStop = false; this.toolbarFormControl1.ToolbarForm = this; @@ -124,7 +124,7 @@ this.barDockControl1.Location = new System.Drawing.Point(0, 84); this.barDockControl1.Manager = this.toolbarFormManager1; this.barDockControl1.Margin = new System.Windows.Forms.Padding(2); - this.barDockControl1.Size = new System.Drawing.Size(1035, 0); + this.barDockControl1.Size = new System.Drawing.Size(1048, 0); // // barDockControl2 // @@ -133,7 +133,7 @@ this.barDockControl2.Location = new System.Drawing.Point(0, 639); this.barDockControl2.Manager = this.toolbarFormManager1; this.barDockControl2.Margin = new System.Windows.Forms.Padding(2); - this.barDockControl2.Size = new System.Drawing.Size(1035, 0); + this.barDockControl2.Size = new System.Drawing.Size(1048, 0); // // barDockControl3 // @@ -148,7 +148,7 @@ // this.barDockControl4.CausesValidation = false; this.barDockControl4.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControl4.Location = new System.Drawing.Point(1035, 84); + this.barDockControl4.Location = new System.Drawing.Point(1048, 84); this.barDockControl4.Manager = this.toolbarFormManager1; this.barDockControl4.Margin = new System.Windows.Forms.Padding(2); this.barDockControl4.Size = new System.Drawing.Size(0, 555); @@ -168,7 +168,7 @@ this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1035, 555); + this.layoutControl1.Size = new System.Drawing.Size(1048, 555); this.layoutControl1.TabIndex = 5; this.layoutControl1.Text = "layoutControl1"; // @@ -181,7 +181,7 @@ this.gridControl1.Name = "gridControl1"; this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.reposBtnStatus}); - this.gridControl1.Size = new System.Drawing.Size(1011, 531); + this.gridControl1.Size = new System.Drawing.Size(1024, 531); this.gridControl1.TabIndex = 4; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -212,35 +212,37 @@ // this.colCode.Caption = "编码"; this.colCode.FieldName = "FieldCode"; - this.colCode.MinWidth = 19; + this.colCode.MaxWidth = 25; + this.colCode.MinWidth = 25; this.colCode.Name = "colCode"; - this.colCode.Width = 73; + this.colCode.Width = 25; // // colFieldText // this.colFieldText.Caption = "名称"; this.colFieldText.FieldName = "FieldText"; - this.colFieldText.MinWidth = 19; + this.colFieldText.MinWidth = 170; this.colFieldText.Name = "colFieldText"; this.colFieldText.Visible = true; this.colFieldText.VisibleIndex = 1; - this.colFieldText.Width = 73; + this.colFieldText.Width = 200; // // colFieldValue // this.colFieldValue.Caption = "值"; this.colFieldValue.FieldName = "FieldValue"; - this.colFieldValue.MinWidth = 19; + this.colFieldValue.MinWidth = 170; this.colFieldValue.Name = "colFieldValue"; this.colFieldValue.Visible = true; this.colFieldValue.VisibleIndex = 2; - this.colFieldValue.Width = 73; + this.colFieldValue.Width = 200; // // colFieldType // this.colFieldType.Caption = "值类型"; this.colFieldType.ColumnEdit = this.reposBtnStatus; this.colFieldType.FieldName = "FieldTypeCaption"; + this.colFieldType.MinWidth = 60; this.colFieldType.Name = "colFieldType"; this.colFieldType.Visible = true; this.colFieldType.VisibleIndex = 3; @@ -258,6 +260,7 @@ this.colStatus.Caption = "状态"; this.colStatus.ColumnEdit = this.reposBtnStatus; this.colStatus.FieldName = "StatusText"; + this.colStatus.MinWidth = 50; this.colStatus.Name = "colStatus"; this.colStatus.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.colStatus.OptionsColumn.AllowIncrementalSearch = false; @@ -271,14 +274,17 @@ // this.colDescription.Caption = "说明"; this.colDescription.FieldName = "Description"; + this.colDescription.MinWidth = 170; this.colDescription.Name = "colDescription"; this.colDescription.Visible = true; this.colDescription.VisibleIndex = 5; + this.colDescription.Width = 200; // // colCreator // this.colCreator.Caption = "创建人"; this.colCreator.FieldName = "CreatorName"; + this.colCreator.MinWidth = 50; this.colCreator.Name = "colCreator"; this.colCreator.Visible = true; this.colCreator.VisibleIndex = 6; @@ -287,17 +293,17 @@ // this.colCreatOn.Caption = "创建时间"; this.colCreatOn.FieldName = "CreatOn"; - this.colCreatOn.MinWidth = 19; + this.colCreatOn.MinWidth = 80; this.colCreatOn.Name = "colCreatOn"; this.colCreatOn.Visible = true; this.colCreatOn.VisibleIndex = 7; - this.colCreatOn.Width = 73; + this.colCreatOn.Width = 100; // // colModifyBy // this.colModifyBy.Caption = "修改人"; this.colModifyBy.FieldName = "ModifierName"; - this.colModifyBy.MinWidth = 19; + this.colModifyBy.MinWidth = 50; this.colModifyBy.Name = "colModifyBy"; this.colModifyBy.Visible = true; this.colModifyBy.VisibleIndex = 8; @@ -307,11 +313,11 @@ // this.colModifyOn.Caption = "修改时间"; this.colModifyOn.FieldName = "ModifyOn"; - this.colModifyOn.MinWidth = 19; + this.colModifyOn.MinWidth = 80; this.colModifyOn.Name = "colModifyOn"; this.colModifyOn.Visible = true; this.colModifyOn.VisibleIndex = 9; - this.colModifyOn.Width = 73; + this.colModifyOn.Width = 100; // // Root // @@ -329,7 +335,7 @@ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1}); - this.Root.Size = new System.Drawing.Size(1035, 555); + this.Root.Size = new System.Drawing.Size(1048, 555); this.Root.TextVisible = false; // // layoutControlItem1 @@ -337,7 +343,7 @@ 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(1015, 535); + this.layoutControlItem1.Size = new System.Drawing.Size(1028, 535); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // @@ -470,7 +476,7 @@ this.barDockControlTop.Location = new System.Drawing.Point(0, 31); this.barDockControlTop.Manager = this.barManager1; this.barDockControlTop.Margin = new System.Windows.Forms.Padding(2); - this.barDockControlTop.Size = new System.Drawing.Size(1035, 53); + this.barDockControlTop.Size = new System.Drawing.Size(1048, 53); // // barDockControlBottom // @@ -479,7 +485,7 @@ this.barDockControlBottom.Location = new System.Drawing.Point(0, 639); this.barDockControlBottom.Manager = this.barManager1; this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(2); - this.barDockControlBottom.Size = new System.Drawing.Size(1035, 0); + this.barDockControlBottom.Size = new System.Drawing.Size(1048, 0); // // barDockControlLeft // @@ -494,7 +500,7 @@ // this.barDockControlRight.CausesValidation = false; this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(1035, 84); + this.barDockControlRight.Location = new System.Drawing.Point(1048, 84); this.barDockControlRight.Manager = this.barManager1; this.barDockControlRight.Margin = new System.Windows.Forms.Padding(2); this.barDockControlRight.Size = new System.Drawing.Size(0, 555); @@ -564,7 +570,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1035, 639); + this.ClientSize = new System.Drawing.Size(1048, 639); this.Controls.Add(this.layoutControl1); this.Controls.Add(this.barDockControl3); this.Controls.Add(this.barDockControl4); diff --git a/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.cs b/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.cs index b30d0b8..542374b 100644 --- a/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.cs +++ b/DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.cs @@ -150,8 +150,7 @@ namespace DeviceRepairAndOptimization.Pages.CustomField private void GridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); } private void GridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e) @@ -232,9 +231,19 @@ namespace DeviceRepairAndOptimization.Pages.CustomField item.ModifierName = UserMapping[item.ModifyBy.Value]; } - gridControl1.DataSource = gridControl1.DataSource = CurrentDatas.Where(x => x.FieldText.Contains(FilterString) + var DataSource = CurrentDatas.Where(x => x.FieldText.Contains(FilterString) || x.FieldValue.Contains(FilterString)).ToList(); + + gridControl1.DataSource = DataSource; + // 设置行号列宽度 + SizeF size = this.CreateGraphics().MeasureString(DataSource.Count.ToString(), this.Font); + gridView1.IndicatorWidth = Convert.ToInt32(size.Width) + 20; + gridView1.BestFitColumns(); + gridView1.Columns[0].BestFit(); + gridView1.Columns[1].BestFit(); + gridView1.Columns[2].BestFit(); + splashScreenManager1.TryCloseWait(); } catch (Exception ex) @@ -362,7 +371,6 @@ namespace DeviceRepairAndOptimization.Pages.CustomField b.Buttons[DialogResult.OK].Click += (c, d) => { DiaResult = DialogResult.OK; }; }; - getRemark: DiaResult = DialogResult.None; // 显示对话框 var Description = XtraInputBox.Show(args); @@ -372,18 +380,10 @@ namespace DeviceRepairAndOptimization.Pages.CustomField return; if (string.IsNullOrWhiteSpace(DescriptionValue)) - { - if (XtraMessageBoxHelper.AskYesNo("原因不能为空，是否继续操作？") == DialogResult.Yes) - goto getRemark; - return; - } + throw new Exception("原因不能为空，是否继续操作？"); if (DescriptionValue.Length >= 3800) - { - if (XtraMessageBoxHelper.AskYesNo("原因描述超出长度，最大长度为200！") == DialogResult.Yes) - goto getRemark; - return; - } + throw new Exception("原因描述超出长度，最大长度为200！"); bool BeStatus = !CurrentFieldInfo.Status; diff --git a/DeviceRepairAndOptimization/Pages/DriveInformation/pageRouteAssign.cs b/DeviceRepairAndOptimization/Pages/DriveInformation/pageRouteAssign.cs index d234506..213c2d6 100644 --- a/DeviceRepairAndOptimization/Pages/DriveInformation/pageRouteAssign.cs +++ b/DeviceRepairAndOptimization/Pages/DriveInformation/pageRouteAssign.cs @@ -29,6 +29,7 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance if (CurrentRoute != 0) { + //treeList1.SetNodeCheckState(treeList1.FindNodeByKeyID(CurrentRoute), CheckState.Checked); foreach (TreeListNode node in treeList1.Nodes) { SelectNodeByID(node, CurrentRoute); @@ -41,7 +42,9 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance // 假设ID存储在节点的第一个列（索引0） if (node.GetValue("AutoID")?.ToString() == targetID.ToString()) { - node.Checked = true; + treeList1.SetNodeCheckState(node, CheckState.Checked); + treeList1.SetFocusedNode(node); + //node.Checked = true; return; } @@ -91,7 +94,7 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance if ((treeListNodes?.Count ?? 0) > 0) { TreeListNode node = treeListNodes.FirstOrDefault(); - CurrentSelectModel = routes.FirstOrDefault(x => x.AutoID == node.Id); + CurrentSelectModel = routes.FirstOrDefault(x => x.AutoID.ToString() == node.GetValue("AutoID").ToString()); if (CurrentSelectModel == null) { XtraMessageBoxHelper.Warn("选中数据不能为空！"); diff --git a/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionDialog.cs b/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionDialog.cs index af9b3c3..d61d080 100644 --- a/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionDialog.cs +++ b/DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionDialog.cs @@ -80,7 +80,7 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion } } } - + /// /// 数据绑定 /// @@ -111,8 +111,7 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); } /// diff --git a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.Designer.cs b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.Designer.cs index 13b1cab..20200d6 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.Designer.cs @@ -266,14 +266,17 @@ namespace DeviceRepairAndOptimization.Pages.Maintain // this.gcFieldName.Caption = "配件名称"; this.gcFieldName.FieldName = "FieldName"; + this.gcFieldName.MinWidth = 200; this.gcFieldName.Name = "gcFieldName"; this.gcFieldName.Visible = true; this.gcFieldName.VisibleIndex = 1; + this.gcFieldName.Width = 200; // // gcAccessoriesCount // this.gcAccessoriesCount.Caption = "配件数量"; this.gcAccessoriesCount.FieldName = "AccessoriesCount"; + this.gcAccessoriesCount.MinWidth = 50; this.gcAccessoriesCount.Name = "gcAccessoriesCount"; this.gcAccessoriesCount.Visible = true; this.gcAccessoriesCount.VisibleIndex = 2; @@ -282,9 +285,11 @@ namespace DeviceRepairAndOptimization.Pages.Maintain // this.gcDescription.Caption = "说明"; this.gcDescription.FieldName = "Description"; + this.gcDescription.MinWidth = 200; this.gcDescription.Name = "gcDescription"; this.gcDescription.Visible = true; this.gcDescription.VisibleIndex = 3; + this.gcDescription.Width = 200; // // Root // diff --git a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.cs b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.cs index d722b86..ec813d7 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.cs +++ b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.cs @@ -41,8 +41,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain /// 修改字段标题 gridView1.CustomDrawColumnHeader += (s, e) => { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); }; /// 单元格点击 diff --git a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.Designer.cs b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.Designer.cs index ca373b0..a161f66 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.Designer.cs @@ -31,15 +31,15 @@ namespace DeviceRepairAndOptimization.Pages.Maintain { this.components = new System.ComponentModel.Container(); DevExpress.Utils.Layout.StackPanel stackPanel1; - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(dlgAccessoriesLst)); - 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.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); + 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.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.buttonEdit1 = new DevExpress.XtraEditors.ButtonEdit(); this.toolbarFormManager1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(this.components); @@ -48,6 +48,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem(); + this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); this.toolbarFormControl1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); @@ -62,7 +63,6 @@ namespace DeviceRepairAndOptimization.Pages.Maintain this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::DeviceRepairAndOptimization.frmWaiting), true, true); - this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); stackPanel1 = new DevExpress.Utils.Layout.StackPanel(); ((System.ComponentModel.ISupportInitialize)(stackPanel1)).BeginInit(); stackPanel1.SuspendLayout(); @@ -167,6 +167,16 @@ namespace DeviceRepairAndOptimization.Pages.Maintain this.barButtonItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; this.barButtonItem1.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem1_ItemClick); // + // barButtonItem2 + // + this.barButtonItem2.Caption = "新增配件"; + this.barButtonItem2.Id = 1; + this.barButtonItem2.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem2.ImageOptions.Image"))); + this.barButtonItem2.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem2.ImageOptions.LargeImage"))); + this.barButtonItem2.Name = "barButtonItem2"; + this.barButtonItem2.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; + this.barButtonItem2.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem2_ItemClick); + // // simpleButton1 // this.simpleButton1.Location = new System.Drawing.Point(305, 10); @@ -244,17 +254,18 @@ namespace DeviceRepairAndOptimization.Pages.Maintain // this.colFieldText.Caption = "配件名称"; this.colFieldText.FieldName = "FieldText"; - this.colFieldText.MinWidth = 19; + this.colFieldText.MinWidth = 200; this.colFieldText.Name = "colFieldText"; this.colFieldText.Visible = true; this.colFieldText.VisibleIndex = 1; - this.colFieldText.Width = 73; + this.colFieldText.Width = 200; // // colStatus // this.colStatus.Caption = "状态"; this.colStatus.ColumnEdit = this.reposBtnStatus; this.colStatus.FieldName = "StatusText"; + this.colStatus.MinWidth = 50; this.colStatus.Name = "colStatus"; this.colStatus.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.colStatus.OptionsColumn.AllowIncrementalSearch = false; @@ -267,18 +278,20 @@ namespace DeviceRepairAndOptimization.Pages.Maintain // reposBtnStatus // this.reposBtnStatus.AutoHeight = false; - editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image"))); + editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image"))); this.reposBtnStatus.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - 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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.reposBtnStatus.Name = "reposBtnStatus"; // // colDescription // this.colDescription.Caption = "说明"; this.colDescription.FieldName = "Description"; + this.colDescription.MinWidth = 250; this.colDescription.Name = "colDescription"; this.colDescription.Visible = true; this.colDescription.VisibleIndex = 3; + this.colDescription.Width = 250; // // Root // @@ -289,17 +302,17 @@ namespace DeviceRepairAndOptimization.Pages.Maintain this.layoutControlItem2}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition2.Width = 100D; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition2}); - rowDefinition3.Height = 48D; - rowDefinition3.SizeType = System.Windows.Forms.SizeType.Absolute; - rowDefinition4.Height = 100D; - rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1}); + rowDefinition1.Height = 48D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition3, - rowDefinition4}); + rowDefinition1, + rowDefinition2}); this.Root.Size = new System.Drawing.Size(730, 320); this.Root.TextVisible = false; // @@ -326,16 +339,6 @@ namespace DeviceRepairAndOptimization.Pages.Maintain // this.splashScreenManager1.ClosingDelay = 500; // - // barButtonItem2 - // - this.barButtonItem2.Caption = "新增配件"; - this.barButtonItem2.Id = 1; - this.barButtonItem2.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem2.ImageOptions.Image"))); - this.barButtonItem2.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem2.ImageOptions.LargeImage"))); - this.barButtonItem2.Name = "barButtonItem2"; - this.barButtonItem2.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; - this.barButtonItem2.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem2_ItemClick); - // // dlgAccessoriesLst // this.AcceptButton = this.simpleButton1; diff --git a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.cs b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.cs index 68a168a..fde7d32 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.cs +++ b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.cs @@ -65,8 +65,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain /// 修改字段标题 gridView1.CustomDrawColumnHeader += (s, e) => { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); }; /// 单元格点击 diff --git a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.resx b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.resx index 9cd8451..864be87 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.resx +++ b/DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.resx @@ -124,7 +124,7 @@ 205, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAD90RVh0VGl0 bGUAQ29uZGl0aW9uYWxGb3JtYXR0aW5zSWNvblNldFNpZ25zMztDb25kaXRpb25hbEZvcm1hdHRpbmc7 @@ -211,64 +211,63 @@ - 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 + tKfwF7guZQwBlVFoAAAAAElFTkSuQmCC - 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 - RU5ErkJggg== + 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 \ No newline at end of file diff --git a/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.cs b/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.cs index 949a805..36fd76f 100644 --- a/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.cs +++ b/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.cs @@ -253,8 +253,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain /// private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); } /// diff --git a/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs b/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs index ba5e8cf..b88dd65 100644 --- a/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs @@ -79,7 +79,7 @@ tableLayoutPanel1.RowCount = 2; tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - tableLayoutPanel1.Size = new System.Drawing.Size(1598, 916); + tableLayoutPanel1.Size = new System.Drawing.Size(1854, 916); tableLayoutPanel1.TabIndex = 0; tableLayoutPanel1.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel1_Paint); // @@ -123,7 +123,7 @@ this.tvDevices.OptionsSelection.KeepSelectedOnClick = false; this.tvDevices.OptionsView.AutoWidth = false; this.tvDevices.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All; - this.tvDevices.Size = new System.Drawing.Size(1590, 860); + this.tvDevices.Size = new System.Drawing.Size(1846, 860); this.tvDevices.TabIndex = 13; this.tvDevices.TreeLevelWidth = 23; // @@ -290,12 +290,12 @@ stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft; stackPanel1.Location = new System.Drawing.Point(3, 3); stackPanel1.Name = "stackPanel1"; - stackPanel1.Size = new System.Drawing.Size(1592, 42); + stackPanel1.Size = new System.Drawing.Size(1848, 42); stackPanel1.TabIndex = 0; // // EditSearch // - this.EditSearch.Location = new System.Drawing.Point(1287, 5); + this.EditSearch.Location = new System.Drawing.Point(1543, 5); this.EditSearch.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7); this.EditSearch.Name = "EditSearch"; this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Verdana", 10F); @@ -318,7 +318,7 @@ // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClientSize = new System.Drawing.Size(1598, 916); + this.ClientSize = new System.Drawing.Size(1854, 916); this.Controls.Add(tableLayoutPanel1); this.Name = "page_DriveTypeTree"; this.Text = "page_DriveTypeTree"; diff --git a/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.cs b/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.cs index 4f70141..230ecc5 100644 --- a/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.cs +++ b/DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.cs @@ -54,7 +54,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintenance try { splashScreenManager1.ShowWaitForm(); - APIResponseData apiResponseData = DeviceManager.Instance.GetDeviceTreeDatas(FilterString); + APIResponseData apiResponseData = DeviceManager.Instance.GetDeviceTreeDatas(FilterString, "KH"); if (apiResponseData.Code != 1) throw new Exception(apiResponseData.Message); diff --git a/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.Designer.cs b/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.Designer.cs index 512ef3c..11b57ff 100644 --- a/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.Designer.cs @@ -74,7 +74,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1598, 999); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1854, 999); this.tableLayoutPanel1.TabIndex = 0; // // gridControl1 @@ -83,7 +83,7 @@ this.gridControl1.Location = new System.Drawing.Point(3, 51); this.gridControl1.MainView = this.gridView1; this.gridControl1.Name = "gridControl1"; - this.gridControl1.Size = new System.Drawing.Size(1592, 945); + this.gridControl1.Size = new System.Drawing.Size(1848, 945); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -223,7 +223,7 @@ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1598, 48); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1854, 48); this.tableLayoutPanel2.TabIndex = 2; // // stackPanel1 @@ -234,7 +234,7 @@ this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.stackPanel1.LabelVertAlignment = DevExpress.Utils.Layout.LabelVertAlignment.Center; this.stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft; - this.stackPanel1.Location = new System.Drawing.Point(1148, 0); + this.stackPanel1.Location = new System.Drawing.Point(1404, 0); this.stackPanel1.Margin = new System.Windows.Forms.Padding(0); this.stackPanel1.Name = "stackPanel1"; this.stackPanel1.Size = new System.Drawing.Size(450, 48); @@ -275,7 +275,7 @@ this.stackPanel2.Location = new System.Drawing.Point(0, 0); this.stackPanel2.Margin = new System.Windows.Forms.Padding(0); this.stackPanel2.Name = "stackPanel2"; - this.stackPanel2.Size = new System.Drawing.Size(1148, 48); + this.stackPanel2.Size = new System.Drawing.Size(1404, 48); this.stackPanel2.TabIndex = 1; // // btn_DriveMaintenanceEdit @@ -343,7 +343,7 @@ // page_MaintenanceView // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1598, 999); + this.ClientSize = new System.Drawing.Size(1854, 999); this.Controls.Add(this.tableLayoutPanel1); this.Name = "page_MaintenanceView"; this.Text = "page_MaintenanceView"; diff --git a/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs b/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs index 29ed79b..cfc5d3c 100644 --- a/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs +++ b/DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs @@ -203,11 +203,21 @@ namespace DeviceRepairAndOptimization.Pages.Plan ISheet sheet = workbook.GetSheetAt(0); // 获取第一个工作表 + if (sheet == null) + { + throw new Exception("不支持的文件格式"); + } + logs.AppendLine("获取第一个工作表"); logs.AppendLine("读取表头（第一行）并将其添加到 DataTable 中"); // 读取表头（第一行）并将其添加到 DataTable 中 + if (sheet.LastRowNum == 0) + { + throw new Exception("不支持的文件格式"); + } + IRow headerRow = sheet.GetRow(0); for (int i = 0; i < headerRow.LastCellNum; i++) { @@ -255,7 +265,6 @@ namespace DeviceRepairAndOptimization.Pages.Plan } } - #region 校验设备信息 DeviceInformationInfo di = driveLst.Where(x => x.EquipmentID == (newRow[0] + "")).FirstOrDefault(); @@ -338,7 +347,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan MaintenanceMonth = (int)em, MaintenanceType = item[kvp.Value] + "", Remarks = item[keyValuePairs["Comment"]] + "", - PMStartMonth = DateTime.Now, + PMStartMonth = null, CreatDate = DateTime.Today, CreatUser = GlobalInfo.CurrentUser.AutoID, ChangeDate = DateTime.Today, diff --git a/DeviceRepairAndOptimization/Pages/Users/frmRoleUsers.cs b/DeviceRepairAndOptimization/Pages/Users/frmRoleUsers.cs index 2bdbb1d..d354eab 100644 --- a/DeviceRepairAndOptimization/Pages/Users/frmRoleUsers.cs +++ b/DeviceRepairAndOptimization/Pages/Users/frmRoleUsers.cs @@ -65,8 +65,7 @@ namespace DeviceRepairAndOptimization.Pages.Users private void GridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); } private void SelectCurrentRoleUsers() diff --git a/DeviceRepairAndOptimization/Pages/Users/frmUserAdd.cs b/DeviceRepairAndOptimization/Pages/Users/frmUserAdd.cs index a3a9fc7..de9a2cf 100644 --- a/DeviceRepairAndOptimization/Pages/Users/frmUserAdd.cs +++ b/DeviceRepairAndOptimization/Pages/Users/frmUserAdd.cs @@ -23,7 +23,7 @@ namespace DeviceRepairAndOptimization.Pages.Users public frmUserAdd(UserInfoModel entity = null, bool AllocationRole = false, string title = "用户新增") { InitializeComponent(); - + this.Text = title; // 关闭右键Customize Layout菜单 @@ -477,10 +477,7 @@ namespace DeviceRepairAndOptimization.Pages.Users private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) { - if (e.Column != null && e.Column.FieldName == "DX$CheckboxSelectorColumn") - { - e.Info.Caption = "选择"; - } + (new Action(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); } } } diff --git a/DeviceRepairAndOptimization/Pages/pageSytemSetting.Designer.cs b/DeviceRepairAndOptimization/Pages/pageSytemSetting.Designer.cs index 5c4227e..52b76a8 100644 --- a/DeviceRepairAndOptimization/Pages/pageSytemSetting.Designer.cs +++ b/DeviceRepairAndOptimization/Pages/pageSytemSetting.Designer.cs @@ -57,23 +57,25 @@ namespace DeviceRepairAndOptimization.Pages // // layoutControl1 // + layoutControl1.AllowCustomization = false; layoutControl1.Controls.Add(this.dataLayoutControl1); layoutControl1.Controls.Add(stackPanel1); layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; layoutControl1.Location = new System.Drawing.Point(0, 0); layoutControl1.Name = "layoutControl1"; layoutControl1.Root = Root; - layoutControl1.Size = new System.Drawing.Size(1598, 999); + layoutControl1.Size = new System.Drawing.Size(1854, 999); layoutControl1.TabIndex = 0; layoutControl1.Text = "layoutControl1"; // // dataLayoutControl1 // + this.dataLayoutControl1.AllowCustomization = false; this.dataLayoutControl1.Location = new System.Drawing.Point(12, 46); this.dataLayoutControl1.Name = "dataLayoutControl1"; this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1225, 682, 650, 400); this.dataLayoutControl1.Root = this.layoutControlGroup1; - this.dataLayoutControl1.Size = new System.Drawing.Size(1574, 941); + this.dataLayoutControl1.Size = new System.Drawing.Size(1830, 941); this.dataLayoutControl1.TabIndex = 5; this.dataLayoutControl1.Text = "dataLayoutControl1"; // @@ -82,7 +84,7 @@ namespace DeviceRepairAndOptimization.Pages this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup1.GroupBordersVisible = false; this.layoutControlGroup1.Name = "Root"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1574, 941); + this.layoutControlGroup1.Size = new System.Drawing.Size(1830, 941); this.layoutControlGroup1.TextVisible = false; // // stackPanel1 @@ -91,13 +93,13 @@ namespace DeviceRepairAndOptimization.Pages stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft; stackPanel1.Location = new System.Drawing.Point(12, 12); stackPanel1.Name = "stackPanel1"; - stackPanel1.Size = new System.Drawing.Size(1574, 30); + stackPanel1.Size = new System.Drawing.Size(1830, 30); stackPanel1.TabIndex = 4; // // simpleButton1 // this.simpleButton1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButton1.ImageOptions.Image"))); - this.simpleButton1.Location = new System.Drawing.Point(1496, 3); + this.simpleButton1.Location = new System.Drawing.Point(1752, 3); this.simpleButton1.Name = "simpleButton1"; this.simpleButton1.Size = new System.Drawing.Size(75, 23); this.simpleButton1.TabIndex = 0; @@ -124,7 +126,7 @@ namespace DeviceRepairAndOptimization.Pages Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2}); - Root.Size = new System.Drawing.Size(1598, 999); + Root.Size = new System.Drawing.Size(1854, 999); Root.TextVisible = false; // // layoutControlItem1 @@ -132,7 +134,7 @@ namespace DeviceRepairAndOptimization.Pages this.layoutControlItem1.Control = stackPanel1; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(1578, 34); + this.layoutControlItem1.Size = new System.Drawing.Size(1834, 34); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextVisible = false; // @@ -142,7 +144,8 @@ namespace DeviceRepairAndOptimization.Pages this.lcContent.Location = new System.Drawing.Point(0, 34); this.lcContent.Name = "lcContent"; this.lcContent.OptionsTableLayoutItem.RowIndex = 1; - this.lcContent.Size = new System.Drawing.Size(1578, 945); + this.lcContent.ShowInCustomizationForm = false; + this.lcContent.Size = new System.Drawing.Size(1834, 945); this.lcContent.TextSize = new System.Drawing.Size(0, 0); this.lcContent.TextVisible = false; // @@ -150,7 +153,7 @@ namespace DeviceRepairAndOptimization.Pages // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1598, 999); + this.ClientSize = new System.Drawing.Size(1854, 999); this.Controls.Add(layoutControl1); this.DoubleBuffered = true; this.Font = new System.Drawing.Font("宋体", 11.25F); diff --git a/DeviceRepairAndOptimization/Pages/pageSytemSetting.cs b/DeviceRepairAndOptimization/Pages/pageSytemSetting.cs index 1c9a650..78b24fc 100644 --- a/DeviceRepairAndOptimization/Pages/pageSytemSetting.cs +++ b/DeviceRepairAndOptimization/Pages/pageSytemSetting.cs @@ -62,6 +62,7 @@ namespace DeviceRepairAndOptimization.Pages Text = item, ExpandButtonVisible = true }; + InitializeGroupItem(vlayoutControlGroup, sysConfigs.Where(x => x.GroupKey.Equals(item))?.ToList()); control.AddRange(new BaseLayoutItem[] { vlayoutControlGroup }); } diff --git a/DeviceRepairAndOptimization/Properties/AssemblyInfo.cs b/DeviceRepairAndOptimization/Properties/AssemblyInfo.cs index 5f1744e..7eaa7f5 100644 --- a/DeviceRepairAndOptimization/Properties/AssemblyInfo.cs +++ b/DeviceRepairAndOptimization/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.12")] -[assembly: AssemblyFileVersion("2.0.1.12")] +[assembly: AssemblyVersion("2.0.1.13")] +[assembly: AssemblyFileVersion("2.0.1.13")] diff --git a/DeviceRepairAndOptimization/ServiceRouteConstValue.cs b/DeviceRepairAndOptimization/ServiceRouteConstValue.cs index 5ea6dd5..17464c3 100644 --- a/DeviceRepairAndOptimization/ServiceRouteConstValue.cs +++ b/DeviceRepairAndOptimization/ServiceRouteConstValue.cs @@ -302,7 +302,7 @@ /// /// 设备维修单获取 /// - public const string GetMaintenanceDatas = "Api/Maintenance/GetDataTest";//"Api/Maintenance/GetDatas"; + public const string GetMaintenanceDatas = "Api/Maintenance/GetDatas"; /// /// 设备维修 diff --git a/TsSFCDeivceClient/BaseControlEx/GridControlExtend.cs b/TsSFCDeivceClient/BaseControlEx/GridControlExtend.cs new file mode 100644 index 0000000..bfb2f7b --- /dev/null +++ b/TsSFCDeivceClient/BaseControlEx/GridControlExtend.cs @@ -0,0 +1,11 @@ +namespace TsSFCDeivceClient.BaseControlEx +{ + public static class GridControlExtend + { + public static void CustomDrawColumnHeader(this DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) + { + if (e.Column != null && (e.Column.Caption == "Selection" || e.Column.FieldName == "DX$CheckboxSelectorColumn")) + e.Info.Caption = "选择"; + } + } +} diff --git a/TsSFCDeivceClient/TsSFCDeivceClient.csproj b/TsSFCDeivceClient/TsSFCDeivceClient.csproj index 146268d..dfdfa32 100644 --- a/TsSFCDeivceClient/TsSFCDeivceClient.csproj +++ b/TsSFCDeivceClient/TsSFCDeivceClient.csproj @@ -106,6 +106,7 @@ + diff --git a/TsSFCDeivceClient/pageDeivceView.cs b/TsSFCDeivceClient/pageDeivceView.cs index 5251b98..07a67c1 100644 --- a/TsSFCDeivceClient/pageDeivceView.cs +++ b/TsSFCDeivceClient/pageDeivceView.cs @@ -85,8 +85,7 @@ namespace TsSFCDeivceClient /// 修改字段标题 gridView1.CustomDrawColumnHeader += (s, e) => { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControlEx.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); }; /// 单元格点击 diff --git a/TsSFCDeivceClient/pageDeviceMaintenanceFormView.cs b/TsSFCDeivceClient/pageDeviceMaintenanceFormView.cs index 2316d8e..c61d3ab 100644 --- a/TsSFCDeivceClient/pageDeviceMaintenanceFormView.cs +++ b/TsSFCDeivceClient/pageDeviceMaintenanceFormView.cs @@ -20,7 +20,7 @@ namespace TsSFCDeivceClient { int m_SelectedCurrentRowIndex = 0; DataRow CurrentRequestForm = null; - + List lookupMaintenanceStatus; #region 表单数据 @@ -81,7 +81,7 @@ namespace TsSFCDeivceClient } #endregion - bool HasAuth = false; + int EmployeeType = -1; public pageDeviceMaintenanceFormView(UserInfo user, string APPVERSION = "5.0.0.0") { @@ -120,7 +120,7 @@ namespace TsSFCDeivceClient this.Close(); } - HasAuth = apiResponseData.ToInt() > 0; + EmployeeType = apiResponseData.ToInt(); if (lookupMaintenanceStatus == null) lookupMaintenanceStatus = new List(); @@ -280,8 +280,7 @@ namespace TsSFCDeivceClient /// 修改字段标题 gridView1.CustomDrawColumnHeader += (s, e) => { - if (e.Column != null && e.Column.Caption == "Selection") - e.Info.Caption = "选择"; + (new Action(BaseControlEx.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); }; /// 单元格点击 @@ -345,16 +344,16 @@ namespace TsSFCDeivceClient int AutoID = Convert.ToInt32(CurrentRequestForm["AutoID"]); DeviceWarrantyRequestFormView Item = CurrentGridDatas[AutoID];// GridDatas.FirstOrDefault(x => x.AutoID == AutoID); - if (Item != null && HasAuth && Item.FormStatus != DeviceWarrantyRequestFormStatus.BeComplate && Item.InProduction) + if (Item != null && EmployeeType != -1 && Item.FormStatus != DeviceWarrantyRequestFormStatus.BeComplate && Item.InProduction) { if (Item.EvaluatorItems != null) { - if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "PE")) + if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "PE") && EmployeeType == 0) { PE = true; } - if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "QE")) + if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "QE") && EmployeeType == 1) { QE = true; }