clovejunti/DeviceManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8

Browse Source
This commit is contained in:
clovejunti 2024-06-06 01:09:59 +08:00
parent 2b4ab63a1d
commit 71adaf8eb5
38 changed files with 1084 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
DeviceRepair.Api/Controllers/MaintenanceController.cs
View File

@ -36,28 +36,6 @@ namespace DeviceRepair.Api.Controllers
return apiResponseData; return apiResponseData;
} }
/// <summary>
/// 查询设备维修单
/// </summary>
/// <param name="Code"></param>
/// <returns></returns>
[HttpPost, Route("GetDataTest")]
public IHttpActionResult GetDataTest(DeviceWarrantyRequestFormFilter FilterInfo)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "操作失败！" };
try
{
apiResponseData = MaintenanceAccess.Instance.GetDatas(FilterInfo);
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return new GzipCompressedResult(apiResponseData.ToJson(), Request);
}
/// <summary> /// <summary>
/// 设备维修 /// 设备维修
/// </summary> /// </summary>
@ -276,5 +254,27 @@ namespace DeviceRepair.Api.Controllers
} }
return apiResponseData; return apiResponseData;
} }
/// <summary>
/// 导出到excel
/// </summary>
/// <param name="FilterInfo"></param>
/// <returns></returns>
[HttpPost, HttpAuthorize, Route("GetXlsxData")]
public APIResponseData GetXlsxData(DeviceWarrantyRequestFormFilter FilterInfo)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "操作失败！" };
try
{
apiResponseData = MaintenanceAccess.Instance.GetXlsxData(FilterInfo);
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
} }
} }

2
DeviceRepair.Api/Controllers/RoleController.cs
View File

@ -103,7 +103,7 @@ namespace DeviceRepair.Api.Controllers
if (string.IsNullOrWhiteSpace(Item.RoleCode)) if (string.IsNullOrWhiteSpace(Item.RoleCode))
{ {
apiResponseData.Message = "角色编码不能为空！"; apiResponseData.Message = "角色编码不能为空！";
return apiResponseData; return apiResponseData;
} }
if (string.IsNullOrWhiteSpace(Item.RoleName)) if (string.IsNullOrWhiteSpace(Item.RoleName))

28
DeviceRepair.Api/Controllers/UserController.cs
View File

@ -123,7 +123,7 @@ namespace DeviceRepair.Api.Controllers
{ {
Node = doc.DocumentElement["soap:Body"]["UserLoginResponse"]["btResults"].LastChild; Node = doc.DocumentElement["soap:Body"]["UserLoginResponse"]["btResults"].LastChild;
byte[] bytes = Convert.FromBase64String(Node.LastChild.Value); byte[] bytes = Convert.FromBase64String(Node.LastChild.Value);
bytes.ExactDataSet(); bytes.ExactDataSet();
} }
@ -217,6 +217,32 @@ namespace DeviceRepair.Api.Controllers
return apiResponseData; return apiResponseData;
} }
/// <summary>
/// 修改密码
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
[HttpPost]
[Route("ReprovisionDefaultPassword")]
[HttpAuthorize]
public APIResponseData ReprovisionDefaultPassword(string LoginCode, string PassWord)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "账户或密码错误！" };
try
{
base.GetParams();
bool UserDefalutPwd = string.IsNullOrWhiteSpace(PassWord);
apiResponseData = UserAccess.Instance.ReprovisionDefaultPassword(LoginCode, OperationInfo, (UserDefalutPwd ? "" : PassWord), UserDefalutPwd);
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
/// <summary> /// <summary>
/// 用户登出 /// 用户登出
/// </summary> /// </summary>

2
DeviceRepair.Api/DeviceRepair.Api.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

2
DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml
View File

@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240604</PublishUrl> <PublishUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240605</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
</PropertyGroup> </PropertyGroup>

22
DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
--> -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240604</_PublishTargetUrl> <_PublishTargetUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240605</_PublishTargetUrl>
<History>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;</History> <History>True|2024-06-05T09:25:01.7658333Z;True|2024-06-05T15:19:15.9175825+08:00;True|2024-06-04T16:24:57.6501582+08:00;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;</History>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css"> <File Include="Areas/HelpPage/HelpPage.css">
@ -78,37 +78,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>05/28/2024 22:39:54</publishTime> <publishTime>05/28/2024 22:39:54</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Api.dll"> <File Include="bin/DeviceRepair.Api.dll">
<publishTime>06/04/2024 16:23:04</publishTime> <publishTime>06/05/2024 17:25:01</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Api.pdb"> <File Include="bin/DeviceRepair.Api.pdb">
<publishTime>06/04/2024 16:23:04</publishTime> <publishTime>06/05/2024 17:25:01</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.DataAccess.dll"> <File Include="bin/DeviceRepair.DataAccess.dll">
<publishTime>06/04/2024 16:23:04</publishTime> <publishTime>06/05/2024 17:25:00</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.DataAccess.dll.config"> <File Include="bin/DeviceRepair.DataAccess.dll.config">
<publishTime>05/30/2024 11:42:20</publishTime> <publishTime>05/30/2024 11:42:20</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.DataAccess.pdb"> <File Include="bin/DeviceRepair.DataAccess.pdb">
<publishTime>06/04/2024 16:23:04</publishTime> <publishTime>06/05/2024 17:25:00</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Models.dll"> <File Include="bin/DeviceRepair.Models.dll">
<publishTime>06/04/2024 16:23:03</publishTime> <publishTime>06/05/2024 17:24:54</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Models.dll.config"> <File Include="bin/DeviceRepair.Models.dll.config">
<publishTime>05/30/2024 11:42:20</publishTime> <publishTime>05/30/2024 11:42:20</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Models.pdb"> <File Include="bin/DeviceRepair.Models.pdb">
<publishTime>06/04/2024 16:23:03</publishTime> <publishTime>06/05/2024 17:24:54</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Utils.dll"> <File Include="bin/DeviceRepair.Utils.dll">
<publishTime>06/04/2024 16:23:04</publishTime> <publishTime>06/05/2024 15:05:54</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Utils.dll.config"> <File Include="bin/DeviceRepair.Utils.dll.config">
<publishTime>05/30/2024 11:42:20</publishTime> <publishTime>05/30/2024 11:42:20</publishTime>
</File> </File>
<File Include="bin/DeviceRepair.Utils.pdb"> <File Include="bin/DeviceRepair.Utils.pdb">
<publishTime>06/04/2024 16:23:04</publishTime> <publishTime>06/05/2024 15:05:54</publishTime>
</File> </File>
<File Include="bin/EntityFramework.dll"> <File Include="bin/EntityFramework.dll">
<publishTime>05/28/2024 22:39:54</publishTime> <publishTime>05/28/2024 22:39:54</publishTime>
@ -414,7 +414,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>04/16/2024 09:58:38</publishTime> <publishTime>04/16/2024 09:58:38</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>06/04/2024 16:24:57</publishTime> <publishTime>06/05/2024 17:25:01</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>

4
DeviceRepair.DataAccess/DeviceAccess.cs
View File

@ -209,8 +209,6 @@ namespace DeviceRepair.DataAccess
DateTime CurrentDate = DateTime.Now; DateTime CurrentDate = DateTime.Now;
if (dictionary.ContainsKey("Route"))
dictionary.Remove("Route");
if (dictionary.ContainsKey("RouteText")) if (dictionary.ContainsKey("RouteText"))
dictionary.Remove("RouteText"); dictionary.Remove("RouteText");
@ -296,7 +294,7 @@ namespace DeviceRepair.DataAccess
List<DeviceRouteInfo> RootDatas = db.Queryable<DeviceRouteInfo>().Where(x => x.Status).OrderBy(x => x.AutoID).ToList(); List<DeviceRouteInfo> RootDatas = db.Queryable<DeviceRouteInfo>().Where(x => x.Status).OrderBy(x => x.AutoID).ToList();
if (OEMORKH != "All") if (OEMORKH != "ALL")
{ {
List<int> waitDel = new List<int>(); List<int> waitDel = new List<int>();
foreach (var item in RootDatas) foreach (var item in RootDatas)

112
DeviceRepair.DataAccess/MaintenanceAccess.cs
View File

@ -1,4 +1,5 @@
using DeviceRepair.Models; using DeviceRepair.Models;
using DeviceRepair.Models.DeviceRepair.ExportView;
using SqlSugar; using SqlSugar;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -35,26 +36,15 @@ namespace DeviceRepair.DataAccess
var exp = Expressionable.Create<DeviceWarrantyRequestForm>(); var exp = Expressionable.Create<DeviceWarrantyRequestForm>();
if (FilterInfo != null) if (FilterInfo != null)
{ {
//exp.AndIF(!string.IsNullOrWhiteSpace(FilterInfo.EquipmentID), x => x.EquipmentID.Equals(FilterInfo.EquipmentID, StringComparison.CurrentCultureIgnoreCase));
//exp.AndIF(FilterInfo.StartTime.HasValue, x => x.CreatOn >= FilterInfo.StartTime.Value);
//exp.AndIF(FilterInfo.EndTime.HasValue, x => x.CreatOn <= FilterInfo.EndTime.Value);
//exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingRepair,
// x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID).NotAny());
//exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingApproval,
// x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0).Any());
//exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.BeComplate,
// x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0 && s.ValidateBy > 0).Any());
exp.AndIF(!string.IsNullOrWhiteSpace(FilterInfo.EquipmentID), x => x.EquipmentID.Contains(FilterInfo.EquipmentID)); exp.AndIF(!string.IsNullOrWhiteSpace(FilterInfo.EquipmentID), x => x.EquipmentID.Contains(FilterInfo.EquipmentID));
exp.AndIF(FilterInfo.StartTime.HasValue, x => x.CreatOn >= FilterInfo.StartTime.Value); exp.AndIF(FilterInfo.StartTime.HasValue, x => x.CreatOn >= FilterInfo.StartTime.Value);
exp.AndIF(FilterInfo.EndTime.HasValue, x => x.CreatOn <= FilterInfo.EndTime.Value); exp.AndIF(FilterInfo.EndTime.HasValue, x => x.CreatOn <= FilterInfo.EndTime.Value);
exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingRepair, exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingRepair,
x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID).NotAny()); x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID).NotAny());
exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingApproval, exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingApproval,
x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0).Any()); x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0).Any() && !SqlFunc.HasNumber(x.RestorationConfirmationBy));
exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.BeComplate, exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.BeComplate,
x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0 && s.ValidateBy > 0).Any()); x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0 && s.ValidateBy > 0).Any() && SqlFunc.HasNumber(x.RestorationConfirmationBy));
bool isDown = FilterInfo.DownStatus == DeviceRunningStatus.Stop; bool isDown = FilterInfo.DownStatus == DeviceRunningStatus.Stop;
exp.AndIF(FilterInfo.DownStatus != DeviceRunningStatus.All, exp.AndIF(FilterInfo.DownStatus != DeviceRunningStatus.All,
@ -571,5 +561,101 @@ namespace DeviceRepair.DataAccess
} }
return apiResponseData; return apiResponseData;
} }
public APIResponseData GetXlsxData(DeviceWarrantyRequestFormFilter FilterInfo)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = $"获取数据失败！" };
try
{
db.ChangeDatabase("main");
var exp = Expressionable.Create<DeviceWarrantyRequestForm>();
if (FilterInfo != null)
{
exp.AndIF(!string.IsNullOrWhiteSpace(FilterInfo.EquipmentID), x => x.EquipmentID.Contains(FilterInfo.EquipmentID));
exp.AndIF(FilterInfo.StartTime.HasValue, x => x.CreatOn >= FilterInfo.StartTime.Value);
exp.AndIF(FilterInfo.EndTime.HasValue, x => x.CreatOn <= FilterInfo.EndTime.Value);
exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingRepair,
x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID).NotAny());
exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.AwaitingApproval,
x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0).Any() && !SqlFunc.HasNumber(x.RestorationConfirmationBy));
exp.AndIF(FilterInfo.Status == DeviceWarrantyRequestFormStatus.BeComplate,
x => SqlFunc.Subqueryable<DeviceWarrantyRequestMaintaionInfo>().Where(s => s.FormID == x.AutoID && s.SubmitBy > 0 && s.ValidateBy > 0).Any() && SqlFunc.HasNumber(x.RestorationConfirmationBy));
bool isDown = FilterInfo.DownStatus == DeviceRunningStatus.Stop;
exp.AndIF(FilterInfo.DownStatus != DeviceRunningStatus.All,
x => x.IsDown == isDown);
}
List<DeviceWarrantyRequestForm> Datas = CurrentDb.AsQueryable().With(SqlWith.NoLock).Where(exp.ToExpression()).ToList();
Dictionary<int, UserInfoModel> Users = db.Queryable<UserInfoModel>().ToList().ToDictionary(x => x.AutoID, x => x);
Dictionary<int, FieldsInfo> Fields = db.Queryable<FieldsInfo>().ToList().ToDictionary(x => x.AutoID, x => x);
int i = 1;
List<MaintainOrderView> views = new List<MaintainOrderView>();
foreach (DeviceWarrantyRequestForm item in Datas)
{
MaintainOrderView view = new MaintainOrderView
{
AutoNumber = i,
Plant = 1303,
AutoID = item.AutoID,
EquipmentID = item.EquipmentID,
EquipmentName = item.EquipmentName,
FormCreatOnDate = item.CreatOn.Value.ToString("yyyy-M-dd"),
FormCreatOnTime = item.CreatOn.Value.ToString("HH:mm:ss"),
ReferenceOnDate = "",
ReferenceOnTime = "",
FaultSymptoms = item.FaultSymptoms
};
if (item.MaintaionItems != null && item.MaintaionItems.SubmitBy > 0)
{
DeviceWarrantyRequestMaintaionInfo repair = item.MaintaionItems;
view.RepairPersonnel = Users[repair.SubmitBy].RealName;
view.RepairStartDate = repair.MaintainStartTime.ToString("yyyy-M-dd");
view.RepairStartDate = repair.MaintainEndTime.ToString("yyyy-M-dd");
view.MaintainCause = repair.MaintainCause;
view.MaintainContent = repair.MaintainContent;
if (repair.AccessoriesItems == null || repair.AccessoriesItems.Count == 0)
{
view.Accessories = "N/A";
}
else
{
view.Accessories = string.Join(",", repair.AccessoriesItems.Select(x => x.FieldName).ToArray());
}
TimeSpan Downtime = repair.MaintainEndTime - item.CreatOn.Value;
view.Downtime = Downtime.Hours;
TimeSpan RepairDuration = repair.MaintainEndTime - repair.MaintainStartTime;
view.RepairDuration = RepairDuration.Hours;
view.Maintenance = Fields[repair.Maintenance].FieldText;
view.SymptomlDistinction = Fields[repair.SymptomlDistinction].FieldText;
view.ValidateNo = repair.BeValidate ? repair.ValidateNo : "N/A";
}
views.Add(view);
i++;
}
apiResponseData.Code = 1;
apiResponseData.Data = views;
apiResponseData.Message = "";
}
catch (SqlSugarException e)
{
apiResponseData.Code = -1;
apiResponseData.Message = e.Message;
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
} }
} }

18
DeviceRepair.DataAccess/RoleAccess.cs
View File

@ -129,6 +129,14 @@ namespace DeviceRepair.DataAccess
return apiResponseData; return apiResponseData;
} }
int RoleGroupUserCount = db.Queryable<UserInfoModel>().Count(x => x.RoleGroup == RoleID);
if (RoleGroupUserCount == 0)
{
apiResponseData.Code = 1;
apiResponseData.Message = "操作成功！";
return apiResponseData;
}
int Count = db.Updateable<UserInfoModel>() int Count = db.Updateable<UserInfoModel>()
.SetColumns(x => new UserInfoModel() { RoleGroup = 0, ModifyBy = Operation.Operator, ModifyDate = CurrentDate }) .SetColumns(x => new UserInfoModel() { RoleGroup = 0, ModifyBy = Operation.Operator, ModifyDate = CurrentDate })
.Where(x => x.RoleGroup == RoleID).ExecuteCommand(); .Where(x => x.RoleGroup == RoleID).ExecuteCommand();
@ -174,6 +182,14 @@ namespace DeviceRepair.DataAccess
return apiResponseData; return apiResponseData;
} }
int RoleAuthCount = db.Queryable<RoleAuthModel>().Count(x => x.RoleID == RoleID);
if (RoleAuthCount == 0)
{
apiResponseData.Code = 1;
apiResponseData.Message = "操作成功！";
return apiResponseData;
}
int Count = db.Deleteable<RoleAuthModel>().Where(x => x.RoleID == RoleID).ExecuteCommand(); int Count = db.Deleteable<RoleAuthModel>().Where(x => x.RoleID == RoleID).ExecuteCommand();
if (Count <= 0) if (Count <= 0)
@ -563,7 +579,7 @@ namespace DeviceRepair.DataAccess
db.ChangeDatabase("main"); db.ChangeDatabase("main");
var Datas = db.Queryable<UserInfoModel, RoleAuthModel, AuthModel >((us, ra, au) => new object[] { var Datas = db.Queryable<UserInfoModel, RoleAuthModel, AuthModel>((us, ra, au) => new object[] {
JoinType.Inner,us.RoleGroup == ra.RoleID, JoinType.Inner,us.RoleGroup == ra.RoleID,
JoinType.Inner,au.AutoID == ra.AuthID, JoinType.Inner,au.AutoID == ra.AuthID,
}).Where((us, ra, au) => UserAutoID == us.AutoID) }).Where((us, ra, au) => UserAutoID == us.AutoID)

2
DeviceRepair.DataAccess/TsSFCAccess.cs
View File

@ -71,7 +71,7 @@ namespace DeviceRepair.DataAccess
int PostType = -1; int PostType = -1;
if (Datas.Any(x => x.PostName == "OEM-QE")) if (Datas.Any(x => x.PostName == "OEM-QE"))
PostType = 1; PostType = 0;
if (Datas.Any(x => x.PostName == "OEM-PE")) if (Datas.Any(x => x.PostName == "OEM-PE"))
PostType = 1; PostType = 1;

57
DeviceRepair.DataAccess/UserAccess.cs
View File

@ -424,6 +424,63 @@ namespace DeviceRepair.DataAccess
} }
} }
/// <summary>
/// 使用默认密码重置
/// </summary>
/// <param name="LoginCode"></param>
/// <returns></returns>
public APIResponseData ReprovisionDefaultPassword(string LoginCode, HeaderModel Operation, string PassWord = "", bool UserDefalutPwd = true)
{
APIResponseData result = new APIResponseData { Code = -1, Message = "操作失败！" };
try
{
if (!UserDefalutPwd && string.IsNullOrWhiteSpace(PassWord))
throw new Exception("重置的新密码不能为空！");
base.db.ChangeDatabase("main");
DateTime CurrentDate = DateTime.Now;
UserInfoModel m = db.Queryable<UserInfoModel>().Single(x => x.LoginCode == LoginCode);
if (m == null)
return new APIResponseData { Code = -1, Message = "账户不存在！" };
if (UserDefalutPwd)
PassWord = EncryptionHelper.EncryptByMD5(DefaultConstValue.USER_DEFAULT_PASSWORD_RESET);
base.db.ChangeDatabase("main");
if (db.Updateable(m).UpdateColumns(it => new { it.PassWord, it.ModifyDate, it.ModifyBy, it.LastPwdAlterTime })
.ReSetValue(it => it.PassWord == PassWord)
.ReSetValue(it => it.ModifyBy == Operation.Operator)
.ReSetValue(it => it.ModifyDate == CurrentDate)
.ReSetValue(it => it.LastPwdAlterTime == CurrentDate).ExecuteCommand() > 0)
{
base.db.ChangeDatabase("log");
UserPassChangeLogInfo log = new UserPassChangeLogInfo
{
LoginCode = m.LoginCode,
OperationComputer = Operation.ClientName,
OperationDate = CurrentDate,
OperationIP = Operation.IPAddress,
OperationType = $"{(UserDefalutPwd ? "使用默认" : "使用随机")}密码重置",
OperationUser = Operation.Operator,
OperationUserName = Operation.OperatorName,
PwdNew = PassWord,
PwdOld = m.PassWord,
UserAutoID = m.AutoID
};
db.Insertable(log).ExecuteCommand();
return new APIResponseData { Code = 1, Message = "操作成功！" };
}
return result;
}
catch (Exception e)
{
return new APIResponseData { Code = -1, Message = e.Message };
}
}
/// <summary> /// <summary>
/// 用户修改 /// 用户修改

11
DeviceRepair.Models/DefaultConstValue.cs Normal file
View File

@ -0,0 +1,11 @@
namespace DeviceRepair.Models
{
public static class DefaultConstValue
{
/// <summary>
/// 重置用户时用的默认密码
/// </summary>
public const string USER_DEFAULT_PASSWORD_RESET = "Kanghui1";
}
}

2
DeviceRepair.Models/DeviceRepair.Models.csproj
View File

@ -60,6 +60,7 @@
<Compile Include="Common\SheetDataItem.cs" /> <Compile Include="Common\SheetDataItem.cs" />
<Compile Include="Common\SysConfigInfo.cs" /> <Compile Include="Common\SysConfigInfo.cs" />
<Compile Include="Common\SysEmailConfigInfo.cs" /> <Compile Include="Common\SysEmailConfigInfo.cs" />
<Compile Include="DefaultConstValue.cs" />
<Compile Include="DeviceRepair\DeviceRunningStatus.cs" /> <Compile Include="DeviceRepair\DeviceRunningStatus.cs" />
<Compile Include="DeviceRepair\DeviceWarrantyEvaluatorInfo.cs" /> <Compile Include="DeviceRepair\DeviceWarrantyEvaluatorInfo.cs" />
<Compile Include="DeviceRepair\DeviceWarrantyRequestAccessoriesInfo.cs" /> <Compile Include="DeviceRepair\DeviceWarrantyRequestAccessoriesInfo.cs" />
@ -67,6 +68,7 @@
<Compile Include="DeviceRepair\DeviceWarrantyRequestFormFilter.cs" /> <Compile Include="DeviceRepair\DeviceWarrantyRequestFormFilter.cs" />
<Compile Include="DeviceRepair\DeviceWarrantyRequestFormStatus.cs" /> <Compile Include="DeviceRepair\DeviceWarrantyRequestFormStatus.cs" />
<Compile Include="DeviceRepair\DeviceWarrantyRequestMaintaionInfo.cs" /> <Compile Include="DeviceRepair\DeviceWarrantyRequestMaintaionInfo.cs" />
<Compile Include="DeviceRepair\ExportView\MaintainOrderView.cs" />
<Compile Include="DeviceRepair\View\DeviceWarrantyRequestFormView.cs" /> <Compile Include="DeviceRepair\View\DeviceWarrantyRequestFormView.cs" />
<Compile Include="DeviceRepair\View\DeviceWarrantyRequestMaintaionView.cs" /> <Compile Include="DeviceRepair\View\DeviceWarrantyRequestMaintaionView.cs" />
<Compile Include="Device\DeviceAnnPlanView.cs" /> <Compile Include="Device\DeviceAnnPlanView.cs" />

12
DeviceRepair.Models/DeviceRepair/DeviceWarrantyRequestFormStatus.cs
View File

@ -4,12 +4,24 @@ namespace DeviceRepair.Models
{ {
public enum DeviceWarrantyRequestFormStatus public enum DeviceWarrantyRequestFormStatus
{ {
/// <summary>
/// 待维修
/// </summary>
[Description("待维修")] [Description("待维修")]
AwaitingRepair, AwaitingRepair,
/// <summary>
/// 待审核
/// </summary>
[Description("待审核")] [Description("待审核")]
AwaitingApproval, AwaitingApproval,
/// <summary>
/// 已完成
/// </summary>
[Description("已完成")] [Description("已完成")]
BeComplate, BeComplate,
/// <summary>
/// 全部
/// </summary>
[Description("全部")] [Description("全部")]
All All
} }

134
DeviceRepair.Models/DeviceRepair/ExportView/MaintainOrderView.cs Normal file
View File

@ -0,0 +1,134 @@
using System;
using System.ComponentModel;
namespace DeviceRepair.Models.DeviceRepair.ExportView
{
public class MaintainOrderView
{
/// <summary>
/// 序号
/// </summary>
[Description("No.\n序号")]
public int AutoNumber { get; set; }
/// <summary>
/// 工厂
/// </summary>
[Description("Plant\n工厂")]
public int Plant { get; set; }
/// <summary>
/// 订单
/// </summary>
[Description("Orde\n订单")]
public int AutoID { get; set; }
/// <summary>
/// 技术标识号
/// </summary>
[Description("Technical identification number\n技术标识号")]
public string EquipmentID { get; set; }
/// <summary>
/// 技术对象描述
/// </summary>
[Description("Technical object description\n技术对象描述")]
public string EquipmentName { get; set; }
/// <summary>
/// 实际下达日期
/// </summary>
[Description("Actual order date Month/day\n实际下达日期")]
public string FormCreatOnDate { get; set; }
/// <summary>
/// 基本开始时间
/// </summary>
[Description("Basic start time\n基本开始时间")]
public string FormCreatOnTime { get; set; }
/// <summary>
/// 参考日期
/// </summary>
[Description("Reference date Month/day\n参考日期")]
public string ReferenceOnDate { get; set; }
/// <summary>
/// 参考时间
/// </summary>
[Description("Reference time\n参考时间")]
public string ReferenceOnTime { get; set; }
/// <summary>
/// 故障描述
/// </summary>
[Description("Failure description\n故障描述")]
public string FaultSymptoms { get; set; }
/// <summary>
/// 维修人员
/// </summary>
[Description("Repair personnel\n维修人员")]
public string RepairPersonnel { get; set; }
/// <summary>
/// 修理开始时间月/日
/// </summary>
[Description("Repair Start Time\n修理开始时间月/日")]
public string RepairStartDate { get; set; }
/// <summary>
/// 修理完成时间月/日
/// </summary>
[Description("Repair finish Time\n修理完成时间月/日")]
public string RepairFinishDate { get; set; }
/// <summary>
/// 故障原因
/// </summary>
[Description("Fault Cause \n故障原因")]
public string MaintainCause { get; set; }
/// <summary>
/// 维修内容
/// </summary>
[Description("Repair Contents\n维修内容")]
public string MaintainContent { get; set; }
/// <summary>
/// 配件
/// </summary>
[Description("Replacement Accessories\n配件")]
public string Accessories { get; set; }
/// <summary>
/// 停机时长（H）
/// </summary>
[Description("Downtime\n停机时长\n（H）")]
public decimal Downtime { get; set; }
/// <summary>
/// 维修工时（H）
/// </summary>
[Description("Repair Duration\n维修工时\n（H）")]
public decimal RepairDuration { get; set; }
/// <summary>
/// 维修方式
/// </summary>
[Description("maintenance mode\n维修方式")]
public string Maintenance { get; set; }
/// <summary>
/// 现象区分
/// </summary>
[Description("Fault symptom differentiation\n现象区分")]
public string SymptomlDistinction { get; set; }
/// <summary>
/// 验证编号
/// </summary>
[Description("Verification number\n验证编号")]
public string ValidateNo { get; set; }
}
}

35
DeviceRepairAndOptimization/Biz/MaintenanceManager.cs
View File

@ -206,5 +206,40 @@ namespace DeviceRepairAndOptimization.Biz
} }
return apiResponseData; return apiResponseData;
} }
/// <summary>
/// 设备维修列表导出
/// </summary>
/// <param name="FilterInfo"></param>
/// <returns></returns>
public APIResponseData GetXlsxData(DeviceWarrantyRequestFormFilter FilterInfo)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "未能获取到数据！" };
try
{
switch (DeviceRepair.Utils.Config.Configurations.Properties.ConnType?.ToLower())
{
case "api":
apiResponseData = ApiHelper.Instance.SendMessage(new HttpItem
{
URL = $"{ServiceRouteConstValue.GetXlsxData}",
Method = "Post",
ContentType = "application/json; charset=utf-8",
Postdata = JsonConvert.SerializeObject(FilterInfo),
});
break;
default:
apiResponseData = MaintenanceAccess.Instance.GetDatas(FilterInfo);
break;
}
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
} }
} }

45
DeviceRepairAndOptimization/Biz/UserManager.cs
View File

@ -179,6 +179,51 @@ namespace DeviceRepairAndOptimization.Biz
return apiResponseData; return apiResponseData;
} }
/// <summary>
/// 使用默认密码重置
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public APIResponseData ReprovisionDefaultPassword(string LoginCode, string PassWord = "", bool UserDefalutPwd = true)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "账户或密码不正确！" };
try
{
switch (DeviceRepair.Utils.Config.Configurations.Properties.ConnType?.ToLower())
{
case "api":
#region api
apiResponseData = ApiHelper.Instance.SendMessage(new HttpItem
{
URL = $"{ServiceRouteConstValue.ReprovisionDefaultPassword}?LoginCode={LoginCode}&PassWord={PassWord}",
Method = "Post",
ContentType = "application/x-www-form-urlencoded",
});
#endregion
break;
case "sql":
#region sql
apiResponseData = UserAccess.Instance.ReprovisionDefaultPassword(LoginCode, GlobalInfo.OperationInfo, PassWord, UserDefalutPwd);
#endregion
break;
default:
break;
}
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
/// <summary> /// <summary>
/// 查询最后修改密码时间 /// 查询最后修改密码时间
/// </summary> /// </summary>

4
DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.cs
View File

@ -351,7 +351,7 @@ namespace DeviceRepairAndOptimization.Pages.CustomField
if (CurrentFieldInfo == null) if (CurrentFieldInfo == null)
throw new Exception("请选择字段所在行！"); throw new Exception("请选择字段所在行！");
string RoleCode = $"BIZ_FIELD_{FieldCode.ToUpper()}_EDIT"; string RoleCode = $"BIZ_FIELD_{FieldCode.ToUpper()}_STATUS";
if (!GlobalInfo.HasRole(RoleCode)) if (!GlobalInfo.HasRole(RoleCode))
{ {
throw new Exception($"当前账号缺少此操作的权限"); throw new Exception($"当前账号缺少此操作的权限");
@ -382,7 +382,7 @@ namespace DeviceRepairAndOptimization.Pages.CustomField
if (string.IsNullOrWhiteSpace(DescriptionValue)) if (string.IsNullOrWhiteSpace(DescriptionValue))
throw new Exception("原因不能为空，是否继续操作？"); throw new Exception("原因不能为空，是否继续操作？");
if (DescriptionValue.Length >= 3800) if (DescriptionValue.Length >= 400)
throw new Exception("原因描述超出长度，最大长度为200！"); throw new Exception("原因描述超出长度，最大长度为200！");
bool BeStatus = !CurrentFieldInfo.Status; bool BeStatus = !CurrentFieldInfo.Status;

121
DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.Designer.cs generated
View File

@ -111,15 +111,15 @@
columnDefinition2.Width = 100D; columnDefinition2.Width = 100D;
Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition2}); columnDefinition2});
rowDefinition4.Height = 200D; rowDefinition4.Height = 167D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Absolute; rowDefinition4.SizeType = System.Windows.Forms.SizeType.Absolute;
rowDefinition5.Height = 50D; rowDefinition5.Height = 42D;
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Absolute; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Absolute;
rowDefinition6.Height = 50D; rowDefinition6.Height = 42D;
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Absolute; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Absolute;
rowDefinition7.Height = 50D; rowDefinition7.Height = 42D;
rowDefinition7.SizeType = System.Windows.Forms.SizeType.Absolute; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Absolute;
rowDefinition8.Height = 50D; rowDefinition8.Height = 42D;
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Absolute; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Absolute;
Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition4, rowDefinition4,
@ -127,16 +127,16 @@
rowDefinition6, rowDefinition6,
rowDefinition7, rowDefinition7,
rowDefinition8}); rowDefinition8});
Root.Size = new System.Drawing.Size(608, 437); Root.Size = new System.Drawing.Size(473, 364);
Root.TextVisible = false; Root.TextVisible = false;
// //
// layoutControlItem1 // layoutControlItem1
// //
this.layoutControlItem1.Control = stackPanel1; this.layoutControlItem1.Control = stackPanel1;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 350); this.layoutControlItem1.Location = new System.Drawing.Point(0, 293);
this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem1.Size = new System.Drawing.Size(588, 67); this.layoutControlItem1.Size = new System.Drawing.Size(457, 55);
this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem1.TextVisible = false; this.layoutControlItem1.TextVisible = false;
// //
@ -145,25 +145,28 @@
stackPanel1.Controls.Add(this.btn_Cancel); stackPanel1.Controls.Add(this.btn_Cancel);
stackPanel1.Controls.Add(this.btn_Submit); stackPanel1.Controls.Add(this.btn_Submit);
stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft; stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft;
stackPanel1.Location = new System.Drawing.Point(12, 362); stackPanel1.Location = new System.Drawing.Point(10, 303);
stackPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
stackPanel1.Name = "stackPanel1"; stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(584, 63); stackPanel1.Size = new System.Drawing.Size(453, 51);
stackPanel1.TabIndex = 4; stackPanel1.TabIndex = 4;
// //
// btn_Cancel // btn_Cancel
// //
this.btn_Cancel.Location = new System.Drawing.Point(487, 17); this.btn_Cancel.Location = new System.Drawing.Point(378, 13);
this.btn_Cancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btn_Cancel.Name = "btn_Cancel"; this.btn_Cancel.Name = "btn_Cancel";
this.btn_Cancel.Size = new System.Drawing.Size(94, 29); this.btn_Cancel.Size = new System.Drawing.Size(73, 24);
this.btn_Cancel.TabIndex = 0; this.btn_Cancel.TabIndex = 0;
this.btn_Cancel.Text = "取消"; this.btn_Cancel.Text = "取消";
this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click); this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
// //
// btn_Submit // btn_Submit
// //
this.btn_Submit.Location = new System.Drawing.Point(387, 17); this.btn_Submit.Location = new System.Drawing.Point(301, 13);
this.btn_Submit.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btn_Submit.Name = "btn_Submit"; this.btn_Submit.Name = "btn_Submit";
this.btn_Submit.Size = new System.Drawing.Size(94, 29); this.btn_Submit.Size = new System.Drawing.Size(73, 24);
this.btn_Submit.TabIndex = 1; this.btn_Submit.TabIndex = 1;
this.btn_Submit.Text = "提交"; this.btn_Submit.Text = "提交";
this.btn_Submit.Click += new System.EventHandler(this.btn_Submit_Click); this.btn_Submit.Click += new System.EventHandler(this.btn_Submit_Click);
@ -173,16 +176,17 @@
this.layoutControlItem2.Control = panelControl1; this.layoutControlItem2.Control = panelControl1;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(588, 200); this.layoutControlItem2.Size = new System.Drawing.Size(457, 167);
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false; this.layoutControlItem2.TextVisible = false;
// //
// panelControl1 // panelControl1
// //
panelControl1.Controls.Add(groupBox1); panelControl1.Controls.Add(groupBox1);
panelControl1.Location = new System.Drawing.Point(12, 12); panelControl1.Location = new System.Drawing.Point(10, 10);
panelControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
panelControl1.Name = "panelControl1"; panelControl1.Name = "panelControl1";
panelControl1.Size = new System.Drawing.Size(584, 196); panelControl1.Size = new System.Drawing.Size(453, 163);
panelControl1.TabIndex = 5; panelControl1.TabIndex = 5;
// //
// groupBox1 // groupBox1
@ -190,8 +194,10 @@
groupBox1.Controls.Add(this.layoutControl2); groupBox1.Controls.Add(this.layoutControl2);
groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
groupBox1.Location = new System.Drawing.Point(2, 2); groupBox1.Location = new System.Drawing.Point(2, 2);
groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
groupBox1.Name = "groupBox1"; groupBox1.Name = "groupBox1";
groupBox1.Size = new System.Drawing.Size(580, 192); groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
groupBox1.Size = new System.Drawing.Size(449, 159);
groupBox1.TabIndex = 0; groupBox1.TabIndex = 0;
groupBox1.TabStop = false; groupBox1.TabStop = false;
groupBox1.Text = "点检表信息"; groupBox1.Text = "点检表信息";
@ -202,7 +208,8 @@
this.layoutControl2.Controls.Add(this.txt_Number); this.layoutControl2.Controls.Add(this.txt_Number);
this.layoutControl2.Controls.Add(this.txt_Rev); this.layoutControl2.Controls.Add(this.txt_Rev);
this.layoutControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl2.Location = new System.Drawing.Point(3, 20); this.layoutControl2.Location = new System.Drawing.Point(2, 16);
this.layoutControl2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.layoutControl2.Name = "layoutControl2"; this.layoutControl2.Name = "layoutControl2";
this.layoutControl2.OptionsPrint.AppearanceGroupCaption.BackColor = System.Drawing.Color.LightGray; this.layoutControl2.OptionsPrint.AppearanceGroupCaption.BackColor = System.Drawing.Color.LightGray;
this.layoutControl2.OptionsPrint.AppearanceGroupCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F); this.layoutControl2.OptionsPrint.AppearanceGroupCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F);
@ -212,41 +219,44 @@
this.layoutControl2.OptionsPrint.AppearanceGroupCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControl2.OptionsPrint.AppearanceGroupCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControl2.OptionsPrint.AppearanceGroupCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; this.layoutControl2.OptionsPrint.AppearanceGroupCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControl2.Root = this.layoutControlGroup1; this.layoutControl2.Root = this.layoutControlGroup1;
this.layoutControl2.Size = new System.Drawing.Size(574, 169); this.layoutControl2.Size = new System.Drawing.Size(445, 141);
this.layoutControl2.TabIndex = 0; this.layoutControl2.TabIndex = 0;
this.layoutControl2.Text = "layoutControl2"; this.layoutControl2.Text = "layoutControl2";
// //
// txt_FormName // txt_FormName
// //
this.txt_FormName.Location = new System.Drawing.Point(84, 18); this.txt_FormName.Location = new System.Drawing.Point(67, 15);
this.txt_FormName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txt_FormName.Name = "txt_FormName"; this.txt_FormName.Name = "txt_FormName";
this.txt_FormName.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.txt_FormName.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.txt_FormName.Properties.Appearance.Options.UseFont = true; this.txt_FormName.Properties.Appearance.Options.UseFont = true;
this.txt_FormName.Properties.ReadOnly = true; this.txt_FormName.Properties.ReadOnly = true;
this.txt_FormName.Size = new System.Drawing.Size(478, 32); this.txt_FormName.Size = new System.Drawing.Size(368, 26);
this.txt_FormName.StyleController = this.layoutControl2; this.txt_FormName.StyleController = this.layoutControl2;
this.txt_FormName.TabIndex = 6; this.txt_FormName.TabIndex = 6;
// //
// txt_Number // txt_Number
// //
this.txt_Number.Location = new System.Drawing.Point(84, 68); this.txt_Number.Location = new System.Drawing.Point(67, 57);
this.txt_Number.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txt_Number.Name = "txt_Number"; this.txt_Number.Name = "txt_Number";
this.txt_Number.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.txt_Number.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.txt_Number.Properties.Appearance.Options.UseFont = true; this.txt_Number.Properties.Appearance.Options.UseFont = true;
this.txt_Number.Properties.ReadOnly = true; this.txt_Number.Properties.ReadOnly = true;
this.txt_Number.Size = new System.Drawing.Size(478, 32); this.txt_Number.Size = new System.Drawing.Size(368, 26);
this.txt_Number.StyleController = this.layoutControl2; this.txt_Number.StyleController = this.layoutControl2;
this.txt_Number.TabIndex = 5; this.txt_Number.TabIndex = 5;
// //
// txt_Rev // txt_Rev
// //
this.txt_Rev.Anchor = System.Windows.Forms.AnchorStyles.Left; this.txt_Rev.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.txt_Rev.Location = new System.Drawing.Point(84, 118); this.txt_Rev.Location = new System.Drawing.Point(67, 99);
this.txt_Rev.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txt_Rev.Name = "txt_Rev"; this.txt_Rev.Name = "txt_Rev";
this.txt_Rev.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.txt_Rev.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.txt_Rev.Properties.Appearance.Options.UseFont = true; this.txt_Rev.Properties.Appearance.Options.UseFont = true;
this.txt_Rev.Properties.ReadOnly = true; this.txt_Rev.Properties.ReadOnly = true;
this.txt_Rev.Size = new System.Drawing.Size(478, 32); this.txt_Rev.Size = new System.Drawing.Size(368, 26);
this.txt_Rev.StyleController = this.layoutControl2; this.txt_Rev.StyleController = this.layoutControl2;
this.txt_Rev.TabIndex = 4; this.txt_Rev.TabIndex = 4;
// //
@ -274,18 +284,18 @@
rowDefinition1, rowDefinition1,
rowDefinition2, rowDefinition2,
rowDefinition3}); rowDefinition3});
this.layoutControlGroup1.Size = new System.Drawing.Size(574, 169); this.layoutControlGroup1.Size = new System.Drawing.Size(445, 141);
this.layoutControlGroup1.TextVisible = false; this.layoutControlGroup1.TextVisible = false;
// //
// 文档编号 // 文档编号
// //
this.文档编号.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; this.文档编号.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.文档编号.Control = this.txt_Number; this.文档编号.Control = this.txt_Number;
this.文档编号.Location = new System.Drawing.Point(0, 49); this.文档编号.Location = new System.Drawing.Point(0, 41);
this.文档编号.Name = "文档编号"; this.文档编号.Name = "文档编号";
this.文档编号.OptionsTableLayoutItem.RowIndex = 1; this.文档编号.OptionsTableLayoutItem.RowIndex = 1;
this.文档编号.Size = new System.Drawing.Size(554, 50); this.文档编号.Size = new System.Drawing.Size(429, 42);
this.文档编号.TextSize = new System.Drawing.Size(60, 18); this.文档编号.TextSize = new System.Drawing.Size(48, 15);
// //
// 文档名称 // 文档名称
// //
@ -293,38 +303,39 @@
this.文档名称.Control = this.txt_FormName; this.文档名称.Control = this.txt_FormName;
this.文档名称.Location = new System.Drawing.Point(0, 0); this.文档名称.Location = new System.Drawing.Point(0, 0);
this.文档名称.Name = "文档名称"; this.文档名称.Name = "文档名称";
this.文档名称.Size = new System.Drawing.Size(554, 49); this.文档名称.Size = new System.Drawing.Size(429, 41);
this.文档名称.TextSize = new System.Drawing.Size(60, 18); this.文档名称.TextSize = new System.Drawing.Size(48, 15);
// //
// 版本 // 版本
// //
this.版本.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; this.版本.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.版本.Control = this.txt_Rev; this.版本.Control = this.txt_Rev;
this.版本.Location = new System.Drawing.Point(0, 99); this.版本.Location = new System.Drawing.Point(0, 83);
this.版本.Name = "版本"; this.版本.Name = "版本";
this.版本.OptionsTableLayoutItem.RowIndex = 2; this.版本.OptionsTableLayoutItem.RowIndex = 2;
this.版本.Size = new System.Drawing.Size(554, 50); this.版本.Size = new System.Drawing.Size(429, 42);
this.版本.TextSize = new System.Drawing.Size(60, 18); this.版本.TextSize = new System.Drawing.Size(48, 15);
// //
// 说明 // 说明
// //
this.说明.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; this.说明.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.说明.Control = this.txt_Remark; this.说明.Control = this.txt_Remark;
this.说明.Location = new System.Drawing.Point(0, 300); this.说明.Location = new System.Drawing.Point(0, 251);
this.说明.Name = "说明"; this.说明.Name = "说明";
this.说明.OptionsTableLayoutItem.RowIndex = 3; this.说明.OptionsTableLayoutItem.RowIndex = 3;
this.说明.Size = new System.Drawing.Size(588, 50); this.说明.Size = new System.Drawing.Size(457, 42);
this.说明.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize; this.说明.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
this.说明.TextSize = new System.Drawing.Size(124, 18); this.说明.TextSize = new System.Drawing.Size(96, 15);
this.说明.TextToControlDistance = 5; this.说明.TextToControlDistance = 5;
// //
// txt_Remark // txt_Remark
// //
this.txt_Remark.Location = new System.Drawing.Point(141, 319); this.txt_Remark.Location = new System.Drawing.Point(111, 267);
this.txt_Remark.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txt_Remark.Name = "txt_Remark"; this.txt_Remark.Name = "txt_Remark";
this.txt_Remark.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.txt_Remark.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.txt_Remark.Properties.Appearance.Options.UseFont = true; this.txt_Remark.Properties.Appearance.Options.UseFont = true;
this.txt_Remark.Size = new System.Drawing.Size(455, 32); this.txt_Remark.Size = new System.Drawing.Size(352, 26);
this.txt_Remark.StyleController = this.layoutControl1; this.txt_Remark.StyleController = this.layoutControl1;
this.txt_Remark.TabIndex = 7; this.txt_Remark.TabIndex = 7;
// //
@ -337,6 +348,7 @@
this.layoutControl1.Controls.Add(this.radioGroup1); this.layoutControl1.Controls.Add(this.radioGroup1);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.Location = new System.Drawing.Point(0, 0); this.layoutControl1.Location = new System.Drawing.Point(0, 0);
this.layoutControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(939, 128, 812, 500); this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(939, 128, 812, 500);
this.layoutControl1.OptionsPrint.AppearanceGroupCaption.BackColor = System.Drawing.Color.LightGray; this.layoutControl1.OptionsPrint.AppearanceGroupCaption.BackColor = System.Drawing.Color.LightGray;
@ -347,20 +359,21 @@
this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControl1.Root = Root; this.layoutControl1.Root = Root;
this.layoutControl1.Size = new System.Drawing.Size(608, 437); this.layoutControl1.Size = new System.Drawing.Size(473, 364);
this.layoutControl1.TabIndex = 0; this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1"; this.layoutControl1.Text = "layoutControl1";
// //
// txt_FilePath // txt_FilePath
// //
this.txt_FilePath.Location = new System.Drawing.Point(141, 269); this.txt_FilePath.Location = new System.Drawing.Point(111, 225);
this.txt_FilePath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txt_FilePath.Name = "txt_FilePath"; this.txt_FilePath.Name = "txt_FilePath";
this.txt_FilePath.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.txt_FilePath.Properties.Appearance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.txt_FilePath.Properties.Appearance.Options.UseFont = true; this.txt_FilePath.Properties.Appearance.Options.UseFont = true;
this.txt_FilePath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { this.txt_FilePath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()}); new DevExpress.XtraEditors.Controls.EditorButton()});
this.txt_FilePath.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_FilePath.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_FilePath.Size = new System.Drawing.Size(455, 32); this.txt_FilePath.Size = new System.Drawing.Size(352, 26);
this.txt_FilePath.StyleController = this.layoutControl1; this.txt_FilePath.StyleController = this.layoutControl1;
this.txt_FilePath.TabIndex = 6; this.txt_FilePath.TabIndex = 6;
this.txt_FilePath.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.txt_FilePath_ButtonClick); this.txt_FilePath.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.txt_FilePath_ButtonClick);
@ -368,13 +381,14 @@
// radioGroup1 // radioGroup1
// //
this.radioGroup1.EditValue = 1; this.radioGroup1.EditValue = 1;
this.radioGroup1.Location = new System.Drawing.Point(141, 212); this.radioGroup1.Location = new System.Drawing.Point(111, 177);
this.radioGroup1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.radioGroup1.Name = "radioGroup1"; this.radioGroup1.Name = "radioGroup1";
this.radioGroup1.Properties.GlyphAlignment = DevExpress.Utils.HorzAlignment.Default; this.radioGroup1.Properties.GlyphAlignment = DevExpress.Utils.HorzAlignment.Default;
this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0047.03", "FM-P0047.03"), new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0047.03", "FM-P0047.03"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0079.02", "FM-P0079.02")}); new DevExpress.XtraEditors.Controls.RadioGroupItem("FM-P0079.02", "FM-P0079.02")});
this.radioGroup1.Size = new System.Drawing.Size(455, 46); this.radioGroup1.Size = new System.Drawing.Size(352, 38);
this.radioGroup1.StyleController = this.layoutControl1; this.radioGroup1.StyleController = this.layoutControl1;
this.radioGroup1.TabIndex = 8; this.radioGroup1.TabIndex = 8;
// //
@ -382,24 +396,24 @@
// //
this.文件路径.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; this.文件路径.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.文件路径.Control = this.txt_FilePath; this.文件路径.Control = this.txt_FilePath;
this.文件路径.Location = new System.Drawing.Point(0, 250); this.文件路径.Location = new System.Drawing.Point(0, 209);
this.文件路径.Name = "文件路径"; this.文件路径.Name = "文件路径";
this.文件路径.OptionsTableLayoutItem.RowIndex = 2; this.文件路径.OptionsTableLayoutItem.RowIndex = 2;
this.文件路径.Size = new System.Drawing.Size(588, 50); this.文件路径.Size = new System.Drawing.Size(457, 42);
this.文件路径.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize; this.文件路径.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
this.文件路径.TextSize = new System.Drawing.Size(124, 18); this.文件路径.TextSize = new System.Drawing.Size(96, 15);
this.文件路径.TextToControlDistance = 5; this.文件路径.TextToControlDistance = 5;
// //
// layoutControlItem3 // layoutControlItem3
// //
this.layoutControlItem3.Control = this.radioGroup1; this.layoutControlItem3.Control = this.radioGroup1;
this.layoutControlItem3.Location = new System.Drawing.Point(0, 200); this.layoutControlItem3.Location = new System.Drawing.Point(0, 167);
this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem3.Size = new System.Drawing.Size(588, 50); this.layoutControlItem3.Size = new System.Drawing.Size(457, 42);
this.layoutControlItem3.Text = "文件版本"; this.layoutControlItem3.Text = "文件版本";
this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize; this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
this.layoutControlItem3.TextSize = new System.Drawing.Size(124, 18); this.layoutControlItem3.TextSize = new System.Drawing.Size(96, 15);
this.layoutControlItem3.TextToControlDistance = 5; this.layoutControlItem3.TextToControlDistance = 5;
// //
// xtraOpenFileDialog1 // xtraOpenFileDialog1
@ -412,13 +426,14 @@
// //
// Page_FormVersionAdd // Page_FormVersionAdd
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(608, 437); this.ClientSize = new System.Drawing.Size(473, 364);
this.Controls.Add(this.layoutControl1); this.Controls.Add(this.layoutControl1);
this.DoubleBuffered = true; this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.IconOptions.Image = global::DeviceRepairAndOptimization.Properties.Resources.edit_16x16; this.IconOptions.Image = global::DeviceRepairAndOptimization.Properties.Resources.edit_16x16;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Page_FormVersionAdd"; this.Name = "Page_FormVersionAdd";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Page_FormVersionAdd"; this.Text = "Page_FormVersionAdd";

2
DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.cs
View File

@ -61,6 +61,7 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion
//暂时禁用,后面改为替换 //暂时禁用,后面改为替换
txt_FilePath.Enabled = false; txt_FilePath.Enabled = false;
radioGroup1.Enabled = false;
txt_FormName.Text = subData.FormName; txt_FormName.Text = subData.FormName;
txt_Number.Text = subData.VersionCode; txt_Number.Text = subData.VersionCode;
txt_Rev.Text = subData.VersionRev; txt_Rev.Text = subData.VersionRev;
@ -136,6 +137,7 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion
{ {
splashScreenManager1.TryCloseWait(); splashScreenManager1.TryCloseWait();
XtraMessageBoxHelper.Error(ex.Message); XtraMessageBoxHelper.Error(ex.Message);
return;
} }
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;

2
DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionAdd.resx
View File

@ -130,6 +130,6 @@
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="xtraOpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="xtraOpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value> <value>205, 17</value>
</metadata> </metadata>
</root> </root>

10
DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.Designer.cs generated
View File

@ -99,7 +99,7 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel1.RowCount = 2; 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.Absolute, 48F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); 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.TabIndex = 0;
// //
// gridControl1 // gridControl1
@ -111,7 +111,7 @@ namespace DeviceRepairAndOptimization.Pages
this.gridControl1.Name = "gridControl1"; this.gridControl1.Name = "gridControl1";
this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.Operations}); this.Operations});
this.gridControl1.Size = new System.Drawing.Size(1592, 862); this.gridControl1.Size = new System.Drawing.Size(1848, 862);
this.gridControl1.TabIndex = 1; this.gridControl1.TabIndex = 1;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1}); this.gridView1});
@ -249,7 +249,7 @@ namespace DeviceRepairAndOptimization.Pages
flowLayoutPanel1.Controls.Add(this.btn_Filter); flowLayoutPanel1.Controls.Add(this.btn_Filter);
flowLayoutPanel1.Controls.Add(this.EditSearch); flowLayoutPanel1.Controls.Add(this.EditSearch);
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
flowLayoutPanel1.Location = new System.Drawing.Point(1198, 0); flowLayoutPanel1.Location = new System.Drawing.Point(1454, 0);
flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel1.Name = "flowLayoutPanel1"; flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Size = new System.Drawing.Size(400, 35); flowLayoutPanel1.Size = new System.Drawing.Size(400, 35);
@ -291,7 +291,7 @@ namespace DeviceRepairAndOptimization.Pages
stackPanel1.Location = new System.Drawing.Point(0, 0); stackPanel1.Location = new System.Drawing.Point(0, 0);
stackPanel1.Margin = new System.Windows.Forms.Padding(0); stackPanel1.Margin = new System.Windows.Forms.Padding(0);
stackPanel1.Name = "stackPanel1"; stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(1198, 48); stackPanel1.Size = new System.Drawing.Size(1454, 48);
stackPanel1.TabIndex = 2; stackPanel1.TabIndex = 2;
// //
// btn_Add // btn_Add
@ -350,7 +350,7 @@ namespace DeviceRepairAndOptimization.Pages
// //
this.AcceptButton = this.btn_Filter; this.AcceptButton = this.btn_Filter;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1598, 916); this.ClientSize = new System.Drawing.Size(1854, 916);
this.Controls.Add(tableLayoutPanel1); this.Controls.Add(tableLayoutPanel1);
this.DoubleBuffered = true; this.DoubleBuffered = true;
this.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

12
DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.cs
View File

@ -261,6 +261,12 @@ namespace DeviceRepairAndOptimization.Pages
return; return;
} }
if (CurrentItem == null)
{
XtraMessageBoxHelper.Error($"请选择要操作的数据！");
return;
}
DialogResult result = XtraMessageBox.Show("你确定要执行此操作吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question); DialogResult result = XtraMessageBox.Show("你确定要执行此操作吗？", "确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
{ {
@ -299,6 +305,12 @@ namespace DeviceRepairAndOptimization.Pages
return; return;
} }
if (CurrentItem == null)
{
XtraMessageBoxHelper.Error($"请选择要操作的数据！");
return;
}
if (CurrentItem.FormStatus) if (CurrentItem.FormStatus)
{ {
// Page_AssignDrives view = new Page_AssignDrives(CurrentItem); // Page_AssignDrives view = new Page_AssignDrives(CurrentItem);

163
DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.Designer.cs generated
View File

@ -53,6 +53,9 @@
this.barDockControl2 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl2 = new DevExpress.XtraBars.BarDockControl();
this.barDockControl3 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl3 = new DevExpress.XtraBars.BarDockControl();
this.barDockControl4 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl4 = new DevExpress.XtraBars.BarDockControl();
this.barBtn_ExportWord = new DevExpress.XtraBars.BarButtonItem();
this.barBtn_Print = new DevExpress.XtraBars.BarButtonItem();
this.barBtnExcel = new DevExpress.XtraBars.BarButtonItem();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
this.layoutControl5 = new DevExpress.XtraLayout.LayoutControl(); this.layoutControl5 = new DevExpress.XtraLayout.LayoutControl();
this.cbbIsDown = new DevExpress.XtraEditors.ComboBoxEdit(); this.cbbIsDown = new DevExpress.XtraEditors.ComboBoxEdit();
@ -61,8 +64,6 @@
this.btn_ChangeDownStatus = new DevExpress.XtraEditors.SimpleButton(); this.btn_ChangeDownStatus = new DevExpress.XtraEditors.SimpleButton();
this.btn_Maintain = new DevExpress.XtraEditors.SimpleButton(); this.btn_Maintain = new DevExpress.XtraEditors.SimpleButton();
this.btn_Validate = new DevExpress.XtraEditors.SimpleButton(); this.btn_Validate = new DevExpress.XtraEditors.SimpleButton();
this.btn_Export = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
this.txt_DeviceID = new DevExpress.XtraEditors.TextEdit(); this.txt_DeviceID = new DevExpress.XtraEditors.TextEdit();
this.cb_Status = new DevExpress.XtraEditors.LookUpEdit(); this.cb_Status = new DevExpress.XtraEditors.LookUpEdit();
this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
@ -77,7 +78,7 @@
this.gcAutoID = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcAutoID = new DevExpress.XtraGrid.Columns.GridColumn();
this.gcEquipmentID = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcEquipmentID = new DevExpress.XtraGrid.Columns.GridColumn();
this.gcEquipmentName = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcEquipmentName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gcIsIsDownStatusText = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcIsIsDownText = new DevExpress.XtraGrid.Columns.GridColumn();
this.gcLocationName = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcLocationName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gcCreatOn = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcCreatOn = new DevExpress.XtraGrid.Columns.GridColumn();
this.gcFormStatusText = new DevExpress.XtraGrid.Columns.GridColumn(); this.gcFormStatusText = new DevExpress.XtraGrid.Columns.GridColumn();
@ -128,10 +129,10 @@
stackPanel1.Controls.Add(this.de_StartDate); stackPanel1.Controls.Add(this.de_StartDate);
stackPanel1.Controls.Add(this.labelControl36); stackPanel1.Controls.Add(this.labelControl36);
stackPanel1.Controls.Add(this.de_EndDate); stackPanel1.Controls.Add(this.de_EndDate);
stackPanel1.Location = new System.Drawing.Point(129, 34); stackPanel1.Location = new System.Drawing.Point(108, 34);
stackPanel1.Margin = new System.Windows.Forms.Padding(0); stackPanel1.Margin = new System.Windows.Forms.Padding(0);
stackPanel1.Name = "stackPanel1"; stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(279, 29); stackPanel1.Size = new System.Drawing.Size(525, 29);
stackPanel1.TabIndex = 5; stackPanel1.TabIndex = 5;
// //
// de_StartDate // de_StartDate
@ -222,6 +223,9 @@
this.toolbarFormControl1.Size = new System.Drawing.Size(1826, 31); this.toolbarFormControl1.Size = new System.Drawing.Size(1826, 31);
this.toolbarFormControl1.TabIndex = 4; this.toolbarFormControl1.TabIndex = 4;
this.toolbarFormControl1.TabStop = false; this.toolbarFormControl1.TabStop = false;
this.toolbarFormControl1.TitleItemLinks.Add(this.barBtn_Print);
this.toolbarFormControl1.TitleItemLinks.Add(this.barBtn_ExportWord);
this.toolbarFormControl1.TitleItemLinks.Add(this.barBtnExcel);
this.toolbarFormControl1.ToolbarForm = this; this.toolbarFormControl1.ToolbarForm = this;
// //
// toolbarFormManager1 // toolbarFormManager1
@ -231,6 +235,11 @@
this.toolbarFormManager1.DockControls.Add(this.barDockControl3); this.toolbarFormManager1.DockControls.Add(this.barDockControl3);
this.toolbarFormManager1.DockControls.Add(this.barDockControl4); this.toolbarFormManager1.DockControls.Add(this.barDockControl4);
this.toolbarFormManager1.Form = this; this.toolbarFormManager1.Form = this;
this.toolbarFormManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
this.barBtn_ExportWord,
this.barBtn_Print,
this.barBtnExcel});
this.toolbarFormManager1.MaxItemId = 3;
// //
// barDockControl1 // barDockControl1
// //
@ -264,6 +273,40 @@
this.barDockControl4.Manager = this.toolbarFormManager1; this.barDockControl4.Manager = this.toolbarFormManager1;
this.barDockControl4.Size = new System.Drawing.Size(0, 1113); this.barDockControl4.Size = new System.Drawing.Size(0, 1113);
// //
// barBtn_ExportWord
//
this.barBtn_ExportWord.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
this.barBtn_ExportWord.Caption = "导出Word";
this.barBtn_ExportWord.Id = 0;
this.barBtn_ExportWord.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barBtn_ExportWord.ImageOptions.Image")));
this.barBtn_ExportWord.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barBtn_ExportWord.ImageOptions.LargeImage")));
this.barBtn_ExportWord.Name = "barBtn_ExportWord";
this.barBtn_ExportWord.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.barBtn_ExportWord.Size = new System.Drawing.Size(100, 50);
this.barBtn_ExportWord.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barBtn_ExportWord_ItemClick);
//
// barBtn_Print
//
this.barBtn_Print.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
this.barBtn_Print.Caption = "打印";
this.barBtn_Print.Id = 1;
this.barBtn_Print.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barBtn_Print.ImageOptions.Image")));
this.barBtn_Print.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barBtn_Print.ImageOptions.LargeImage")));
this.barBtn_Print.Name = "barBtn_Print";
this.barBtn_Print.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.barBtn_Print.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barBtn_Print_ItemClick);
//
// barBtnExcel
//
this.barBtnExcel.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
this.barBtnExcel.Caption = "导出Excel";
this.barBtnExcel.Id = 2;
this.barBtnExcel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem3.ImageOptions.Image")));
this.barBtnExcel.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem3.ImageOptions.LargeImage")));
this.barBtnExcel.Name = "barBtnExcel";
this.barBtnExcel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.barBtnExcel.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barBtnExcel_ItemClick);
//
// layoutControl1 // layoutControl1
// //
this.layoutControl1.Controls.Add(this.layoutControl5); this.layoutControl1.Controls.Add(this.layoutControl5);
@ -286,6 +329,7 @@
this.layoutControl5.Controls.Add(this.cb_Status); this.layoutControl5.Controls.Add(this.cb_Status);
this.layoutControl5.Location = new System.Drawing.Point(10, 10); this.layoutControl5.Location = new System.Drawing.Point(10, 10);
this.layoutControl5.Name = "layoutControl5"; this.layoutControl5.Name = "layoutControl5";
this.layoutControl5.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1215, 0, 650, 400);
this.layoutControl5.OptionsPrint.AppearanceGroupCaption.BackColor = System.Drawing.Color.LightGray; this.layoutControl5.OptionsPrint.AppearanceGroupCaption.BackColor = System.Drawing.Color.LightGray;
this.layoutControl5.OptionsPrint.AppearanceGroupCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F); this.layoutControl5.OptionsPrint.AppearanceGroupCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F);
this.layoutControl5.OptionsPrint.AppearanceGroupCaption.Options.UseBackColor = true; this.layoutControl5.OptionsPrint.AppearanceGroupCaption.Options.UseBackColor = true;
@ -300,7 +344,7 @@
// //
// cbbIsDown // cbbIsDown
// //
this.cbbIsDown.Location = new System.Drawing.Point(529, 3); this.cbbIsDown.Location = new System.Drawing.Point(733, 3);
this.cbbIsDown.MenuManager = this.barManager1; this.cbbIsDown.MenuManager = this.barManager1;
this.cbbIsDown.Name = "cbbIsDown"; this.cbbIsDown.Name = "cbbIsDown";
this.cbbIsDown.Properties.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); this.cbbIsDown.Properties.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F);
@ -309,7 +353,7 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.cbbIsDown.Properties.DropDownRows = 3; this.cbbIsDown.Properties.DropDownRows = 3;
this.cbbIsDown.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.cbbIsDown.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.cbbIsDown.Size = new System.Drawing.Size(279, 26); this.cbbIsDown.Size = new System.Drawing.Size(454, 26);
this.cbbIsDown.StyleController = this.layoutControl5; this.cbbIsDown.StyleController = this.layoutControl5;
this.cbbIsDown.TabIndex = 9; this.cbbIsDown.TabIndex = 9;
// //
@ -319,12 +363,10 @@
this.stackPanel2.Controls.Add(this.btn_ChangeDownStatus); this.stackPanel2.Controls.Add(this.btn_ChangeDownStatus);
this.stackPanel2.Controls.Add(this.btn_Maintain); this.stackPanel2.Controls.Add(this.btn_Maintain);
this.stackPanel2.Controls.Add(this.btn_Validate); this.stackPanel2.Controls.Add(this.btn_Validate);
this.stackPanel2.Controls.Add(this.btn_Export); this.stackPanel2.Location = new System.Drawing.Point(1191, 2);
this.stackPanel2.Controls.Add(this.simpleButton1);
this.stackPanel2.Location = new System.Drawing.Point(812, 2);
this.stackPanel2.Margin = new System.Windows.Forms.Padding(0); this.stackPanel2.Margin = new System.Windows.Forms.Padding(0);
this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Name = "stackPanel2";
this.stackPanel2.Size = new System.Drawing.Size(982, 61); this.stackPanel2.Size = new System.Drawing.Size(603, 61);
this.stackPanel2.TabIndex = 7; this.stackPanel2.TabIndex = 7;
// //
// btn_Query // btn_Query
@ -392,54 +434,20 @@
this.btn_Validate.Text = "设备恢复确认"; this.btn_Validate.Text = "设备恢复确认";
this.btn_Validate.Click += new System.EventHandler(this.btn_Validate_Click); this.btn_Validate.Click += new System.EventHandler(this.btn_Validate_Click);
// //
// btn_Export
//
this.btn_Export.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F);
this.btn_Export.Appearance.Options.UseFont = true;
this.btn_Export.Appearance.Options.UseTextOptions = true;
this.btn_Export.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.btn_Export.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
this.btn_Export.Enabled = false;
this.btn_Export.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Export.ImageOptions.Image")));
this.btn_Export.Location = new System.Drawing.Point(526, 8);
this.btn_Export.Margin = new System.Windows.Forms.Padding(13, 3, 3, 3);
this.btn_Export.Name = "btn_Export";
this.btn_Export.Size = new System.Drawing.Size(78, 44);
this.btn_Export.TabIndex = 5;
this.btn_Export.Text = "导出";
this.btn_Export.Click += new System.EventHandler(this.btn_Export_Click);
//
// simpleButton1
//
this.simpleButton1.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F);
this.simpleButton1.Appearance.Options.UseFont = true;
this.simpleButton1.Appearance.Options.UseTextOptions = true;
this.simpleButton1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
this.simpleButton1.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
this.simpleButton1.Enabled = false;
this.simpleButton1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButton1.ImageOptions.Image")));
this.simpleButton1.Location = new System.Drawing.Point(620, 8);
this.simpleButton1.Margin = new System.Windows.Forms.Padding(13, 3, 3, 3);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(78, 44);
this.simpleButton1.TabIndex = 4;
this.simpleButton1.Text = "打印";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// txt_DeviceID // txt_DeviceID
// //
this.txt_DeviceID.Location = new System.Drawing.Point(129, 2); this.txt_DeviceID.Location = new System.Drawing.Point(108, 2);
this.txt_DeviceID.MenuManager = this.barManager1; this.txt_DeviceID.MenuManager = this.barManager1;
this.txt_DeviceID.Name = "txt_DeviceID"; this.txt_DeviceID.Name = "txt_DeviceID";
this.txt_DeviceID.Properties.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); this.txt_DeviceID.Properties.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F);
this.txt_DeviceID.Properties.Appearance.Options.UseFont = true; this.txt_DeviceID.Properties.Appearance.Options.UseFont = true;
this.txt_DeviceID.Size = new System.Drawing.Size(279, 26); this.txt_DeviceID.Size = new System.Drawing.Size(525, 26);
this.txt_DeviceID.StyleController = this.layoutControl5; this.txt_DeviceID.StyleController = this.layoutControl5;
this.txt_DeviceID.TabIndex = 8; this.txt_DeviceID.TabIndex = 8;
// //
// cb_Status // cb_Status
// //
this.cb_Status.Location = new System.Drawing.Point(529, 34); this.cb_Status.Location = new System.Drawing.Point(733, 34);
this.cb_Status.MenuManager = this.barManager1; this.cb_Status.MenuManager = this.barManager1;
this.cb_Status.Name = "cb_Status"; this.cb_Status.Name = "cb_Status";
this.cb_Status.Properties.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); this.cb_Status.Properties.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F);
@ -451,7 +459,7 @@
this.cb_Status.Properties.DropDownRows = 4; this.cb_Status.Properties.DropDownRows = 4;
this.cb_Status.Properties.NullText = ""; this.cb_Status.Properties.NullText = "";
this.cb_Status.Properties.PopupSizeable = false; this.cb_Status.Properties.PopupSizeable = false;
this.cb_Status.Size = new System.Drawing.Size(279, 26); this.cb_Status.Size = new System.Drawing.Size(454, 26);
this.cb_Status.StyleController = this.layoutControl5; this.cb_Status.StyleController = this.layoutControl5;
this.cb_Status.TabIndex = 6; this.cb_Status.TabIndex = 6;
// //
@ -467,12 +475,12 @@
this.layoutControlItem3}); this.layoutControlItem3});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root"; this.layoutControlGroup4.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition1.Width = 400D; columnDefinition1.Width = 35D;
columnDefinition2.SizeType = System.Windows.Forms.SizeType.Absolute; columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition2.Width = 400D; columnDefinition2.Width = 31D;
columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition3.Width = 100D; columnDefinition3.Width = 34D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1, columnDefinition1,
columnDefinition2, columnDefinition2,
@ -491,11 +499,11 @@
// layoutControlItem44 // layoutControlItem44
// //
this.layoutControlItem44.Control = this.stackPanel2; this.layoutControlItem44.Control = this.stackPanel2;
this.layoutControlItem44.Location = new System.Drawing.Point(800, 0); this.layoutControlItem44.Location = new System.Drawing.Point(1179, 0);
this.layoutControlItem44.Name = "layoutControlItem44"; this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem44.OptionsTableLayoutItem.RowSpan = 2; this.layoutControlItem44.OptionsTableLayoutItem.RowSpan = 2;
this.layoutControlItem44.Size = new System.Drawing.Size(986, 65); this.layoutControlItem44.Size = new System.Drawing.Size(607, 65);
this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem44.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem44.TextVisible = false; this.layoutControlItem44.TextVisible = false;
// //
@ -504,15 +512,15 @@
this.layoutControlItem43.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); this.layoutControlItem43.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F);
this.layoutControlItem43.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem43.AppearanceItemCaption.Options.UseFont = true;
this.layoutControlItem43.Control = this.cb_Status; this.layoutControlItem43.Control = this.cb_Status;
this.layoutControlItem43.Location = new System.Drawing.Point(400, 32); this.layoutControlItem43.Location = new System.Drawing.Point(625, 32);
this.layoutControlItem43.MinSize = new System.Drawing.Size(50, 25); this.layoutControlItem43.MinSize = new System.Drawing.Size(50, 25);
this.layoutControlItem43.Name = "layoutControlItem43"; this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem43.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem43.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem43.Size = new System.Drawing.Size(400, 33); this.layoutControlItem43.Size = new System.Drawing.Size(554, 33);
this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem43.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem43.Text = "维修单状态："; this.layoutControlItem43.Text = "维修单状态：";
this.layoutControlItem43.TextSize = new System.Drawing.Size(105, 20); this.layoutControlItem43.TextSize = new System.Drawing.Size(84, 15);
// //
// layoutControlItem42 // layoutControlItem42
// //
@ -522,10 +530,10 @@
this.layoutControlItem42.Location = new System.Drawing.Point(0, 32); this.layoutControlItem42.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem42.Name = "layoutControlItem42"; this.layoutControlItem42.Name = "layoutControlItem42";
this.layoutControlItem42.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem42.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem42.Size = new System.Drawing.Size(400, 33); this.layoutControlItem42.Size = new System.Drawing.Size(625, 33);
this.layoutControlItem42.Text = "申请时间："; this.layoutControlItem42.Text = "申请时间：";
this.layoutControlItem42.TextLocation = DevExpress.Utils.Locations.Left; this.layoutControlItem42.TextLocation = DevExpress.Utils.Locations.Left;
this.layoutControlItem42.TextSize = new System.Drawing.Size(105, 20); this.layoutControlItem42.TextSize = new System.Drawing.Size(84, 15);
// //
// layoutControlItem2 // layoutControlItem2
// //
@ -534,9 +542,9 @@
this.layoutControlItem2.Control = this.txt_DeviceID; this.layoutControlItem2.Control = this.txt_DeviceID;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(400, 32); this.layoutControlItem2.Size = new System.Drawing.Size(625, 32);
this.layoutControlItem2.Text = "设备编号："; this.layoutControlItem2.Text = "设备编号：";
this.layoutControlItem2.TextSize = new System.Drawing.Size(105, 20); this.layoutControlItem2.TextSize = new System.Drawing.Size(84, 15);
// //
// layoutControlItem3 // layoutControlItem3
// //
@ -545,12 +553,12 @@
this.layoutControlItem3.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center; this.layoutControlItem3.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem3.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; this.layoutControlItem3.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControlItem3.Control = this.cbbIsDown; this.layoutControlItem3.Control = this.cbbIsDown;
this.layoutControlItem3.Location = new System.Drawing.Point(400, 0); this.layoutControlItem3.Location = new System.Drawing.Point(625, 0);
this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.Size = new System.Drawing.Size(400, 32); this.layoutControlItem3.Size = new System.Drawing.Size(554, 32);
this.layoutControlItem3.Text = "设备停机状态："; this.layoutControlItem3.Text = "设备停机状态：";
this.layoutControlItem3.TextSize = new System.Drawing.Size(105, 20); this.layoutControlItem3.TextSize = new System.Drawing.Size(84, 15);
// //
// splitContainerControl1 // splitContainerControl1
// //
@ -592,7 +600,7 @@
this.gcAutoID, this.gcAutoID,
this.gcEquipmentID, this.gcEquipmentID,
this.gcEquipmentName, this.gcEquipmentName,
this.gcIsIsDownStatusText, this.gcIsIsDownText,
this.gcLocationName, this.gcLocationName,
this.gcCreatOn, this.gcCreatOn,
this.gcFormStatusText, this.gcFormStatusText,
@ -638,14 +646,14 @@
this.gcEquipmentName.VisibleIndex = 3; this.gcEquipmentName.VisibleIndex = 3;
this.gcEquipmentName.Width = 67; this.gcEquipmentName.Width = 67;
// //
// gcIsIsDownStatusText // gcIsIsDownText
// //
this.gcIsIsDownStatusText.Caption = "停机状态"; this.gcIsIsDownText.Caption = "停机状态";
this.gcIsIsDownStatusText.FieldName = "IsDownStatusText"; this.gcIsIsDownText.FieldName = "IsDownText";
this.gcIsIsDownStatusText.Name = "gcIsIsDownStatusText"; this.gcIsIsDownText.Name = "gcIsIsDownText";
this.gcIsIsDownStatusText.Visible = true; this.gcIsIsDownText.Visible = true;
this.gcIsIsDownStatusText.VisibleIndex = 7; this.gcIsIsDownText.VisibleIndex = 7;
this.gcIsIsDownStatusText.Width = 67; this.gcIsIsDownText.Width = 67;
// //
// gcLocationName // gcLocationName
// //
@ -837,14 +845,15 @@
private DevExpress.XtraEditors.SimpleButton btn_Validate; private DevExpress.XtraEditors.SimpleButton btn_Validate;
private DevExpress.XtraGrid.Columns.GridColumn gcFormStatusText; private DevExpress.XtraGrid.Columns.GridColumn gcFormStatusText;
private DevExpress.XtraEditors.SimpleButton btn_ChangeDownStatus; private DevExpress.XtraEditors.SimpleButton btn_ChangeDownStatus;
private DevExpress.XtraGrid.Columns.GridColumn gcIsIsDownStatusText; private DevExpress.XtraGrid.Columns.GridColumn gcIsIsDownText;
private DevExpress.XtraGrid.Columns.GridColumn gcAutoID; private DevExpress.XtraGrid.Columns.GridColumn gcAutoID;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
private DevExpress.XtraEditors.ComboBoxEdit cbbIsDown; private DevExpress.XtraEditors.ComboBoxEdit cbbIsDown;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.SimpleButton simpleButton1; private DevExpress.XtraBars.BarButtonItem barBtn_ExportWord;
private DevExpress.XtraEditors.SimpleButton btn_Export; private DevExpress.XtraBars.BarButtonItem barBtn_Print;
private DevExpress.XtraBars.BarButtonItem barBtnExcel;
} }
} }

275
DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.cs
View File

@ -1,9 +1,14 @@
using DevExpress.XtraBars.ToolbarForm; using DevExpress.XtraBars.ToolbarForm;
using DevExpress.XtraEditors;
using DeviceRepair.Models; using DeviceRepair.Models;
using DeviceRepair.Models.Common; using DeviceRepair.Models.Common;
using DeviceRepair.Models.DeviceRepair.ExportView;
using DeviceRepair.Utils; using DeviceRepair.Utils;
using DeviceRepairAndOptimization.Biz; using DeviceRepairAndOptimization.Biz;
using DeviceRepairAndOptimization.Common; using DeviceRepairAndOptimization.Common;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -253,7 +258,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
/// <param name="e"></param> /// <param name="e"></param>
private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e) private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e)
{ {
(new Action<DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs>(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e); (new Action<DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs>(BaseControl.GridControlExtend.CustomDrawColumnHeader)).Invoke(e);
} }
/// <summary> /// <summary>
@ -331,8 +336,8 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
} }
} }
simpleButton1.Enabled = CurrentObjectInfo.RestorationConfirmationBy > 0; barBtn_Print.Enabled = CurrentObjectInfo.RestorationConfirmationBy > 0;
btn_Export.Enabled = CurrentObjectInfo.RestorationConfirmationBy > 0; barBtn_ExportWord.Enabled = CurrentObjectInfo.RestorationConfirmationBy > 0;
#region 加载表单数据 #region 加载表单数据
@ -769,5 +774,269 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
XtraMessageBoxHelper.Error(ex.Message); XtraMessageBoxHelper.Error(ex.Message);
} }
} }
/// <summary>
/// 打印
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void barBtn_Print_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
this.barBtn_Print.Enabled = false;
try
{
if (!GlobalInfo.HasRole("BIZ_REPAIRRECORD_PRINT"))
{
XtraMessageBoxHelper.Error($"当前账号缺少此操作的权限");
return;
}
if (CurrentObjectInfo == null)
{
throw new Exception("获取对象失败，请重试！");
}
DataTable table = SubassembliesCurrentData();
FastReport.Report report = new FastReport.Report();
var vLabelDir = System.IO.Path.Combine(Application.StartupPath, "Labels");
//判断文件夹是否存在
if (!System.IO.Directory.Exists(vLabelDir))
{
throw new Exception("缺少待打印的标签模板目录！");
}
//路径拼接模板文件名
var vFileName = System.IO.Path.Combine(vLabelDir, "DeviceMaintenance.frx");
//判断模板文件是否存在
if (!System.IO.File.Exists(vFileName))
{
throw new Exception("缺少待打印的标签模板文件！");
}
report.Load(vFileName);
report.DoublePass = true;
DataSet dsDatas = new DataSet();
dsDatas.Tables.Add(table);
report.RegisterData(dsDatas, "MaintenanceInfo");
//report.Design();
if (report.Prepare(true))
{
report.ShowPrepared();
}
report.Dispose();
}
catch (Exception ex)
{
XtraMessageBoxHelper.Error(ex.Message);
}
this.barBtn_Print.Enabled = true;
}
/// <summary>
/// 导出word
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void barBtn_ExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
try
{
if (!GlobalInfo.HasRole("BIZ_REPAIRRECORD_EXPORT"))
{
XtraMessageBoxHelper.Error($"当前账号缺少此操作的权限");
return;
}
using (FolderBrowserDialog folderDialog = new FolderBrowserDialog())
{
folderDialog.Description = "请选择保存文件的路径：";
folderDialog.ShowNewFolderButton = true;
DialogResult result = folderDialog.ShowDialog();
if (result == DialogResult.OK && !string.IsNullOrWhiteSpace(folderDialog.SelectedPath))
{
string selectedPath = folderDialog.SelectedPath;
if (CurrentObjectInfo == null)
{
throw new Exception("获取对象失败，请重试！");
}
DataTable table = SubassembliesCurrentData();
FastReport.Report report = new FastReport.Report();
var vLabelDir = Path.Combine(Application.StartupPath, "Labels");
//判断文件夹是否存在
if (!Directory.Exists(vLabelDir))
{
throw new Exception("缺少待打印的标签模板目录！");
}
//路径拼接模板文件名
var vFileName = Path.Combine(vLabelDir, "DeviceMaintenance.frx");
//判断模板文件是否存在
if (!File.Exists(vFileName))
{
throw new Exception("缺少待打印的标签模板文件！");
}
report.Load(vFileName);
report.DoublePass = true;
DataSet dsDatas = new DataSet();
dsDatas.Tables.Add(table);
report.RegisterData(dsDatas, "MaintenanceInfo");
string filePath = Path.Combine(selectedPath, ("维修单" + CurrentObjectInfo.AutoID + ".docx"));
if (report.Prepare())
{
FastReport.Export.OoXML.Word2007Export export = new FastReport.Export.OoXML.Word2007Export();
report.MaxPages = 1;
export.CurPage = 1;
report.Export(export, filePath);
}
report.Dispose();
}
}
}
catch (Exception ex)
{
XtraMessageBoxHelper.Error(ex.Message);
}
}
private void barBtnExcel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
try
{
splashScreenManager1.ShowWaitForm();
APIResponseData apiResponseData = MaintenanceManager.Instance.GetXlsxData(FilterInfo);
if (!apiResponseData.IsSuccess)
throw new Exception(apiResponseData.Message);
List<MaintainOrderView> views = apiResponseData.ToDeserializeObject<List<MaintainOrderView>>();
DataTable dataTable = views.ToDataTable();
System.Reflection.PropertyInfo[] prop = typeof(MaintainOrderView).GetProperties();
foreach (System.Reflection.PropertyInfo item in prop)
{
if (dataTable.Columns.Contains(item.Name))
{
DataColumn dc = dataTable.Columns[item.Name];
object[] attrs = item.GetCustomAttributes(typeof(System.ComponentModel.DescriptionAttribute), false);
if (null != attrs && attrs.Length > 0)
{
System.ComponentModel.DescriptionAttribute description = (System.ComponentModel.DescriptionAttribute)attrs[0];
dc.ColumnName = description.Description;
}
}
}
//typeof(MaintainOrderView).GetProperties()[0].GetCustomAttributes(typeof(System.ComponentModel.DescriptionAttribute), false).FirstOrDefault()
//typeof(MaintainOrderView).GetProperties()[0].Name
splashScreenManager1.TryCloseWait();
XtraSaveFileDialog xofd = new XtraSaveFileDialog()
{
Filter = "xlsx file（*.xlsx）|*.xlsx"
};
SelectPath:
if (xofd.ShowDialog() == DialogResult.OK)
{
if (File.Exists(xofd.FileName))
{
XtraMessageBoxHelper.Error("当前文件已存在，请重新命名！");
goto SelectPath;
}
byte[] btRtn = Export(dataTable);
//创建一个文件流
using (FileStream fs = new FileStream(xofd.FileName, FileMode.Create))
{
//将byte数组写入文件中
fs.Write(btRtn, 0, btRtn.Length);
//所有流类型都要关闭流，否则会出现内存泄露问题
fs.Close();
}
}
}
catch (Exception ex)
{
splashScreenManager1.TryCloseWait();
XtraMessageBoxHelper.Error(ex.Message);
}
}
byte[] Export(DataTable dataTable)
{
IWorkbook workbook = new XSSFWorkbook();
string sheetName = string.IsNullOrEmpty(dataTable.TableName) ? "Sheet1" : dataTable.TableName;
ISheet sheet = workbook.CreateSheet(sheetName);
// 创建表头
IRow headerRow = sheet.CreateRow(0);
// 表头样式
#region 表头样式
ICellStyle style = workbook.CreateCellStyle();
//style.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
//style.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
//style.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
//style.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
style.WrapText = true;//设置换行这个要先设置
style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;//居中
style.VerticalAlignment = VerticalAlignment.Center;//水平居中
//HSSFPalette palette = new HSSFPalette();
//palette.SetColorAtIndex((short)1, 217, 217, 217);
//var v1 = palette.FindColor(217, 217, 217);
//colorStyle.FillForegroundColor = v1.GetIndex();
style.FillPattern = FillPattern.SolidForeground;
style.FillForegroundColor = NPOI.HSSF.Util.HSSFColor.Grey25Percent.Index;
////设置字体
//IFont font = workbook.CreateFont();
//font.FontHeightInPoints = 10;
//font.FontName = "黑体";
//style.SetFont(font);
#endregion
for (int i = 0; i < dataTable.Columns.Count; i++)
{
headerRow.CreateCell(i).SetCellValue(dataTable.Columns[i].ColumnName);
headerRow.GetCell(i).CellStyle = style;
}
// 填充数据
for (int i = 0; i < dataTable.Rows.Count; i++)
{
IRow dataRow = sheet.CreateRow(i + 1);
for (int j = 0; j < dataTable.Columns.Count; j++)
{
dataRow.CreateCell(j).SetCellValue(dataTable.Rows[i][j].ToString());
}
}
// 转换为byte[]
using (MemoryStream stream = new MemoryStream())
{
workbook.Write(stream);
return stream.ToArray();
}
}
} }
} }

105
DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.resx
View File

@ -294,7 +294,27 @@
Ev0BUQ6AahuAd3MAAAAASUVORK5CYII= Ev0BUQ6AahuAd3MAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="btn_Export.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>336, 17</value>
</metadata>
<data name="barBtn_ExportWord.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
bGUARXhwb3J0O0RvYztFeHBvcnRUb0RvYzsoIWaSAAAChklEQVQ4T2WT2U8TYRTF2WWLiv+KG26AIhKX
J59ETUxMNNEgBQHLJlWMsmiCCcawyYvGhKVSFssiCoIJFB+MIcT44rvI0mmn03am5Xi+b6AZdJLfdGaS
c+65936N4xVPEkgiSdoi2ULKP4hv8QDiBOJKaO5amHnavQhBS7cHzV0etJCmzkWygMYODxrb5/GkfQEN
L2ZmhYnVIKm504NNvkl4M9mURLeJmjS0fRGqVKtB8uOOeSkKhiLQSCBoomqGxK9F4CN6JApH66xQpVsN
UoSrMFCDpmBbJIVqBErAgJeEjShqn00LVcYOA0frZxnXr+nwB3RWM2IiwYaqY52EwlFMzv36z2BXDV1F
nw/fLuGCYxrn6j/hbP1HFNZ9QEHtJPJrJnCqegx59vfIuTeKE5UjOFYxhCPlLqcwSLU3TUmD8xSHdQMh
zuHBm29S3D3+EypTdbh/IKdyFC9HlrHhC2LNq+Fw2TsZIa3s0QQinLCoKsRnWFnjPPKrx2VLuays+EM4
XjGMDSWI7LsuHKL4YKnTNCh2uKVB4f0pbsLAaUYOcB55djd8gbCM7KXB0XIX1hVWLqXY5sSBkgFpkH6r
bgRGZBMFNZOy8smqMcYOy8g+lUL2K2Jnlw1ildGl2DaA/SX90iDjZrULBlckImusLHqu6lnkoIZjPbcN
LcnIzwe/Y2U9gN9raswg87rdBZ0Gla++InfnlNnvIIfljEUWIgtyC5nXyp3ykPi4c4XVvdy53L1Px5qi
Y1UJ4Y83hBXidC+LqlnWc5BadPv1zNXSfly29UP8XrH1oaikj++9KLrD52KTS8W9uHijZ46aHQdJ/JXT
yG6yh+zdIsvCvi3EcyZJNA0Q9xeOZokftCXBMQAAAABJRU5ErkJggg==
</value>
</data>
<data name="barBtn_ExportWord.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
bGUARXhwb3J0O0RvYztFeHBvcnRUb0RvYzsoIWaSAAAIaklEQVRYR8WWeVSU1xnGzWLTNscYs/XYnLan bGUARXhwb3J0O0RvYztFeHBvcnRUb0RvYzsoIWaSAAAIaklEQVRYR8WWeVSU1xnGzWLTNscYs/XYnLan
@ -336,7 +356,25 @@
Rv4XRM0QvyN+P4I/jOCNMfDvHN3Rb8P/D5jwX4AE90JwnDEVAAAAAElFTkSuQmCC Rv4XRM0QvyN+P4I/jOCNMfDvHN3Rb8P/D5jwX4AE90JwnDEVAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="simpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="barBtn_Print.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAFByaW50ZXI7579hxQAAAr9JREFU
OE99k9lPU1EQxssW2URwSXz1xT9AIT4ZUCTyAEoiEAJxARIUTBCKCilFgqzFlD0YJAEjJL4ZiQQkYpEa
AlIK+IYSEVq7UAp0B0rbz5lr0JQHT/LL3HPuzDdn5s4VAfgLrYD2V+qJzsEFdA7OC3QQ7QNqgZa+L5Pk
E+wX47cRiYJIAF6fD16vDx7G48M+4d73Qt6vYqcjfjF+G5EoRN43KwSZLTvY2HYROzBtO7Hr9kD2Yoad
wg7FCCuACCLCZb0zQjbjppNwwEDWYHbCtbOP+u4pjoghgolAQliBjT3KpI7Br3N54i4UVb7E7p4H+g07
dCYHYYPWZIfduYd88XNkFTRSKer5qtbRZIrlpKKQtoHFdSNlySxoQB45OVxuaI02rBmt0BisWCO2bLvI
KWpBSo4EepMTTb0qE8WGskCovH+BygFSsiXILmyB1bGHVb0FP3UWrOi2BbgfN/IakHi9RPCt7Z7lciJY
ILyhZw5utxfpd6qQmPaQnIhrTBkuM6liXEoRI4FIzSoTfKWtQj+iWCCyunOasrrxXqFGcvoDXEjMRVxC
LmLjb+N8/C2cu3gTscSVlCKMjM/CSv141DTJAtEsEFXxTAnDlhM/DDasCNjp2mR1duHs4FywdK6nL1P8
dJwFjrNAdGm9At91ViwumxGXLPkvC8sbWNJYUSgdY4ETLBBz/8kHzH0zQzGvRW3XFCy2PdSN/ULNqBbS
YS0eD61ikwaL342rVqFa2kB++QgLnGSByMx7/VM5xa+Rcbcf1e1KYQqrhjWQvNOg/O0axG9WYdpyobpN
iaSMOlzNkiEhTTpNsUITeRj44RRxRir/hHVyXqc6GZ4Po5kmkmylfIKzniVOE8eI4MP/QlhpzbCyovkj
KpoVBFnZAQqU1Ax9Jp8Ivxi/zZ/bRBLcXa6P4Zsx/HyUCPoXA9Fvk15uVlve/joAAAAASUVORK5CYII=
</value>
</data>
<data name="barBtn_Print.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAFByaW50ZXI7579hxQAACE1JREFU dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAFByaW50ZXI7579hxQAACE1JREFU
@ -378,9 +416,66 @@
HfNhGQlLqn4/eNq+jQX/BRbqweZ/Pa0K/+6HvEAAAAAASUVORK5CYII= HfNhGQlLqn4/eNq+jQX/BRbqweZ/Pa0K/+6HvEAAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <data name="barButtonItem3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>336, 17</value> <value>
</metadata> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB90RVh0VGl0
bGUARXhwb3J0O1hzbHQ7RXhwb3J0VG9Yc2x0OxPWe5sAAAJlSURBVDhPXZPLbxJhFMWHZ6s2av3TlEIp
IO3CjanWRINQWmlRqK0mXeiir7jRVEudjRqiJiq2Ji3du3Wn1lJewzAMA/R47zcDUkl+zAzJOeeeOx8S
AIk+NsJOOAinhasP93/wbzahtQzsi+v7uUcbB2CWNvJYXM9jiXi4dkDsY2E1j4WVPaRX9pF8mtthk34D
5+JaHif0IKAvkxNBp0vHJPnkG4sG+w1cqdU9IWrobWhEvWGiai1BTWtDIYx2B4nlHRad7TdwsysbqA1T
0BUJodpGtd5ChWi2Oog//sKic6cMEstfxbg1zUCtblBaqydiyqqBEqE3O/i4++OfwUB6QiYwkBqHOxWG
+wFx/ypczHwIrrkQnIkAHPfG4JjxwR73Ej7Ypuka88psgKbRIoMJ6m+QOETdjZ44/iGDiqKjrDRgn/Hj
uKyReAR/inXYoiOQ3Olx6LQ0TtaovzsZFhWcc0GRXKnpcMyOkXgU9mkfjkpkEPXg8FiFdPcKJE5OfJaF
ePbTazjnA1Dqzd7YsfdbKFU1OOJ+kRx5u4lDSr/z5gUZeGgCK9mVDEFlISUrKqVy51m/SI5mX6HAyTGv
EHPyrwJNEKEJeGEabZ4710RyEFWrczT7EsVyQ4gj7zZF599idA9+HtVMA1cyKLO429lMtjrTtmnTIlni
hXFnHpuFJnL3HAyFb8vikCj0zqu0xAq9c/HuFQPFqoHjqo5CRccRIWe/s2i4/yAN+q8/zwVvbWNsaht8
DUxl4L+Zoect+G/Q/aTJ6OQWLl97tkuaUyeR/8pniPPEBeKixXAflyz4fohwAJD+Ajgbaz/h9bcGAAAA
AElFTkSuQmCC
</value>
</data>
<data name="barButtonItem3.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB90RVh0VGl0
bGUARXhwb3J0O1hzbHQ7RXhwb3J0VG9Yc2x0OxPWe5sAAAh7SURBVFhHxZd5VJTXGcaHYY2pEpMmPTan
7Wn7R09OT5e0TY1xw6AgmlgCyL4zIGAkgDDM4ADDMriwCBq1tok0qElTDBiNJm3EVKuxxyRoOFZlcQFZ
Z4ZtgJlhffq+d2asyGDav/qd83Dhg/me37vd7yJRq9UzRJeDVVKrHB8hJzvi+w4PP9eeAEhm3aRLWvmn
i2crqz/Hnnc+RyWr6iL2VFnWCpJlvYCKQxew++0LKKe1/O1/CKnLThdYQRj+kSCzAPgDJEc2/aZrbGwC
I8YxDA4Z0as34O69fnzR2IH6iy1QbK8rpOc4kwTE9eYeYfagF4vvzbjBf0xyqnjnojCZmJrGxMQUrVMY
n5gWGqOfWUbTBIZHx9A/ZEK3bhitbX0o+eM5TE8DJ85cR6q6poie5UISEP8bAKWUr3EyYtlMx8YJYHwK
ZquMpjEYRsag6xvFrTYdivadEQDDxgnU/e0aEpVHNPQ8V5LdvpgLwPlSQ5sAYMNxMrKYW0zFOjYFE5XA
bC2DftCIljY9ckpPCwAj/Z4hjp36GrFph4rpmW6kWRACwHV7TL1bcSxcNdFwLYqCS2GkRQVRcFaHw4nk
nBsGR5KTKhSOqhBItwVBmh0MqTIQDqQVB/LQckeHDM1xAcClMgmISfz5RAPCkg/YhbAAFMdg4dEcuB/O
hnt1NhZUKbDgUBa+9VYm5v1hK+YdTIPbgVS47UuB697NcKlMgtPuTXAqj4e0VAbHkng4ZAWi+Y4eW3Jr
ROYYYnKKQCYZZBLv1l1GoKySIURPzATQEMBhFaV2Ao/t2wyTeRxue5MxahqHa2UiXHfHQ3WuDoMGMwYM
JjKMhX7ACOmOaPRS7aWaKAFwp2sAqpKTSMg6ClnmEcgyjiBuK+swleIKledjcpPM4yzMAuDIzeZJuL2Z
LLrbbU8Sdfg4XMjchSIdHDbDuTRBmDvuioG23wjH4mj06EfgUBQBB3kAevtH0drej6s3u3C5sQ2XGu7i
/OXbOHupBef/2WoDmD8LgOvNaVdfOinMcy98KCI30IixuXOZDNmf1dK4kemuWBG5/NMa9FD0GZ+8TwCR
kMj9KTtm6CgznJUu7TDaOwdxi4CabutoQvTI3nmKARaQnGYCFBAA1dwW+QgZu1YQwAhFXRYHx1KKmiJX
1B+DjiKXFkcKcwdNBLp0lIHCCEgy/UWWhmgkB2jtZxiajJ6+EXT2GmijGoZi50kGcJ8F4JwfIRrOaLTU
nDcXl3IZhqw1V56tRd+ASZhz5NLiKHSL1EeikyKVFIZbAWhXJA3YRJ/XEkQ3wXL25BoB8IQdgEjR7Wzu
UrGJ6p4gIncupeitNZfujBaRSzWRInJJUbglclZBmAAYMIyhj4z7eB0yQ29VL5WFs5lReJwBFs4CcFJH
fOyUR/POc57Dcx4Mx20069Y5lyqD4KDYSJ0eILqd682GD8rz9wUi4j6SzVhPW7Ru0KJhyu7WwloGeHIW
gO0HFl28Ucz/jDp3moaZazpIGrqfXi4L6z/fi8ajCeB6s7qt6tIZhDq1Bvq8CR+daWSARaTHSfy2FO8H
ewALeGQYgM3v19UaoU0cpZaMi/cfgyxrL0JleVDkH0Rm3n6kZ+/FFkU5ktJLIEspRlRSAcJkOVgXkAK/
aBU2hGedJx9newBM5q6kkZliAFHTmcYP1reTIoyTV6KwrBpBMSpoB0ZFNiwZGRUN2KVnUUZIXr5JUBQc
xKthcs7GY3MBPKHY8RGm6FXMDaXnaFn3jS111dL3Hb1DiE4vQ/6uKgREKoXxtdt6NLbq8HWrFldbtPjJ
z9bguZ9746umXni+IkNofB7WBaUzwONzASyUF39oAWBDMtfRqmNjm/kgj5gJ7d39CE/ZiZztb8E3NFNE
zeZXyfxKsxYNTVr89HkfLPGIQAftGSvXRiM4Lgde/ikMMH8ugCczi+oEgMWYNxUWG1vUy6K94U6nDiHJ
GigLKa2BqSLNV5p1wpwj/pL0y8WvYYVPPO7RnrFsTQQCY7bB83fJDOBuD4CPUU+l59fS22z6IUPqdjLt
IYm1z0inIC0CE/KRqd6PtX6bBUBDcy++uknmpC9Il2/0oJ235t5hLFkVKkrlsT6BARbOBfDt1LwP7gOw
mU1szsasLlLT3R74x+YiTfUmVm/YhJfXx2PVujis9I7BCu8oLFsdjpc8w8g4BC96BGPxyiD4hWdhuXcc
Azw1A4AucRoiPf1GzjEBYImUzEk2UyG9EZ2kG7e64RuZjRRFBcISCxC6qQAhCWoEU6MFxeUikOq9MTob
/lFK+EVkwZe63zdUjqWroxjg6TkBXlf9BRN0omBzFht28eZiHSc276D1WvM9vELNl5xZjmDaB77pWk99
siE4Ey+uoveHRPIdujULgE8szyQrLQDC2Co27aROZnFHsxqb2rA2MB3xqbsQQM3Fl22v6KOJ6aMSWprY
ROdGE7yo+dZvTMdvV4QywCJ7AKIHEhXv0XGKTr3mCYySRuhVbdG42NcNLDqwtN7tgJdfCuJeL4ZvuFwA
2EZViEqopeZlcRN7+Mjg45+GXy+ld4pE8qw9ALETxqYeOpcgP4r4TFIGHbFIcRmHxRErlo5YsemktGpU
vVePlzck01ZbKNKbc6IJ247fRFbtDWTU3EDq+9ex5d1/IfkoHdGrr2GZZyS8X3sDzy8JYIDvzQCwQvA/
EXyO54PDMyR+eXzXqmft6Fce6xJod8sX6S0534Mdf++Gpr4L+Z92QvVJB5Sn7kF+oh1bSYtXhlIWEmhv
8GOA79sD4CwwBGeC+4FhHqVFiz2Cv1y6JprGTwbf/Hq8mnsGPsq/wkt+GqvSTmL5luNYkvgBXoivwW9e
2ogXlofguV94N9BnZ06BHZD/RqJnSD8g/fAB/egB/fgh8e85u5a3IX/5/wmSfwP2rYVC2Q4M0QAAAABJ
RU5ErkJggg==
</value>
</data>
<data name="pageMaintainView.IconOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="pageMaintainView.IconOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABd0RVh0VGl0 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABd0RVh0VGl0

14
DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.Designer.cs generated
View File

@ -31,11 +31,11 @@ namespace DeviceRepairAndOptimization.Pages
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(page_MaintenancePlan)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(page_MaintenancePlan));
System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
@ -123,9 +123,9 @@ namespace DeviceRepairAndOptimization.Pages
this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Verdana", 10F); this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Verdana", 10F);
this.EditSearch.Properties.Appearance.Options.UseFont = true; this.EditSearch.Properties.Appearance.Options.UseFont = true;
this.EditSearch.Properties.AutoHeight = false; this.EditSearch.Properties.AutoHeight = false;
editorButtonImageOptions1.SvgImageSize = new System.Drawing.Size(16, 16); editorButtonImageOptions2.SvgImageSize = new System.Drawing.Size(16, 16);
this.EditSearch.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { this.EditSearch.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.EditSearch.Properties.NullValuePrompt = "输入设备编号或设备类型查询"; this.EditSearch.Properties.NullValuePrompt = "输入设备编号或设备类型查询";
this.EditSearch.Size = new System.Drawing.Size(300, 31); this.EditSearch.Size = new System.Drawing.Size(300, 31);
this.EditSearch.TabIndex = 9; this.EditSearch.TabIndex = 9;

6
DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.cs
View File

@ -348,13 +348,15 @@ namespace DeviceRepairAndOptimization.Pages
{ {
if (!GlobalInfo.HasRole("BIZ_PLAN_DELETE")) if (!GlobalInfo.HasRole("BIZ_PLAN_DELETE"))
{ {
throw new Exception($"当前账号缺少此操作的权限"); XtraMessageBoxHelper.Error($"当前账号缺少此操作的权限");
return;
} }
AnnualMaintenancePlan model = (AnnualMaintenancePlan)gridView1.GetFocusedRow(); AnnualMaintenancePlan model = (AnnualMaintenancePlan)gridView1.GetFocusedRow();
if (model == null) if (model == null)
{ {
throw new Exception("请先选择要删除的行！"); XtraMessageBoxHelper.Error("请先选择要删除的行！");
return;
} }
if (XtraMessageBox.Show("确认删除该条数据？", "信息", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) if (XtraMessageBox.Show("确认删除该条数据？", "信息", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)

3
DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.resx
View File

@ -123,6 +123,9 @@
<metadata name="EditSearch.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="EditSearch.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="EditSearch.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="flowLayoutPanel2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="flowLayoutPanel2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>

2
DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.cs
View File

@ -96,7 +96,7 @@ namespace DeviceRepairAndOptimization.Pages.Plan
ck_Oct.SelectedItem = DataSource.Oct; ck_Oct.SelectedItem = DataSource.Oct;
ck_Nov.SelectedItem = DataSource.Nov; ck_Nov.SelectedItem = DataSource.Nov;
ck_Dec.SelectedItem = DataSource.Dec; ck_Dec.SelectedItem = DataSource.Dec;
tp_StartMonth.Value = Convert.ToDateTime(DataSource.PMStartMonth); tp_StartMonth.Value = string.IsNullOrEmpty(DataSource.PMStartMonth) ? DateTime.Today : Convert.ToDateTime(DataSource.PMStartMonth);
txt_Remark.Text = DataSource.Remarks; txt_Remark.Text = DataSource.Remarks;
} }

3
DeviceRepairAndOptimization/Pages/Plan/page_PlanExcelImport.cs
View File

@ -267,12 +267,13 @@ namespace DeviceRepairAndOptimization.Pages.Plan
#region 校验设备信息 #region 校验设备信息
DeviceInformationInfo di = driveLst.Where(x => x.EquipmentID == (newRow[0] + "")).FirstOrDefault(); DeviceInformationInfo di = driveLst.Where(x => x.EquipmentID.Equals((newRow[0] + ""), StringComparison.CurrentCultureIgnoreCase)).FirstOrDefault();
if (di == null) if (di == null)
{ {
hasError = true; hasError = true;
throw new Exception($"不存在设备编号为：{(newRow[0] + "")}的设备！"); throw new Exception($"不存在设备编号为：{(newRow[0] + "")}的设备！");
} }
newRow[0] = di.EquipmentID;
#endregion #endregion
#region 校验计划是否冲突 #region 校验计划是否冲突

5
DeviceRepairAndOptimization/Pages/Users/frmRoleUsers.cs
View File

@ -116,6 +116,11 @@ namespace DeviceRepairAndOptimization.Pages.Users
if (!apiResponseData.IsSuccess) if (!apiResponseData.IsSuccess)
throw new Exception(apiResponseData.Message); throw new Exception(apiResponseData.Message);
} }
else
{
splashScreenManager1.TryCloseWait();
return;
}
} }
else else
{ {

9
DeviceRepairAndOptimization/Pages/Users/frmUsers.cs
View File

@ -201,13 +201,8 @@ namespace DeviceRepairAndOptimization.Pages.Users
if (EncryptionHelper.EncryptByMD5(vPwdReset) == CurrentUser.PassWord.ToUpper()) if (EncryptionHelper.EncryptByMD5(vPwdReset) == CurrentUser.PassWord.ToUpper())
goto GenRandomPassword; goto GenRandomPassword;
} }
else
{
vPwdReset = ServiceRouteConstValue.USER_DEFAULT_PASSWORD_RESET;
}
APIResponseData apiResponseData = UserManager.Instance.UpdateUserPassword(CurrentUser.LoginCode, EncryptionHelper.EncryptByMD5(vPwdReset));
APIResponseData apiResponseData = UserManager.Instance.ReprovisionDefaultPassword(CurrentUser.LoginCode, string.IsNullOrWhiteSpace(vPwdReset) ? "" : EncryptionHelper.EncryptByMD5(vPwdReset));
if (apiResponseData.IsSuccess) if (apiResponseData.IsSuccess)
{ {
string OperationType = e.Button.Caption.Contains("随机密码重置") ? "随机密码重置" : "默认密码重置"; string OperationType = e.Button.Caption.Contains("随机密码重置") ? "随机密码重置" : "默认密码重置";
@ -216,7 +211,7 @@ namespace DeviceRepairAndOptimization.Pages.Users
LoadingDatas(); LoadingDatas();
gridView1.RefreshData(); gridView1.RefreshData();
Clipboard.SetDataObject(vPwdReset, true); Clipboard.SetDataObject(vPwdReset, true);
XtraMessageBox.Show($"用户密码重置成功！<size=16><b><color=red>{vPwdReset}</color></b></size>", "成功", buttons: MessageBoxButtons.OK, icon: MessageBoxIcon.Information, allowHtmlText: DevExpress.Utils.DefaultBoolean.True); XtraMessageBox.Show($"用户密码重置成功！<size=16><b><color=red>{(string.IsNullOrWhiteSpace(vPwdReset) ? vPwdReset = DeviceRepair.Models.DefaultConstValue.USER_DEFAULT_PASSWORD_RESET : vPwdReset)}</color></b></size>", "成功", buttons: MessageBoxButtons.OK, icon: MessageBoxIcon.Information, allowHtmlText: DevExpress.Utils.DefaultBoolean.True);
} }
else else
{ {

4
DeviceRepairAndOptimization/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.1.13")] [assembly: AssemblyVersion("2.0.1.14")]
[assembly: AssemblyFileVersion("2.0.1.13")] [assembly: AssemblyFileVersion("2.0.1.14")]

15
DeviceRepairAndOptimization/ServiceRouteConstValue.cs
View File

@ -25,6 +25,11 @@
/// </summary> /// </summary>
public const string UpdateUserPassword = "Api/User/UpdateUserPassword"; public const string UpdateUserPassword = "Api/User/UpdateUserPassword";
/// <summary>
/// 密码重置
/// </summary>
public const string ReprovisionDefaultPassword = "Api/User/ReprovisionDefaultPassword";
/// <summary> /// <summary>
/// 查询最后修改密码时间 /// 查询最后修改密码时间
/// </summary> /// </summary>
@ -35,11 +40,6 @@
/// </summary> /// </summary>
public const string GetAllUsers = "Api/User/GetAllUser"; public const string GetAllUsers = "Api/User/GetAllUser";
/// <summary>
/// 重置用户时用的默认密码
/// </summary>
public const string USER_DEFAULT_PASSWORD_RESET = "Kanghui1";
/// <summary> /// <summary>
/// 用户信息修改 /// 用户信息修改
/// </summary> /// </summary>
@ -304,6 +304,11 @@
/// </summary> /// </summary>
public const string GetMaintenanceDatas = "Api/Maintenance/GetDatas"; public const string GetMaintenanceDatas = "Api/Maintenance/GetDatas";
/// <summary>
/// 设备维修列表导出
/// </summary>
public const string GetXlsxData = "Api/Maintenance/GetXlsxData";
/// <summary> /// <summary>
/// 设备维修 /// 设备维修
/// </summary> /// </summary>

2
TsSFCDeivceClient/DowntimeFormAdd.cs
View File

@ -260,7 +260,7 @@ namespace TsSFCDeivceClient
mail.Title = $"有在生产的设备出现故障，请您尽快评估故障状态！"; mail.Title = $"有在生产的设备出现故障，请您尽快评估故障状态！";
mail.IsBodyHtml = true; mail.IsBodyHtml = true;
System.Text.StringBuilder builder = new System.Text.StringBuilder(); System.Text.StringBuilder builder = new System.Text.StringBuilder();
builder.AppendLine($"<p>在 {ddlWhereFailureOccurred.Text} 发起的编号为：{MaintenanceAutoID} 的保修单，设备 {CurrentDeviceInfo.EquipmentName}（{CurrentDeviceInfo.EquipmentID}） 发生故障，{(deviceWarrantyRequestForm.InProduction ? "存有产品在加工中，产品批次号：" + deviceWarrantyRequestForm.Batch : "")} ，请您尽快评估故障情况。</p>"); builder.AppendLine($"<p>在 {ddlWhereFailureOccurred.Text} 发起的编号为：{MaintenanceAutoID} 的报修单，设备 {CurrentDeviceInfo.EquipmentName}（{CurrentDeviceInfo.EquipmentID}） 发生故障，{(deviceWarrantyRequestForm.InProduction ? "存有产品在加工中，产品批次号：" + deviceWarrantyRequestForm.Batch : "")} ，请您尽快评估故障情况。</p>");
builder.AppendLine($"<p>发起人：生产部 - {Runtime.CurrentUser.UserName}</p>"); builder.AppendLine($"<p>发起人：生产部 - {Runtime.CurrentUser.UserName}</p>");
mail.Body = builder.ToString(); mail.Body = builder.ToString();
string msgResult = ""; string msgResult = "";

21
TsSFCDeivceClient/pageDeviceMaintenanceFormView.cs
View File

@ -241,9 +241,12 @@ namespace TsSFCDeivceClient
} }
} }
gridControl1.BeginUpdate();
gridControl1.DataSource = null; gridControl1.DataSource = null;
gridControl1.DataSource = table; gridControl1.DataSource = table;
gridView1.BestFitColumns(); gridControl1.RefreshDataSource();
gridControl1.EndUpdate();
//gridView1.BestFitColumns();
CloseWaitForm(); CloseWaitForm();
} }
catch (Exception ex) catch (Exception ex)
@ -252,6 +255,7 @@ namespace TsSFCDeivceClient
CloseWaitForm(); CloseWaitForm();
XtraMessageBoxHelper.Error(ex.Message); XtraMessageBoxHelper.Error(ex.Message);
} }
this.Refresh();
} }
/// <summary> /// <summary>
@ -348,12 +352,12 @@ namespace TsSFCDeivceClient
{ {
if (Item.EvaluatorItems != null) if (Item.EvaluatorItems != null)
{ {
if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "PE") && EmployeeType == 0) if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "PE") && EmployeeType == 1)
{ {
PE = true; PE = true;
} }
if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "QE") && EmployeeType == 1) if (!Item.EvaluatorItems.Any(x => x.EvaluatorCode == "QE") && EmployeeType == 0)
{ {
QE = true; QE = true;
} }
@ -454,7 +458,6 @@ namespace TsSFCDeivceClient
private void btn_Query_Click(object sender, EventArgs e) private void btn_Query_Click(object sender, EventArgs e)
{ {
InitializeGridDatas(); InitializeGridDatas();
this.Refresh();
} }
private void btn_Assessment_PE_Click(object sender, EventArgs e) private void btn_Assessment_PE_Click(object sender, EventArgs e)
@ -642,5 +645,15 @@ namespace TsSFCDeivceClient
XtraMessageBoxHelper.Error(ex.Message); XtraMessageBoxHelper.Error(ex.Message);
} }
} }
private void cbbIsDown_SelectedIndexChanged(object sender, EventArgs e)
{
cbbIsDown.Refresh();
}
private void cb_Status_EditValueChanged(object sender, EventArgs e)
{
cb_Status.Refresh();
}
} }
} }

6
TsSFCDeivceClient/pageDeviceMaintenanceFormView.designer.cs generated
View File

@ -29,6 +29,7 @@ namespace TsSFCDeivceClient
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageDeviceMaintenanceFormView)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageDeviceMaintenanceFormView));
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
@ -41,7 +42,7 @@ namespace TsSFCDeivceClient
this.btn_Assessment_QE = new DevExpress.XtraEditors.SimpleButton(); this.btn_Assessment_QE = new DevExpress.XtraEditors.SimpleButton();
this.btnResumptionConfirm = new DevExpress.XtraEditors.SimpleButton(); this.btnResumptionConfirm = new DevExpress.XtraEditors.SimpleButton();
this.toolbarFormControl1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormControl(); this.toolbarFormControl1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormControl();
this.toolbarFormManager1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(); this.toolbarFormManager1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(this.components);
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl(); this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@ -467,6 +468,7 @@ namespace TsSFCDeivceClient
this.cb_Status.Size = new System.Drawing.Size(349, 26); this.cb_Status.Size = new System.Drawing.Size(349, 26);
this.cb_Status.StyleController = this.layoutControl1; this.cb_Status.StyleController = this.layoutControl1;
this.cb_Status.TabIndex = 7; this.cb_Status.TabIndex = 7;
this.cb_Status.EditValueChanged += new System.EventHandler(this.cb_Status_EditValueChanged);
// //
// cbbIsDown // cbbIsDown
// //
@ -482,6 +484,7 @@ namespace TsSFCDeivceClient
this.cbbIsDown.Size = new System.Drawing.Size(349, 26); this.cbbIsDown.Size = new System.Drawing.Size(349, 26);
this.cbbIsDown.StyleController = this.layoutControl1; this.cbbIsDown.StyleController = this.layoutControl1;
this.cbbIsDown.TabIndex = 6; this.cbbIsDown.TabIndex = 6;
this.cbbIsDown.SelectedIndexChanged += new System.EventHandler(this.cbbIsDown_SelectedIndexChanged);
// //
// stackPanel1 // stackPanel1
// //
@ -660,6 +663,7 @@ namespace TsSFCDeivceClient
// //
// pageDeviceMaintenanceFormView // pageDeviceMaintenanceFormView
// //
this.AcceptButton = this.btn_Query;
this.Appearance.Options.UseFont = true; this.Appearance.Options.UseFont = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;