From 2e8e87e8c57456a8006e1393666f9e095772af40 Mon Sep 17 00:00:00 2001 From: clovejunti Date: Tue, 6 Aug 2024 14:11:07 +0800 Subject: [PATCH] 18 --- .../DeviceRepair.DataAccess.csproj | 1 + .../Script/5.0/Datas/Auths.sql | 81 ++++ .../SysCommon/EquipmentJumpPlanCheckDa.cs | 178 +++++++++ .../DeviceRepair.Models.csproj | 1 + DeviceRepair.Models/Enum/SysModelType.cs | 2 + .../Plan/EquipmentJumpPlanCheckInfo.cs | 79 ++++ DeviceRepairAndOptimization.sln | 4 +- .../Impl/EquipmentJumpPlanCheckRepository.cs | 135 +++++++ .../Impl/PreserveRepository.cs | 1 - .../TsSFCDevice.Client.Biz.csproj | 1 + .../DeviceSvc/MainService.disco | 2 +- .../Web References/DeviceSvc/MainService.wsdl | 195 +++++++--- .../Web References/DeviceSvc/Reference.cs | 253 +++++++++---- .../Web References/DeviceSvc/Reference.map | 4 +- .../OperationAuthConstValue.cs | 5 +- .../Properties/licenses.licx | 27 +- TsSFCDevice.Client.Launch/Tag/xueTagForm.cs | 2 - .../TsSFCDevice.Client.Launch.csproj | 9 + TsSFCDevice.Client.Launch/frm_Launch.cs | 5 +- .../sysConfig/pageJumpCheckEdit.Designer.cs | 356 ++++++++++++++++++ .../sysConfig/pageJumpCheckEdit.cs | 101 +++++ .../sysConfig/pageJumpCheckEdit.resx | 245 ++++++++++++ .../sysConfig/pageJumpCheckView.Designer.cs | 325 +++++++++++++++- .../sysConfig/pageJumpCheckView.cs | 205 +++++++++- .../sysConfig/pageJumpCheckView.resx | 194 ++++++++++ TsSFCDeviceService/App_Code/Class1.cs | 11 - TsSFCDeviceService/Nlog.config | 25 -- TsSFCDeviceService/Properties/AssemblyInfo.cs | 35 -- TsSFCDeviceService/TsSFCDeviceService.csproj | 146 ------- .../TsSFCDeviceService.csproj.user | 38 -- TsSFCDeviceService/Web.Debug.config | 31 -- TsSFCDeviceService/Web.Release.config | 32 -- TsSFCDeviceService/Web.config | 36 -- TsSFCDeviceService/deviceData.asmx | 1 - TsSFCDeviceService/deviceData.asmx.cs | 43 --- TsSFCDeviceService/packages.config | 5 - TsSFCDeviceSvc/MainService.asmx.cs | 119 ++++-- 37 files changed, 2349 insertions(+), 584 deletions(-) create mode 100644 DeviceRepair.DataAccess/SysCommon/EquipmentJumpPlanCheckDa.cs create mode 100644 DeviceRepair.Models/Plan/EquipmentJumpPlanCheckInfo.cs create mode 100644 TsSFCDevice.Client.Biz/Impl/EquipmentJumpPlanCheckRepository.cs create mode 100644 TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.Designer.cs create mode 100644 TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.cs create mode 100644 TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.resx delete mode 100644 TsSFCDeviceService/App_Code/Class1.cs delete mode 100644 TsSFCDeviceService/Nlog.config delete mode 100644 TsSFCDeviceService/Properties/AssemblyInfo.cs delete mode 100644 TsSFCDeviceService/TsSFCDeviceService.csproj delete mode 100644 TsSFCDeviceService/TsSFCDeviceService.csproj.user delete mode 100644 TsSFCDeviceService/Web.Debug.config delete mode 100644 TsSFCDeviceService/Web.Release.config delete mode 100644 TsSFCDeviceService/Web.config delete mode 100644 TsSFCDeviceService/deviceData.asmx delete mode 100644 TsSFCDeviceService/deviceData.asmx.cs delete mode 100644 TsSFCDeviceService/packages.config diff --git a/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj b/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj index ee40dc3..b91547a 100644 --- a/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj +++ b/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj @@ -75,6 +75,7 @@ + diff --git a/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql b/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql index 4cdaf0e..6019ca6 100644 --- a/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql +++ b/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql @@ -19,6 +19,87 @@ BEGIN (N'BIZ_EQUIP', N'设备', N'BIZ', N'SYSADMIN', GETDATE() ); END; +/* 跳过当天保养计划校验 */ +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_JUMP_CHECK', N'跳过当天保养计划校验', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK_01' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_JUMP_CHECK_01', N'跳过当天保养计划校验查看', N'BIZ_EQUIP_JUMP_CHECK', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK_02' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_JUMP_CHECK_02', N'跳过当天保养计划校验新增', N'BIZ_EQUIP_JUMP_CHECK', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK_03' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_JUMP_CHECK_03', N'跳过当天保养计划校验删除', N'BIZ_EQUIP_JUMP_CHECK', N'SYSADMIN', GETDATE() ); +END; + /* 软件配置 */ IF NOT EXISTS ( diff --git a/DeviceRepair.DataAccess/SysCommon/EquipmentJumpPlanCheckDa.cs b/DeviceRepair.DataAccess/SysCommon/EquipmentJumpPlanCheckDa.cs new file mode 100644 index 0000000..172dc3e --- /dev/null +++ b/DeviceRepair.DataAccess/SysCommon/EquipmentJumpPlanCheckDa.cs @@ -0,0 +1,178 @@ +using DeviceRepair.DataAccess.Data; +using DeviceRepair.Models; +using DeviceRepair.Models.Plan; +using DeviceRepair.Utils; +using NLog; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; + + +namespace DeviceRepair.DataAccess.SysCommon +{ + public class EquipmentJumpPlanCheckDa : BaseDa + { + private static readonly Logger log = LogManager.GetCurrentClassLogger(); + + public EquipmentJumpPlanCheckDa(IDictionary apiParams) : base(apiParams) + { + + } + + /// + /// 获取全部配置信息 + /// + /// + public DataSet GetDatas() + { + var dsDatas = new DataSet("Datas"); + try + { + var EquipmentID = string.Empty; + DateTime? CheckDate = null; + + if (ApiParameters.ContainsKey("EquipmentID")) + { + EquipmentID = base.GetParamString("EquipmentID", "设备编号"); + } + + if (ApiParameters.ContainsKey("CheckDate")) + { + CheckDate = base.GetParamDateTime("CheckDate", "校验日期"); + } + + var exp = Expressionable.Create() + .And((x, dev) => x.Status == "A") + .AndIF(!EquipmentID.IsNull(), (x, dev) => x.EquipmentID == EquipmentID) + .AndIF(CheckDate.HasValue, (x, dev) => x.CheckDate == CheckDate.Value) + .ToExpression();//拼接表达式 + + var Datas = devMain.Queryable((x, dev) => new object[] { + JoinType.Inner , x.EquipmentAutoID == dev.AutoID + }).Where(exp)?.Select((x, dev) => new + { + AutoID = x.AutoID, + EquipmentAutoID = x.EquipmentAutoID, + CheckDate = x.CheckDate, + CreateBy = x.CreateBy, + CreateClient = x.CreateClient, + CreateOn = x.CreateOn, + EquipmentID = x.EquipmentID, + EquipmentName = dev.EquipmentName, + Status = x.Status + }).ToList(); + var table = Datas.ToDataTable(); + dsDatas.Tables.Add(table); + return dsDatas; + } + catch (SqlException sqlEx) + { + throw sqlEx; + } + catch (Exception ex) + { + log.Error(ex); + throw ex; + } + } + + /// + /// 数据新增 + /// + /// + public APIResponseData DataNews() + { + try + { + var EquipmentID = base.GetParamString("EquipmentID", "设备编号"); + var CheckDate = base.GetParamDateTime("CheckDate", "校验日期"); + int OperationID = base.GetParamInt("OPERATORAUTOID", "操作员"); + + var dev = devMain.Queryable().First(x => x.EquipmentID.Equals(EquipmentID, StringComparison.CurrentCultureIgnoreCase)); + if (dev == null) + throw new ArgumentException($"没有找到设备编号为【{EquipmentID}】的设备！"); + + var Item = new EquipmentJumpPlanCheckInfo + { + CheckDate = CheckDate.Date, + EquipmentAutoID = dev.AutoID, + EquipmentID = dev.EquipmentID, + Status = "A", + CreateBy = OperationID, + CreateClient = ApiParameters["CLIENTNAME"], + CreateOn = DateTime.Now + }; + + devMain.BeginTran(); + if (devMain.Insertable(Item).ExecuteCommand() > 0) + { + devMain.CommitTran(); + return new APIResponseData { Code = 1 }; + } + else + { + devMain.RollbackTran(); + return new APIResponseData { Code = -1, Message = "操作失败！" }; + } + } + catch (SqlException sqlEx) + { + devMain.RollbackTran(); + throw sqlEx; + } + catch (Exception ex) + { + devMain.RollbackTran(); + log.Error(ex); + throw ex; + } + } + + /// + /// 删除操作 + /// + /// + public APIResponseData DataDel() + { + try + { + var AutoID = base.GetParamInt("AutoID", "主键编号"); + var Item = devMain.Queryable().First(x => x.AutoID == AutoID); + if (Item == null) + throw new ArgumentNullException("当前数据不存在或已被其他人处理！"); + + int OperationID = base.GetParamInt("OPERATORAUTOID", "操作员"); + + Item.Status = "C"; + Item.ModifyBy = OperationID; + Item.ModifyClient = ApiParameters["CLIENTNAME"]; + Item.ModifyOn = DateTime.Now; + + devMain.BeginTran(); + if (devMain.Updateable(Item).ExecuteCommand() > 0) + { + devMain.CommitTran(); + return new APIResponseData { Code = 1 }; + } + else + { + devMain.RollbackTran(); + return new APIResponseData { Code = -1, Message = "操作失败！" }; + } + } + catch (SqlException sqlEx) + { + devMain.RollbackTran(); + throw sqlEx; + } + catch (Exception ex) + { + devMain.RollbackTran(); + log.Error(ex); + throw ex; + } + } + } +} diff --git a/DeviceRepair.Models/DeviceRepair.Models.csproj b/DeviceRepair.Models/DeviceRepair.Models.csproj index 1d080ea..27da211 100644 --- a/DeviceRepair.Models/DeviceRepair.Models.csproj +++ b/DeviceRepair.Models/DeviceRepair.Models.csproj @@ -129,6 +129,7 @@ + diff --git a/DeviceRepair.Models/Enum/SysModelType.cs b/DeviceRepair.Models/Enum/SysModelType.cs index 5a7308d..56e04b5 100644 --- a/DeviceRepair.Models/Enum/SysModelType.cs +++ b/DeviceRepair.Models/Enum/SysModelType.cs @@ -36,6 +36,8 @@ Get_SFC_Auths = 16, + Get_JumpCheck = 17, + Attachment = 99 } } diff --git a/DeviceRepair.Models/Plan/EquipmentJumpPlanCheckInfo.cs b/DeviceRepair.Models/Plan/EquipmentJumpPlanCheckInfo.cs new file mode 100644 index 0000000..abb90da --- /dev/null +++ b/DeviceRepair.Models/Plan/EquipmentJumpPlanCheckInfo.cs @@ -0,0 +1,79 @@ +using SqlSugar; +using System; + +namespace DeviceRepair.Models.Plan +{ + /// + /// 跳过指定日期的SFC设备使用前校验是否完成保养计划 + /// + [SugarTable("EquipmentJumpPlanCheck")] + public class EquipmentJumpPlanCheckInfo + { + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public virtual int AutoID { get; set; } + + /// + /// 设备编号 + /// + public virtual int EquipmentAutoID { get; set; } + + /// + /// 设备编号 + /// + public virtual string EquipmentID { get; set; } + + /// + /// 设备名称 + /// + [SugarColumn(IsIgnore = true)] + public virtual string EquipmentName { get; set; } + + /// + /// 跳过校验日期 + /// + public virtual DateTime CheckDate { get; set; } + + /// + /// 状态 + /// A 创建,正常状态 + /// C 删除,关闭状态 + /// + public virtual string Status { get; set; } + + /// + /// 创建人 + /// + public virtual int CreateBy { get; set; } + + /// + /// 创建日期 + /// + public virtual DateTime CreateOn { get; set; } + + /// + /// 创建人名称 + /// + [SugarColumn(IsIgnore = true)] + public virtual string CreatebyName { get; set; } + + /// + /// 操作人设备名称 + /// + public virtual string CreateClient { get; set; } + + /// + /// 修改人 + /// + public virtual int ModifyBy { get; set; } + + /// + /// 修改时间 + /// + public virtual DateTime ModifyOn { get; set; } + + /// + /// 修改操作人设备名称 + /// + public virtual string ModifyClient { get; set; } + } +} diff --git a/DeviceRepairAndOptimization.sln b/DeviceRepairAndOptimization.sln index 7e11a4a..edb3f28 100644 --- a/DeviceRepairAndOptimization.sln +++ b/DeviceRepairAndOptimization.sln @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a82b56595bda102750dd02a5332ffaaa95a266ddaa4c37a324a80df45f26d7e7 -size 10127 +oid sha256:e3ee45b6163cd0f597f336353b7819cadd975e44231dc1ad0e33f37ea8df08d4 +size 9536 diff --git a/TsSFCDevice.Client.Biz/Impl/EquipmentJumpPlanCheckRepository.cs b/TsSFCDevice.Client.Biz/Impl/EquipmentJumpPlanCheckRepository.cs new file mode 100644 index 0000000..7dec848 --- /dev/null +++ b/TsSFCDevice.Client.Biz/Impl/EquipmentJumpPlanCheckRepository.cs @@ -0,0 +1,135 @@ +using DeviceRepair.Models; +using DeviceRepair.Models.Plan; +using DeviceRepair.Utils; +using NLog; +using System; +using System.Collections.Generic; +using System.Data; +using TsSFCDevice.Client.Biz.Base.Service; +using TsSFCDevice.Client.Biz.Base.Utils; + +namespace TsSFCDevice.Client.Biz.Impl +{ + public class EquipmentJumpPlanCheckRepository + { + private readonly Logger log; + private static EquipmentJumpPlanCheckRepository manager; + + private IDictionary m_ApiParameters; + /// + /// API输入参数 + /// + public IDictionary ApiParameters + { + get + { + return m_ApiParameters; + } + set + { + m_ApiParameters = value; + } + } + + public static EquipmentJumpPlanCheckRepository Instance + { + get + { + if (manager == null) + manager = new EquipmentJumpPlanCheckRepository(); + return manager; + } + } + + public EquipmentJumpPlanCheckRepository() + { + log = LogManager.GetCurrentClassLogger(); + m_ApiParameters = new Dictionary(); + } + + #region 公共 + + internal string GetParameters(string cOperator = "", bool bFlag = true) + { + + return ParametersObject.GetInstance(cOperator).GetJsonSerialized(m_ApiParameters); + } + + #endregion + + + public IList GetDatas(string EquipmentID = "", DateTime? CheckDate = null) + { + try + { + var Data = new List(); + + byte[] btResults = null; + ApiParameters?.Clear(); + + if (!EquipmentID.IsNull()) + ApiParameters.Add("EquipmentID", EquipmentID); + if (CheckDate.HasValue) + ApiParameters.Add("CheckDate", CheckDate.Value.ToString("yyyy-MM-dd")); + + var Rtn = Utility.SfcBizService.CurrentSvc.GetDatas(DeviceSvc.SysModelType.Get_JumpCheck, GetParameters(), out btResults); + if (Rtn.Code != 1) + { + throw new Exception(Rtn.Message); + } + DataSet dsResults = CompressionHelper.ExactDataSet(btResults); + + return DTOHelper.DataTableToList(dsResults.Tables[0]); + } + catch (Exception ex) + { + log.Error(ex.Message, ex); + throw ex; + } + } + + public APIResponseData DataNews(string EquipmentID, DateTime CheckDate) + { + try + { + ApiParameters?.Clear(); + + ApiParameters.Add("EquipmentID", EquipmentID); + ApiParameters.Add("CheckDate", CheckDate.ToString("yyyy-MM-dd")); + + var Rtn = Utility.SfcBizService.CurrentSvc.News_JumpCheckData(GetParameters()); + if (Rtn.Code != 1) + { + throw new Exception(Rtn.Message); + } + return new APIResponseData { Code = 1, Message = Rtn.Message }; + } + catch (Exception ex) + { + log.Error(ex.Message, ex); + throw ex; + } + } + + public APIResponseData DataRemove(int AutoID) + { + try + { + ApiParameters?.Clear(); + ApiParameters.Add("AutoID", AutoID + ""); + + var Rtn = Utility.SfcBizService.CurrentSvc.Remove_JumpCheckData(GetParameters()); + if (Rtn.Code != 1) + { + throw new Exception(Rtn.Message); + } + return new APIResponseData { Code = 1, Message = Rtn.Message }; + } + catch (Exception ex) + { + log.Error(ex.Message, ex); + throw ex; + } + } + } +} diff --git a/TsSFCDevice.Client.Biz/Impl/PreserveRepository.cs b/TsSFCDevice.Client.Biz/Impl/PreserveRepository.cs index 1b2445a..f8ac19d 100644 --- a/TsSFCDevice.Client.Biz/Impl/PreserveRepository.cs +++ b/TsSFCDevice.Client.Biz/Impl/PreserveRepository.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; -using System.Runtime.CompilerServices; using TsSFCDevice.Client.Biz.Base.Service; using TsSFCDevice.Client.Biz.Base.Utils; diff --git a/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj b/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj index 388ce9b..2af5739 100644 --- a/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj +++ b/TsSFCDevice.Client.Biz/TsSFCDevice.Client.Biz.csproj @@ -65,6 +65,7 @@ + diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco index 0527e6a..c54b060 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.disco @@ -1,5 +1,5 @@ - + diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl index a3a4987..da0158c 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/MainService.wsdl @@ -1,5 +1,5 @@ - + @@ -62,6 +62,7 @@ + @@ -98,20 +99,6 @@ - - - - - - - - - - - - - - @@ -901,6 +888,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -969,15 +998,6 @@ - - - - - - - - - @@ -1383,6 +1403,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1411,11 +1458,6 @@ - - 判断当前开工设备是否存在未完成的保养计划 - - - 获取树形结构 @@ -1641,6 +1683,21 @@ + + 判断当前开工设备是否存在未完成的保养计划 + + + + + 跳过指定设备指定日期的设备计划完成校验 + + + + + 删除跳过指定设备指定日期的设备计划完成校验 + + + 电子签 @@ -1689,16 +1746,6 @@ - - - - - - - - - - @@ -2149,6 +2196,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2202,16 +2279,6 @@ - - - - - - - - - - @@ -2662,6 +2729,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs index 76bf4c3..e7d2dd0 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.cs @@ -14,12 +14,12 @@ #pragma warning disable 1591 namespace TsSFCDevice.Client.Biz.DeviceSvc { - using System.Diagnostics; using System; + using System.Web.Services; + using System.Diagnostics; + using System.Web.Services.Protocols; using System.Xml.Serialization; using System.ComponentModel; - using System.Web.Services.Protocols; - using System.Web.Services; using System.Data; @@ -40,8 +40,6 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { private System.Threading.SendOrPostCallback UserLoginOperationCompleted; - private System.Threading.SendOrPostCallback Get_EquipmentPlanIsCompleteOperationCompleted; - private System.Threading.SendOrPostCallback Get_DEVICE_TreeDatasOperationCompleted; private System.Threading.SendOrPostCallback Get_DEVICE_RouteOperationCompleted; @@ -132,6 +130,12 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { private System.Threading.SendOrPostCallback EditConfigsOperationCompleted; + private System.Threading.SendOrPostCallback Get_EquipmentPlanIsCompleteOperationCompleted; + + private System.Threading.SendOrPostCallback News_JumpCheckDataOperationCompleted; + + private System.Threading.SendOrPostCallback Remove_JumpCheckDataOperationCompleted; + private System.Threading.SendOrPostCallback UserConfirmOperationCompleted; private bool useDefaultCredentialsSetExplicitly; @@ -193,9 +197,6 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { /// public event UserLoginCompletedEventHandler UserLoginCompleted; - /// - public event Get_EquipmentPlanIsCompleteCompletedEventHandler Get_EquipmentPlanIsCompleteCompleted; - /// public event Get_DEVICE_TreeDatasCompletedEventHandler Get_DEVICE_TreeDatasCompleted; @@ -331,6 +332,15 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { /// public event EditConfigsCompletedEventHandler EditConfigsCompleted; + /// + public event Get_EquipmentPlanIsCompleteCompletedEventHandler Get_EquipmentPlanIsCompleteCompleted; + + /// + public event News_JumpCheckDataCompletedEventHandler News_JumpCheckDataCompleted; + + /// + public event Remove_JumpCheckDataCompletedEventHandler Remove_JumpCheckDataCompleted; + /// public event UserConfirmCompletedEventHandler UserConfirmCompleted; @@ -458,36 +468,6 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { } } - /// - [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] - [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_EquipmentPlanIsComplete", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] - public APIResponseData Get_EquipmentPlanIsComplete(string inParams) { - object[] results = this.Invoke("Get_EquipmentPlanIsComplete", new object[] { - inParams}); - return ((APIResponseData)(results[0])); - } - - /// - public void Get_EquipmentPlanIsCompleteAsync(string inParams) { - this.Get_EquipmentPlanIsCompleteAsync(inParams, null); - } - - /// - public void Get_EquipmentPlanIsCompleteAsync(string inParams, object userState) { - if ((this.Get_EquipmentPlanIsCompleteOperationCompleted == null)) { - this.Get_EquipmentPlanIsCompleteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGet_EquipmentPlanIsCompleteOperationCompleted); - } - this.InvokeAsync("Get_EquipmentPlanIsComplete", new object[] { - inParams}, this.Get_EquipmentPlanIsCompleteOperationCompleted, userState); - } - - private void OnGet_EquipmentPlanIsCompleteOperationCompleted(object arg) { - if ((this.Get_EquipmentPlanIsCompleteCompleted != null)) { - System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); - this.Get_EquipmentPlanIsCompleteCompleted(this, new Get_EquipmentPlanIsCompleteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); - } - } - /// [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_DEVICE_TreeDatas", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] @@ -1903,6 +1883,96 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { } } + /// + [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Get_EquipmentPlanIsComplete", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public APIResponseData Get_EquipmentPlanIsComplete(string inParams) { + object[] results = this.Invoke("Get_EquipmentPlanIsComplete", new object[] { + inParams}); + return ((APIResponseData)(results[0])); + } + + /// + public void Get_EquipmentPlanIsCompleteAsync(string inParams) { + this.Get_EquipmentPlanIsCompleteAsync(inParams, null); + } + + /// + public void Get_EquipmentPlanIsCompleteAsync(string inParams, object userState) { + if ((this.Get_EquipmentPlanIsCompleteOperationCompleted == null)) { + this.Get_EquipmentPlanIsCompleteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGet_EquipmentPlanIsCompleteOperationCompleted); + } + this.InvokeAsync("Get_EquipmentPlanIsComplete", new object[] { + inParams}, this.Get_EquipmentPlanIsCompleteOperationCompleted, userState); + } + + private void OnGet_EquipmentPlanIsCompleteOperationCompleted(object arg) { + if ((this.Get_EquipmentPlanIsCompleteCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.Get_EquipmentPlanIsCompleteCompleted(this, new Get_EquipmentPlanIsCompleteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/News_JumpCheckData", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public APIResponseData News_JumpCheckData(string inParams) { + object[] results = this.Invoke("News_JumpCheckData", new object[] { + inParams}); + return ((APIResponseData)(results[0])); + } + + /// + public void News_JumpCheckDataAsync(string inParams) { + this.News_JumpCheckDataAsync(inParams, null); + } + + /// + public void News_JumpCheckDataAsync(string inParams, object userState) { + if ((this.News_JumpCheckDataOperationCompleted == null)) { + this.News_JumpCheckDataOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNews_JumpCheckDataOperationCompleted); + } + this.InvokeAsync("News_JumpCheckData", new object[] { + inParams}, this.News_JumpCheckDataOperationCompleted, userState); + } + + private void OnNews_JumpCheckDataOperationCompleted(object arg) { + if ((this.News_JumpCheckDataCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.News_JumpCheckDataCompleted(this, new News_JumpCheckDataCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/Remove_JumpCheckData", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public APIResponseData Remove_JumpCheckData(string inParams) { + object[] results = this.Invoke("Remove_JumpCheckData", new object[] { + inParams}); + return ((APIResponseData)(results[0])); + } + + /// + public void Remove_JumpCheckDataAsync(string inParams) { + this.Remove_JumpCheckDataAsync(inParams, null); + } + + /// + public void Remove_JumpCheckDataAsync(string inParams, object userState) { + if ((this.Remove_JumpCheckDataOperationCompleted == null)) { + this.Remove_JumpCheckDataOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemove_JumpCheckDataOperationCompleted); + } + this.InvokeAsync("Remove_JumpCheckData", new object[] { + inParams}, this.Remove_JumpCheckDataOperationCompleted, userState); + } + + private void OnRemove_JumpCheckDataOperationCompleted(object arg) { + if ((this.Remove_JumpCheckDataCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.Remove_JumpCheckDataCompleted(this, new Remove_JumpCheckDataCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// [System.Web.Services.Protocols.SoapHeaderAttribute("SFCAuthorizeValue")] [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://www.TechScan.cn/UserConfirm", RequestNamespace="http://www.TechScan.cn/", ResponseNamespace="http://www.TechScan.cn/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] @@ -2176,6 +2246,9 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { /// Get_SFC_Auths, + /// + Get_JumpCheck, + /// Attachment, } @@ -2300,32 +2373,6 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { } } - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] - public delegate void Get_EquipmentPlanIsCompleteCompletedEventHandler(object sender, Get_EquipmentPlanIsCompleteCompletedEventArgs e); - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - public partial class Get_EquipmentPlanIsCompleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { - - private object[] results; - - internal Get_EquipmentPlanIsCompleteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : - base(exception, cancelled, userState) { - this.results = results; - } - - /// - public APIResponseData Result { - get { - this.RaiseExceptionIfNecessary(); - return ((APIResponseData)(this.results[0])); - } - } - } - /// [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void Get_DEVICE_TreeDatasCompletedEventHandler(object sender, Get_DEVICE_TreeDatasCompletedEventArgs e); @@ -3728,6 +3775,84 @@ namespace TsSFCDevice.Client.Biz.DeviceSvc { } } + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void Get_EquipmentPlanIsCompleteCompletedEventHandler(object sender, Get_EquipmentPlanIsCompleteCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Get_EquipmentPlanIsCompleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal Get_EquipmentPlanIsCompleteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public APIResponseData Result { + get { + this.RaiseExceptionIfNecessary(); + return ((APIResponseData)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void News_JumpCheckDataCompletedEventHandler(object sender, News_JumpCheckDataCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class News_JumpCheckDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal News_JumpCheckDataCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public APIResponseData Result { + get { + this.RaiseExceptionIfNecessary(); + return ((APIResponseData)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void Remove_JumpCheckDataCompletedEventHandler(object sender, Remove_JumpCheckDataCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class Remove_JumpCheckDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal Remove_JumpCheckDataCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public APIResponseData Result { + get { + this.RaiseExceptionIfNecessary(); + return ((APIResponseData)(this.results[0])); + } + } + } + /// [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void UserConfirmCompletedEventHandler(object sender, UserConfirmCompletedEventArgs e); diff --git a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map index f8d69fd..a47b807 100644 --- a/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map +++ b/TsSFCDevice.Client.Biz/Web References/DeviceSvc/Reference.map @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs b/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs index abc0ab1..27066ac 100644 --- a/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs +++ b/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs @@ -37,7 +37,10 @@ namespace TsSFCDevice.Client.Launch /// /// 跳过当天保养计划校验 /// - public readonly static string PLAN_JUMP_CHECK = "BIZ_EQUIP_PM_PLAN_06"; + public readonly static string PLAN_JUMP_CHECK = "BIZ_EQUIP_JUMP_CHECK"; + public readonly static string PLAN_JUMP_CHECK_Watch = "BIZ_EQUIP_JUMP_CHECK_01"; + public readonly static string PLAN_JUMP_CHECK_Add = "BIZ_EQUIP_JUMP_CHECK_02"; + public readonly static string PLAN_JUMP_CHECK_DELETE = "BIZ_EQUIP_JUMP_CHECK_03"; #region PM 保养计划 /// diff --git a/TsSFCDevice.Client.Launch/Properties/licenses.licx b/TsSFCDevice.Client.Launch/Properties/licenses.licx index 587995d..4446adf 100644 --- a/TsSFCDevice.Client.Launch/Properties/licenses.licx +++ b/TsSFCDevice.Client.Launch/Properties/licenses.licx @@ -1,17 +1,18 @@ -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/TsSFCDevice.Client.Launch/Tag/xueTagForm.cs b/TsSFCDevice.Client.Launch/Tag/xueTagForm.cs index 8b7e6fc..f7398f7 100644 --- a/TsSFCDevice.Client.Launch/Tag/xueTagForm.cs +++ b/TsSFCDevice.Client.Launch/Tag/xueTagForm.cs @@ -1,7 +1,5 @@ using DeviceRepair.Models.Tag; using System; -using System.Drawing; -using System.Windows.Forms; namespace TsSFCDevice.Client.Launch.Tag { diff --git a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj index bdbd597..5338112 100644 --- a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj +++ b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj @@ -406,6 +406,12 @@ + + Form + + + pageJumpCheckEdit.cs + Form @@ -575,6 +581,9 @@ Resources.resx True + + pageJumpCheckEdit.cs + pageJumpCheckView.cs diff --git a/TsSFCDevice.Client.Launch/frm_Launch.cs b/TsSFCDevice.Client.Launch/frm_Launch.cs index a8f4524..e407bc7 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.cs @@ -977,7 +977,10 @@ namespace TsSFCDevice.Client.Launch throw new Exception($"当前账号缺少此操作的权限"); } - + using (pageJumpCheckView view = new pageJumpCheckView()) + { + view.ShowDialog(this); + } } catch (Exception ex) { diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.Designer.cs b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.Designer.cs new file mode 100644 index 0000000..f0c9e3d --- /dev/null +++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.Designer.cs @@ -0,0 +1,356 @@ +namespace TsSFCDevice.Client.Launch.sysConfig +{ + partial class pageJumpCheckEdit + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageJumpCheckEdit)); + this.barManager1 = new DevExpress.XtraBars.BarManager(this.components); + this.barDockControlTop = new DevExpress.XtraBars.BarDockControl(); + this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); + this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); + this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); + this.toolbarFormControl1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormControl(); + this.toolbarFormManager1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(this.components); + this.barDockControl1 = new DevExpress.XtraBars.BarDockControl(); + this.barDockControl2 = new DevExpress.XtraBars.BarDockControl(); + this.barDockControl3 = new DevExpress.XtraBars.BarDockControl(); + this.barDockControl4 = new DevExpress.XtraBars.BarDockControl(); + this.btnCommit = new DevExpress.XtraBars.BarButtonItem(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.ipsEquipmentID = new DevExpress.XtraEditors.ButtonEdit(); + this.ipsCheckDate = new DevExpress.XtraEditors.DateEdit(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.dxValidationProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXValidationProvider(this.components); + ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.toolbarFormControl1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.toolbarFormManager1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); + this.SuspendLayout(); + // + // barManager1 + // + this.barManager1.DockControls.Add(this.barDockControlTop); + this.barManager1.DockControls.Add(this.barDockControlBottom); + this.barManager1.DockControls.Add(this.barDockControlLeft); + this.barManager1.DockControls.Add(this.barDockControlRight); + this.barManager1.Form = this; + // + // barDockControlTop + // + this.barDockControlTop.CausesValidation = false; + this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; + this.barDockControlTop.Location = new System.Drawing.Point(0, 31); + this.barDockControlTop.Manager = this.barManager1; + this.barDockControlTop.Margin = new System.Windows.Forms.Padding(4); + this.barDockControlTop.Size = new System.Drawing.Size(738, 0); + // + // barDockControlBottom + // + this.barDockControlBottom.CausesValidation = false; + this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; + this.barDockControlBottom.Location = new System.Drawing.Point(0, 123); + this.barDockControlBottom.Manager = this.barManager1; + this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(4); + this.barDockControlBottom.Size = new System.Drawing.Size(738, 0); + // + // barDockControlLeft + // + this.barDockControlLeft.CausesValidation = false; + this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; + this.barDockControlLeft.Location = new System.Drawing.Point(0, 31); + this.barDockControlLeft.Manager = this.barManager1; + this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(4); + this.barDockControlLeft.Size = new System.Drawing.Size(0, 92); + // + // barDockControlRight + // + this.barDockControlRight.CausesValidation = false; + this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; + this.barDockControlRight.Location = new System.Drawing.Point(738, 31); + this.barDockControlRight.Manager = this.barManager1; + this.barDockControlRight.Margin = new System.Windows.Forms.Padding(4); + this.barDockControlRight.Size = new System.Drawing.Size(0, 92); + // + // toolbarFormControl1 + // + this.toolbarFormControl1.Location = new System.Drawing.Point(0, 0); + this.toolbarFormControl1.Manager = this.toolbarFormManager1; + this.toolbarFormControl1.Name = "toolbarFormControl1"; + this.toolbarFormControl1.Size = new System.Drawing.Size(738, 31); + this.toolbarFormControl1.TabIndex = 4; + this.toolbarFormControl1.TabStop = false; + this.toolbarFormControl1.TitleItemLinks.Add(this.btnCommit); + this.toolbarFormControl1.ToolbarForm = this; + // + // toolbarFormManager1 + // + this.toolbarFormManager1.DockControls.Add(this.barDockControl1); + this.toolbarFormManager1.DockControls.Add(this.barDockControl2); + this.toolbarFormManager1.DockControls.Add(this.barDockControl3); + this.toolbarFormManager1.DockControls.Add(this.barDockControl4); + this.toolbarFormManager1.Form = this; + this.toolbarFormManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { + this.btnCommit}); + this.toolbarFormManager1.MaxItemId = 1; + // + // barDockControl1 + // + this.barDockControl1.CausesValidation = false; + this.barDockControl1.Dock = System.Windows.Forms.DockStyle.Top; + this.barDockControl1.Location = new System.Drawing.Point(0, 31); + this.barDockControl1.Manager = this.toolbarFormManager1; + this.barDockControl1.Size = new System.Drawing.Size(738, 0); + // + // barDockControl2 + // + this.barDockControl2.CausesValidation = false; + this.barDockControl2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.barDockControl2.Location = new System.Drawing.Point(0, 123); + this.barDockControl2.Manager = this.toolbarFormManager1; + this.barDockControl2.Size = new System.Drawing.Size(738, 0); + // + // barDockControl3 + // + this.barDockControl3.CausesValidation = false; + this.barDockControl3.Dock = System.Windows.Forms.DockStyle.Left; + this.barDockControl3.Location = new System.Drawing.Point(0, 31); + this.barDockControl3.Manager = this.toolbarFormManager1; + this.barDockControl3.Size = new System.Drawing.Size(0, 92); + // + // barDockControl4 + // + this.barDockControl4.CausesValidation = false; + this.barDockControl4.Dock = System.Windows.Forms.DockStyle.Right; + this.barDockControl4.Location = new System.Drawing.Point(738, 31); + this.barDockControl4.Manager = this.toolbarFormManager1; + this.barDockControl4.Size = new System.Drawing.Size(0, 92); + // + // btnCommit + // + this.btnCommit.Caption = "提交"; + this.btnCommit.Id = 0; + this.btnCommit.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.ImageOptions.Image"))); + this.btnCommit.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.ImageOptions.LargeImage"))); + this.btnCommit.Name = "btnCommit"; + this.btnCommit.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; + this.btnCommit.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnCommit_ItemClick); + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.ipsEquipmentID); + this.layoutControl1.Controls.Add(this.ipsCheckDate); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(0, 31); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.Root; + this.layoutControl1.Size = new System.Drawing.Size(738, 92); + this.layoutControl1.TabIndex = 5; + this.layoutControl1.Text = "layoutControl1"; + // + // ipsEquipmentID + // + this.ipsEquipmentID.Location = new System.Drawing.Point(104, 12); + this.ipsEquipmentID.MenuManager = this.barManager1; + this.ipsEquipmentID.Name = "ipsEquipmentID"; + this.ipsEquipmentID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsEquipmentID.Properties.Appearance.Options.UseFont = true; + this.ipsEquipmentID.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsEquipmentID.Properties.AppearanceFocused.Options.UseFont = true; + this.ipsEquipmentID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear), + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.ipsEquipmentID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + this.ipsEquipmentID.Size = new System.Drawing.Size(622, 26); + this.ipsEquipmentID.StyleController = this.layoutControl1; + this.ipsEquipmentID.TabIndex = 4; + this.ipsEquipmentID.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.ipsEquipmentID_ButtonClick); + // + // ipsCheckDate + // + this.ipsCheckDate.EditValue = null; + this.ipsCheckDate.Location = new System.Drawing.Point(104, 42); + this.ipsCheckDate.MenuManager = this.barManager1; + this.ipsCheckDate.Name = "ipsCheckDate"; + this.ipsCheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.Appearance.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.Button.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.Button.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.ButtonPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.ButtonPressed.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.CalendarHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.CalendarHeader.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.DayCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.DayCell.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellPressed.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellSelected.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellSelected.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellSpecialPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellSpecialPressed.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellSpecialSelected.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellSpecialSelected.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellToday.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.DayCellToday.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.Header.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.Header.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceCalendar.HeaderPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceCalendar.HeaderPressed.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceDropDown.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceDropDown.Options.UseFont = true; + this.ipsCheckDate.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.AppearanceFocused.Options.UseFont = true; + this.ipsCheckDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.ipsCheckDate.Properties.CalendarTimeProperties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.CalendarTimeProperties.Appearance.Options.UseFont = true; + this.ipsCheckDate.Properties.CalendarTimeProperties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Properties.CalendarTimeProperties.AppearanceFocused.Options.UseFont = true; + this.ipsCheckDate.Properties.CalendarTimeProperties.BeepOnError = false; + this.ipsCheckDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.ipsCheckDate.Properties.CalendarTimeProperties.MaskSettings.Set("mask", "d"); + this.ipsCheckDate.Properties.CalendarTimeProperties.TimeEditStyle = DevExpress.XtraEditors.Repository.TimeEditStyle.TouchUI; + this.ipsCheckDate.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.TouchUI; + this.ipsCheckDate.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.False; + this.ipsCheckDate.Size = new System.Drawing.Size(622, 26); + this.ipsCheckDate.StyleController = this.layoutControl1; + this.ipsCheckDate.TabIndex = 5; + // + // Root + // + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem2}); + this.Root.Name = "Root"; + this.Root.Size = new System.Drawing.Size(738, 92); + this.Root.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); + this.layoutControlItem1.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem1.AppearanceItemCaptionDisabled.Font = new System.Drawing.Font("Tahoma", 12F); + this.layoutControlItem1.AppearanceItemCaptionDisabled.Options.UseFont = true; + this.layoutControlItem1.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center; + this.layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center; + this.layoutControlItem1.Control = this.ipsEquipmentID; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(718, 30); + this.layoutControlItem1.Text = "设备编号："; + this.layoutControlItem1.TextSize = new System.Drawing.Size(80, 19); + // + // layoutControlItem2 + // + this.layoutControlItem2.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); + this.layoutControlItem2.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem2.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center; + this.layoutControlItem2.ContentVertAlignment = DevExpress.Utils.VertAlignment.Top; + this.layoutControlItem2.Control = this.ipsCheckDate; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 30); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(718, 42); + this.layoutControlItem2.Text = "校验时间："; + this.layoutControlItem2.TextSize = new System.Drawing.Size(80, 19); + // + // pageJumpCheckEdit + // + this.Appearance.Options.UseFont = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(738, 123); + this.Controls.Add(this.layoutControl1); + this.Controls.Add(this.barDockControlLeft); + this.Controls.Add(this.barDockControlRight); + this.Controls.Add(this.barDockControlBottom); + this.Controls.Add(this.barDockControlTop); + this.Controls.Add(this.barDockControl3); + this.Controls.Add(this.barDockControl4); + this.Controls.Add(this.barDockControl2); + this.Controls.Add(this.barDockControl1); + this.Controls.Add(this.toolbarFormControl1); + this.Font = new System.Drawing.Font("Tahoma", 12F); + this.IconOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("pageJumpCheckEdit.IconOptions.LargeImage"))); + this.Margin = new System.Windows.Forms.Padding(4); + this.Name = "pageJumpCheckEdit"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "设备检验关闭新增"; + this.ToolbarFormControl = this.toolbarFormControl1; + ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.toolbarFormControl1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.toolbarFormManager1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevExpress.XtraBars.BarManager barManager1; + private DevExpress.XtraBars.BarDockControl barDockControlTop; + private DevExpress.XtraBars.BarDockControl barDockControlBottom; + private DevExpress.XtraBars.BarDockControl barDockControlLeft; + private DevExpress.XtraBars.BarDockControl barDockControlRight; + private DevExpress.XtraBars.ToolbarForm.ToolbarFormControl toolbarFormControl1; + private DevExpress.XtraBars.ToolbarForm.ToolbarFormManager toolbarFormManager1; + private DevExpress.XtraBars.BarDockControl barDockControl1; + private DevExpress.XtraBars.BarDockControl barDockControl2; + private DevExpress.XtraBars.BarDockControl barDockControl3; + private DevExpress.XtraBars.BarDockControl barDockControl4; + private DevExpress.XtraBars.BarButtonItem btnCommit; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraEditors.ButtonEdit ipsEquipmentID; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraEditors.DateEdit ipsCheckDate; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraEditors.DXErrorProvider.DXValidationProvider dxValidationProvider1; + } +} \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.cs b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.cs new file mode 100644 index 0000000..6d5b315 --- /dev/null +++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.cs @@ -0,0 +1,101 @@ +using System; +using System.Windows.Forms; +using DevExpress.XtraBars; +using DevExpress.XtraBars.ToolbarForm; +using DevExpress.XtraEditors; +using TsSFCDevice.Client.Launch.Common; +using DeviceRepair.Models; +using DeviceRepair.Utils; +using DevExpress.XtraEditors.DXErrorProvider; + +namespace TsSFCDevice.Client.Launch.sysConfig +{ + public partial class pageJumpCheckEdit : ToolbarForm + { + public DeviceInformationInfo CurrentDeviceInfo = null; + + public DateTime? CheckDate { get { return (ipsCheckDate.EditValue + "").IsNull() ? null : (DateTime?)Convert.ToDateTime(ipsCheckDate.EditValue); } } + + public pageJumpCheckEdit() + { + InitializeComponent(); + } + + private void ipsEquipmentID_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + if (e.Button.Kind == DevExpress.XtraEditors.Controls.ButtonPredefines.Clear) + { + CurrentDeviceInfo = null; + ((sender as ButtonEdit)).EditValue = ""; + } + else + { + using (pageDeivceView view = new pageDeivceView()) + { + view.Text = "设备选择"; + if (view.ShowDialog(this) == DialogResult.OK) + { + CurrentDeviceInfo = view.CurrentDeviceInfo; + ipsEquipmentID.EditValue = $"{view.CurrentDeviceInfo.EquipmentName}({view.CurrentDeviceInfo.EquipmentID})"; + } + } + } + } + + private void btnCommit_ItemClick(object sender, ItemClickEventArgs e) + { + try + { + InitializeValidationProvider(); + if (dxValidationProvider1.Validate()) + { + if (CurrentDeviceInfo == null) + throw new ArgumentException("校验的设备不能为空！"); + + if (!CheckDate.HasValue) + throw new ArgumentException("校验时间不能为空！"); + + if (CheckDate.Value < new DateTime(2000, 01, 01)) + throw new ArgumentException("校验时间最小为2000年01月01日！"); + + if (CheckDate.Value > new DateTime(2999, 12, 31)) + throw new ArgumentException("校验时间最大为2999年12月31日！"); + + this.DialogResult = DialogResult.OK; + } + } + catch (Exception ex) + { + XtraMessageBoxHelper.Error(ex.Message); + } + } + + /// + /// 初始化验证控件 + /// + private void InitializeValidationProvider() + { + try + { + dxValidationProvider1.RemoveControlError(ipsEquipmentID); + dxValidationProvider1.RemoveControlError(ipsCheckDate); + + dxValidationProvider1 = new DXValidationProvider(); + //实例化一个必填规则，错误提示为：该字段不能为空 + ConditionValidationRule required = new ConditionValidationRule("RequiredRule", ConditionOperator.IsNotBlank) { ErrorText = $"字段不能为空" }; + + required.ErrorText = "请先选择设备"; + dxValidationProvider1.SetValidationRule(ipsEquipmentID, required); + dxValidationProvider1.SetIconAlignment(ipsEquipmentID, ErrorIconAlignment.MiddleLeft); + + required.ErrorText = "请选择校验日期"; + dxValidationProvider1.SetValidationRule(ipsCheckDate, required); + dxValidationProvider1.SetIconAlignment(ipsCheckDate, ErrorIconAlignment.MiddleLeft); + } + catch (Exception ex) + { + XtraMessageBoxHelper.Error(ex.Message); + } + } + } +} \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.resx b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.resx new file mode 100644 index 0000000..e277c65 --- /dev/null +++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckEdit.resx @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 148, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAt0RVh0VGl0 + bGUAU2F2ZTv56PkJAAAC9ElEQVQ4T4WTXUiTURjHV6YhYh9WmpSSGQPBNG1tuvk65+a+nHPT6WxOt+HM + r/zI75WmBkURdBME3QYFIYUYRVFBdJkfF2GpEV2oTec0K5crb/6d520XEkEHfrwv7zn/33nOeXgFobGd + EcbY8Rfh/yAiBM1vYwjCOE3FK05XAZt7AL1Dt9E1cAvt52+iufcGGtqvw91yBY6GS6h090NvaYGsoBxZ + ytLXLEtCQQSntcIzeA1WVx8CwU0ENv6wHuL7j034vvyAdyUAtakBrT2XkK0qBctGkmCntKAM3f1XYan2 + 8EFavLhKBPiQWKqBmNNiYtYHpcGNElsdJAozCaJIEEm2jvOXYbJ18TtS2BsKf5hbQxang7rIhgV/AHKt + kwlqIZIXkyCaBFHifDPaWFlF5W2s3F9YWA7gk/cb3n70Y5ztyimMMJQ6Mb+8jpyCKphP1yKTM5BgNwmi + T8mNaO4chLakid918oMPEzM+jDPGGG+mlzDHwnO+dWQrbDBVuJEu1ZJgLwl2ka2xrQ8qYx3yC2uh0NdA + rnEhV+NAjsoOqbKSBU8jK68CErkVxdYaHBerSbCPBHvSpTqcafGAKzDBWO5iOFFU5oTB4mBUo7C0GvqS + KuhK7NCZK9mcCykiJQkOkCAmVaJGTVMPL/jfkCnZfVhcEGbkkSCOBPtTRCo46jpYucX8otXvP7H6jQhi + 9WsQfvbuZ88VhiRPzypyIDmNI0E8CWLJZne3sjMaeIGfBSnAsxbE8toGj48hkqnZUaqQlColwSESHDyW + ngur8yy7ID36R2dxYWQGPQ+n0Tk8jbb779F87x0a706h/s4UTso00BRXIjFFQoIEEsQnpcpgsddDlKPF + 9ddLuPpqEZdfejH0/DP6ni7A83ge3aNz6GBkZKtYV8xIEIpIkEiCmMPCzDEyZkjVMA29RNHFF9B5nkHd + /QSKc4/ANY8gu/4BTtUOI02cD+EJDnFHjk+yLN8F+i2pn2Q7soWkLRzdQnLoW6xAIAj/DQXi/m5m2Bwf + AAAAAElFTkSuQmCC + + + + + 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 + rkJggg== + + + + + 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 + IbOtAAAAAElFTkSuQmCC + + + + 334, 17 + + \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs index b20d686..6916f8c 100644 --- a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs +++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.Designer.cs @@ -28,24 +28,58 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageJumpCheckView)); this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl(); + this.baripsEquipmentID = new DevExpress.XtraBars.BarEditItem(); + this.ipsEquipmentID = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.baripsDate = new DevExpress.XtraBars.BarEditItem(); + this.ipsCheckDate = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); + this.barSearch = new DevExpress.XtraBars.BarButtonItem(); + this.barNews = new DevExpress.XtraBars.BarButtonItem(); + this.barRemove = new DevExpress.XtraBars.BarButtonItem(); this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); + this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.ribbonStatusBar = new DevExpress.XtraBars.Ribbon.RibbonStatusBar(); + this.gcControl = new DevExpress.XtraGrid.GridControl(); + this.gvControl = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gcAutoID = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gcEquipmentID = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gcEquipmentName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gcCheckDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gcCreatebyName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gcCreateOn = new DevExpress.XtraGrid.Columns.GridColumn(); + this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcControl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvControl)).BeginInit(); this.SuspendLayout(); // // ribbon // this.ribbon.AllowMinimizeRibbon = false; this.ribbon.ExpandCollapseItem.Id = 0; + this.ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { + this.ribbon.ExpandCollapseItem, + this.ribbon.SearchEditItem, + this.baripsEquipmentID, + this.baripsDate, + this.barSearch, + this.barNews, + this.barRemove}); this.ribbon.Location = new System.Drawing.Point(0, 0); - this.ribbon.Margin = new System.Windows.Forms.Padding(4); - this.ribbon.MaxItemId = 4; + this.ribbon.Margin = new System.Windows.Forms.Padding(5); + this.ribbon.MaxItemId = 9; this.ribbon.Name = "ribbon"; - this.ribbon.OptionsMenuMinWidth = 424; + this.ribbon.OptionsMenuMinWidth = 545; this.ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { this.ribbonPage1}); + this.ribbon.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.ipsEquipmentID, + this.ipsCheckDate}); this.ribbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; this.ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; this.ribbon.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; @@ -53,41 +87,293 @@ this.ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide; this.ribbon.ShowQatLocationSelector = false; this.ribbon.ShowToolbarCustomizeItem = false; - this.ribbon.Size = new System.Drawing.Size(1331, 134); + this.ribbon.Size = new System.Drawing.Size(1331, 133); this.ribbon.StatusBar = this.ribbonStatusBar; this.ribbon.Toolbar.ShowCustomizeItem = false; // + // baripsEquipmentID + // + this.baripsEquipmentID.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True; + this.baripsEquipmentID.Caption = "设备编号："; + this.baripsEquipmentID.CaptionAlignment = DevExpress.Utils.HorzAlignment.Center; + this.baripsEquipmentID.Edit = this.ipsEquipmentID; + this.baripsEquipmentID.EditHeight = 30; + this.baripsEquipmentID.EditWidth = 180; + this.baripsEquipmentID.Id = 2; + this.baripsEquipmentID.ItemAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemAppearance.Disabled.Options.UseFont = true; + this.baripsEquipmentID.ItemAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemAppearance.Hovered.Options.UseFont = true; + this.baripsEquipmentID.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemAppearance.Normal.Options.UseFont = true; + this.baripsEquipmentID.ItemAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemAppearance.Pressed.Options.UseFont = true; + this.baripsEquipmentID.ItemInMenuAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemInMenuAppearance.Disabled.Options.UseFont = true; + this.baripsEquipmentID.ItemInMenuAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemInMenuAppearance.Hovered.Options.UseFont = true; + this.baripsEquipmentID.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemInMenuAppearance.Normal.Options.UseFont = true; + this.baripsEquipmentID.ItemInMenuAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsEquipmentID.ItemInMenuAppearance.Pressed.Options.UseFont = true; + this.baripsEquipmentID.Name = "baripsEquipmentID"; + // + // ipsEquipmentID + // + this.ipsEquipmentID.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsEquipmentID.Appearance.Options.UseFont = true; + this.ipsEquipmentID.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsEquipmentID.AppearanceDisabled.Options.UseFont = true; + this.ipsEquipmentID.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsEquipmentID.AppearanceFocused.Options.UseFont = true; + this.ipsEquipmentID.AppearanceReadOnly.Options.UseTextOptions = true; + this.ipsEquipmentID.AppearanceReadOnly.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; + this.ipsEquipmentID.AutoHeight = false; + this.ipsEquipmentID.MaxLength = 20; + this.ipsEquipmentID.Name = "ipsEquipmentID"; + // + // baripsDate + // + this.baripsDate.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True; + this.baripsDate.Caption = "校验日期："; + this.baripsDate.Edit = this.ipsCheckDate; + this.baripsDate.EditHeight = 30; + this.baripsDate.EditWidth = 180; + this.baripsDate.Id = 5; + this.baripsDate.ItemAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemAppearance.Disabled.Options.UseFont = true; + this.baripsDate.ItemAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemAppearance.Hovered.Options.UseFont = true; + this.baripsDate.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemAppearance.Normal.Options.UseFont = true; + this.baripsDate.ItemAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemAppearance.Pressed.Options.UseFont = true; + this.baripsDate.ItemInMenuAppearance.Disabled.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemInMenuAppearance.Disabled.Options.UseFont = true; + this.baripsDate.ItemInMenuAppearance.Hovered.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemInMenuAppearance.Hovered.Options.UseFont = true; + this.baripsDate.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemInMenuAppearance.Normal.Options.UseFont = true; + this.baripsDate.ItemInMenuAppearance.Pressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.baripsDate.ItemInMenuAppearance.Pressed.Options.UseFont = true; + this.baripsDate.Name = "baripsDate"; + // + // ipsCheckDate + // + this.ipsCheckDate.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.Appearance.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.Button.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.Button.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.ButtonHighlighted.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.ButtonHighlighted.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.ButtonPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.ButtonPressed.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.CalendarHeader.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.CalendarHeader.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.DayCell.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.DayCell.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.DayCellHighlighted.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.DayCellHighlighted.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.DayCellHoliday.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.DayCellHoliday.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.DayCellPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.DayCellPressed.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.DayCellSelected.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.DayCellSelected.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.DayCellToday.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.DayCellToday.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.Header.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.Header.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.HeaderHighlighted.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.HeaderHighlighted.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.HeaderPressed.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.HeaderPressed.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.WeekDay.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.WeekDay.Options.UseFont = true; + this.ipsCheckDate.AppearanceCalendar.WeekNumber.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceCalendar.WeekNumber.Options.UseFont = true; + this.ipsCheckDate.AppearanceDropDown.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceDropDown.Options.UseFont = true; + this.ipsCheckDate.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F); + this.ipsCheckDate.AppearanceFocused.Options.UseFont = true; + this.ipsCheckDate.AutoHeight = false; + this.ipsCheckDate.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.ipsCheckDate.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.ipsCheckDate.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.TouchUI; + this.ipsCheckDate.Name = "ipsCheckDate"; + this.ipsCheckDate.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.False; + // + // barSearch + // + this.barSearch.Caption = "搜索"; + this.barSearch.Id = 6; + this.barSearch.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barSearch.ImageOptions.SvgImage"))); + this.barSearch.Name = "barSearch"; + this.barSearch.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barSearch_ItemClick); + // + // barNews + // + this.barNews.Caption = "新增"; + this.barNews.Id = 7; + this.barNews.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barNews.ImageOptions.Image"))); + this.barNews.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barNews.ImageOptions.LargeImage"))); + this.barNews.Name = "barNews"; + this.barNews.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barNews_ItemClick); + // + // barRemove + // + this.barRemove.Caption = "删除"; + this.barRemove.Enabled = false; + this.barRemove.Id = 8; + this.barRemove.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barRemove.ImageOptions.Image"))); + this.barRemove.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barRemove.ImageOptions.LargeImage"))); + this.barRemove.Name = "barRemove"; + this.barRemove.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barRemove_ItemClick); + // // ribbonPage1 // this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { - this.ribbonPageGroup1}); + this.ribbonPageGroup1, + this.ribbonPageGroup2}); this.ribbonPage1.Name = "ribbonPage1"; this.ribbonPage1.Text = "ribbonPage1"; // // ribbonPageGroup1 // + this.ribbonPageGroup1.ItemLinks.Add(this.baripsDate); + this.ribbonPageGroup1.ItemLinks.Add(this.baripsEquipmentID); this.ribbonPageGroup1.Name = "ribbonPageGroup1"; - this.ribbonPageGroup1.Text = "ribbonPageGroup1"; + this.ribbonPageGroup1.Text = "查询"; + // + // ribbonPageGroup2 + // + this.ribbonPageGroup2.ItemLinks.Add(this.barSearch); + this.ribbonPageGroup2.ItemLinks.Add(this.barNews); + this.ribbonPageGroup2.ItemLinks.Add(this.barRemove); + this.ribbonPageGroup2.Name = "ribbonPageGroup2"; + this.ribbonPageGroup2.Text = "操作"; // // ribbonStatusBar // - this.ribbonStatusBar.Location = new System.Drawing.Point(0, 662); + this.ribbonStatusBar.Location = new System.Drawing.Point(0, 743); + this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(4); this.ribbonStatusBar.Name = "ribbonStatusBar"; this.ribbonStatusBar.Ribbon = this.ribbon; - this.ribbonStatusBar.Size = new System.Drawing.Size(1489, 24); + this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 24); + // + // gcControl + // + this.gcControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcControl.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1); + this.gcControl.Location = new System.Drawing.Point(0, 133); + this.gcControl.MainView = this.gvControl; + this.gcControl.MenuManager = this.ribbon; + this.gcControl.Name = "gcControl"; + this.gcControl.Size = new System.Drawing.Size(1331, 610); + this.gcControl.TabIndex = 2; + this.gcControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvControl}); + // + // gvControl + // + this.gvControl.Appearance.HeaderPanel.Font = new System.Drawing.Font("Tahoma", 12F); + this.gvControl.Appearance.HeaderPanel.Options.UseFont = true; + this.gvControl.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple; + this.gvControl.ColumnPanelRowHeight = 31; + this.gvControl.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gcAutoID, + this.gcEquipmentID, + this.gcEquipmentName, + this.gcCheckDate, + this.gcCreatebyName, + this.gcCreateOn}); + this.gvControl.GridControl = this.gcControl; + this.gvControl.Name = "gvControl"; + this.gvControl.OptionsBehavior.Editable = false; + this.gvControl.OptionsSelection.CheckBoxSelectorColumnWidth = 36; + this.gvControl.OptionsSelection.UseIndicatorForSelection = false; + this.gvControl.OptionsView.AllowHtmlDrawHeaders = true; + this.gvControl.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.False; + this.gvControl.OptionsView.ShowGroupPanel = false; + this.gvControl.RowHeight = 31; + // + // gcAutoID + // + this.gcAutoID.Caption = "主键编号"; + this.gcAutoID.FieldName = "AutoID"; + this.gcAutoID.Name = "gcAutoID"; + // + // gcEquipmentID + // + this.gcEquipmentID.Caption = "设备编号"; + this.gcEquipmentID.FieldName = "EquipmentID"; + this.gcEquipmentID.Name = "gcEquipmentID"; + this.gcEquipmentID.Visible = true; + this.gcEquipmentID.VisibleIndex = 0; + // + // gcEquipmentName + // + this.gcEquipmentName.Caption = "设备名称"; + this.gcEquipmentName.FieldName = "EquipmentName"; + this.gcEquipmentName.Name = "gcEquipmentName"; + this.gcEquipmentName.Visible = true; + this.gcEquipmentName.VisibleIndex = 1; + // + // gcCheckDate + // + this.gcCheckDate.Caption = "校验日期"; + this.gcCheckDate.FieldName = "CheckDate"; + this.gcCheckDate.Name = "gcCheckDate"; + this.gcCheckDate.Visible = true; + this.gcCheckDate.VisibleIndex = 2; + // + // gcCreatebyName + // + this.gcCreatebyName.Caption = "创建人"; + this.gcCreatebyName.FieldName = "CreatebyName"; + this.gcCreatebyName.Name = "gcCreatebyName"; + this.gcCreatebyName.Visible = true; + this.gcCreatebyName.VisibleIndex = 3; + // + // gcCreateOn + // + this.gcCreateOn.Caption = "创建时间"; + this.gcCreateOn.FieldName = "CreateOn"; + this.gcCreateOn.Name = "gcCreateOn"; + this.gcCreateOn.Visible = true; + this.gcCreateOn.VisibleIndex = 4; + // + // splashScreenManager1 + // + this.splashScreenManager1.ClosingDelay = 500; // // pageJumpCheckView // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.Appearance.Options.UseFont = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1489, 686); + this.ClientSize = new System.Drawing.Size(1331, 767); + this.Controls.Add(this.gcControl); this.Controls.Add(this.ribbonStatusBar); this.Controls.Add(this.ribbon); + this.Font = new System.Drawing.Font("Tahoma", 12F); + this.IconOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("pageJumpCheckView.IconOptions.LargeImage"))); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "pageJumpCheckView"; this.Ribbon = this.ribbon; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StatusBar = this.ribbonStatusBar; - this.Text = "pageJumpCheckView"; + this.Text = "设备检验关闭"; + this.WindowState = System.Windows.Forms.FormWindowState.Maximized; + this.Load += new System.EventHandler(this.pageJumpCheckView_Load); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ipsCheckDate)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcControl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvControl)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -99,5 +385,22 @@ private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1; private DevExpress.XtraBars.Ribbon.RibbonStatusBar ribbonStatusBar; + private DevExpress.XtraBars.BarEditItem baripsEquipmentID; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit ipsEquipmentID; + private DevExpress.XtraBars.BarEditItem baripsDate; + private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit ipsCheckDate; + private DevExpress.XtraBars.BarButtonItem barSearch; + private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2; + private DevExpress.XtraBars.BarButtonItem barNews; + private DevExpress.XtraBars.BarButtonItem barRemove; + private DevExpress.XtraGrid.GridControl gcControl; + private DevExpress.XtraGrid.Views.Grid.GridView gvControl; + private DevExpress.XtraGrid.Columns.GridColumn gcEquipmentID; + private DevExpress.XtraGrid.Columns.GridColumn gcEquipmentName; + private DevExpress.XtraGrid.Columns.GridColumn gcCheckDate; + private DevExpress.XtraGrid.Columns.GridColumn gcCreatebyName; + private DevExpress.XtraGrid.Columns.GridColumn gcCreateOn; + private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1; + private DevExpress.XtraGrid.Columns.GridColumn gcAutoID; } } \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs index f30e0bf..85d3575 100644 --- a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs +++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.cs @@ -1,21 +1,218 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; -using System.Text; using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; using DevExpress.XtraBars; +using DeviceRepair.Utils; +using DeviceRepair.Models.Plan; +using TsSFCDevice.Client.Biz.Impl; +using DevExpress.XtraGrid.Views.Grid; +using TsSFCDevice.Client.Biz.Base.Utils; namespace TsSFCDevice.Client.Launch.sysConfig { public partial class pageJumpCheckView : DevExpress.XtraBars.Ribbon.RibbonForm { + EquipmentJumpPlanCheckInfo m_CurrentModel = null; + EquipmentJumpPlanCheckRepository m_Cmd; + IList Datas; + + /// + /// 校验日期 + /// + private DateTime m_CheckDate + { + get { return (baripsDate.EditValue + "").IsNull() ? DateTime.Today : Convert.ToDateTime(baripsDate.EditValue); } + } + + /// + /// 设备编号 + /// + private string m_EquipmentID + { + get { return baripsEquipmentID.EditValue + ""; } + } + + public pageJumpCheckView() { InitializeComponent(); + if (m_Cmd == null) + m_Cmd = new EquipmentJumpPlanCheckRepository(); + } + + /// + /// 窗体加载 + /// + /// + /// + private void pageJumpCheckView_Load(object sender, EventArgs e) + { + // 关闭列头右键菜单 + gvControl.OptionsMenu.EnableColumnMenu = false; + gvControl.OptionsBehavior.Editable = false; + gvControl.OptionsBehavior.ReadOnly = true; + gvControl.OptionsSelection.EnableAppearanceFocusedCell = false; + gvControl.OptionsScrollAnnotations.ShowSelectedRows = DevExpress.Utils.DefaultBoolean.False; + + gvControl.CustomDrawRowIndicator += GvControl_CustomDrawRowIndicator; + gvControl.RowCellClick += GvControl_RowCellClick; + } + + /// + /// 单元格点击 + /// + /// + /// + private void GvControl_RowCellClick(object sender, RowCellClickEventArgs e) + { + m_CurrentModel = gvControl.GetRow(e.RowHandle) as EquipmentJumpPlanCheckInfo; + barRemove.Enabled = m_CurrentModel != null; + } + + /// + /// 自增长行号 + /// + /// + /// + private void GvControl_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + { + if (e.Info.IsRowIndicator && e.RowHandle >= 0) + { + e.Info.DisplayText = (e.RowHandle + 1).ToString(); + e.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + e.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; + } + } + + /// + /// 搜索 + /// + /// + /// + private void barSearch_ItemClick(object sender, ItemClickEventArgs e) + { + InitializeGridData(); + } + + /// + /// 新增 + /// + /// + /// + private void barNews_ItemClick(object sender, ItemClickEventArgs e) + { + try + { + if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PLAN_JUMP_CHECK_Add)) + { + throw new Exception($"当前账号缺少此操作的权限"); + } + + using (var view = new pageJumpCheckEdit()) + { + if (view.ShowDialog(this) == DialogResult.OK) + { + if (view.CurrentDeviceInfo != null && view.CheckDate.HasValue) + { + var result = m_Cmd.DataNews(view.CurrentDeviceInfo.EquipmentID, view.CheckDate.Value); + if (!result.IsSuccess) + throw new Exception(result.Message); + InitializeGridData(); + XtraMessageBoxHelper.Info("操作成功！"); + } + } + } + } + catch (Exception ex) + { + throw new Exception(ex.Message); + } + } + + /// + /// 删除 + /// + /// + /// + private void barRemove_ItemClick(object sender, ItemClickEventArgs e) + { + try + { + if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PLAN_JUMP_CHECK_DELETE)) + { + throw new Exception($"当前账号缺少此操作的权限"); + } + + if (m_CurrentModel == null) + { + throw new ArgumentNullException($"请先选择操作的数据！"); + + } + + if (XtraMessageBoxHelper.AskYesNo($"是否确认执行删除操作！") == DialogResult.Yes) + { + var result = m_Cmd.DataRemove(m_CurrentModel.AutoID); + if (!result.IsSuccess) + throw new Exception(result.Message); + InitializeGridData(); + XtraMessageBoxHelper.Info("操作成功！"); + } + } + catch (Exception ex) + { + throw new Exception(ex.Message); + } + } + + /// + /// 数据加载 + /// + public void InitializeGridData() + { + try + { + if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PLAN_JUMP_CHECK_Watch)) + { + throw new Exception($"当前账号缺少此操作的权限"); + } + + splashScreenManager1.ShowWaitForm(); + Datas = m_Cmd.GetDatas(m_EquipmentID, m_CheckDate); + + if (Datas != null && Datas.Count > 0) + { + foreach (var item in Datas) + { + var us = Utility.SystemRuntimeInfo.CurrentUsersCaches.FirstOrDefault(x => x.Id == item.CreateBy); + if (us != null) + { + item.CreatebyName = us.UserName; + } + } + } + + gcControl.DataSource = Datas?.ToList(); + m_CurrentModel = null; + barRemove.Enabled = false; + + int Counter = Datas?.Count ?? 0; + if (Counter > 0) + { + SizeF size = this.CreateGraphics().MeasureString(Datas.Count.ToString(), this.Font); + gvControl.IndicatorWidth = Convert.ToInt32(size.Width) + 20; + gvControl.FocusedRowHandle = 0; + GvControl_RowCellClick(gvControl, new RowCellClickEventArgs(new DevExpress.Utils.DXMouseEventArgs(MouseButtons.Left, 1, 1, 1, 1), 0, gcEquipmentID)); + } + + splashScreenManager1.CloseWaitForm(); + } + catch (Exception ex) + { + splashScreenManager1.CloseWaitForm(); + throw new Exception(ex.Message); + } } } } \ No newline at end of file diff --git a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx index 1af7de1..9d2fae7 100644 --- a/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx +++ b/TsSFCDevice.Client.Launch/sysConfig/pageJumpCheckView.resx @@ -117,4 +117,198 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACoDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku + WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4 + N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk + aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI5LjcsMjcuM0wy + MiwxOS42bC0wLjEtMC4xYzEuMy0xLjgsMi4xLTQuMSwyLjEtNi41YzAtNi4xLTQuOS0xMS0xMS0xMVMy + LDYuOSwyLDEzczQuOSwxMSwxMSwxMSAgYzIuNCwwLDQuNy0wLjgsNi41LTIuMWMwLDAsMCwwLjEsMC4x + LDAuMWw3LjcsNy43YzAuMywwLjMsMC45LDAuMywxLjIsMGwxLjItMS4yQzMwLjEsMjguMiwzMC4xLDI3 + LjYsMjkuNywyNy4zeiBNNCwxM2MwLTUsNC05LDktOSAgczksNCw5LDlzLTQsOS05LDlTNCwxOCw0LDEz + eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACN0RVh0VGl0 + bGUAQWRkO0ZpbGU7QWRkRmlsZTtCYXJzO1JpYmJvbjsV3KoKAAADJElEQVQ4T02TaUhUURiGr2tqFkUF + /fFHOLbaRgtTFFqhWaE1KhFlppHiMla2KIrlWi5NTo6OuYJaQaWSUhnZItnmaFoUgaH5ozQxLXNWvTPj + 23fOJHTguR/33Ps+9zvn3ivQsCuo6nx+paoTjIIqDfIrNSgg8io6iQ7klmuQW/YWl8s6kFP6so0y9gAE + Bhv2+RUaTNMZhw42pjnWGaw2sopfsZTD/wKHS+Vvecg0aYGRMJhs6I1mjs5ogZYQLVakK9tZyvF/gSOz + MoHeZAvYQmYuM5LINEXCSTNEswW5at6BU1a9v8Bgwyld+YK3qzOK0BlEEokY/j2E5s5rUD44AroRhVSb + NYVofqZhAheL1SBk3PHjAudURRtf58S/p3/+psGlxv141FOM72MfYbboeG3pViHzdiDirm6RUc4+7eYu + LpiVnPeUC/7ozfgxNoicu0HoG+6AaP0NdVMqzpUeRMm9c9BOfUHv0HOk1OzQRmZu9KKsHRO4JmY/hoV2 + WEvt321X4GFXCQziN4wYXiOxOAS9A2M4rQrB1z/1GJhoQuObHMiLtlZQ1pEJ3OTpLVwwoZvEhZr96B1p + huKOHCeVwUgg2L7IqcYXypB9KxxP+pMQp5QOU3YWE8yOTbtP6ySBfhIJqm14N5KJOMUBfOr7iXGSjuum + eGUjJj8INz774ET+JpGyLkzgHp3SBLPZinGtiVregyd9ciRV+yMqLxBRuYEYnTAi6nIgThBnK/2g6tiA + sIx1rAMumHs8uYnesRWj40aUNmag+GEoqj5uhrpnDY5n7+VPjszci9IP3lC/90bq7fU4cGZlLWWdueDY + 2UZMkUCrFzEw2I+ILCmuv/SFqns5EtS+OHoxAPISHxR1L0VO6zKEJK0ySGUeaynrwARuh2Lr2sNO1+Pw + qXooKtpRVFuH0PPrkFi9GlmtEhR2eVL1RHyZF2SJ3lZpsEcY5Zz3yZeyvGDPJMQ8Yj6xgFi8TLrQZ2fE + koaAGMlYQJwX/GMkv3zDlzSs2L5oC113Jex2x0gE/kPMsDtWIvBJ2wfC2mOb5E7MJeb8O2fzdn7RnoJf + tKfwF7guZQwBlVFoAAAAAElFTkSuQmCC + + + + + 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 + A7cAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAFp0RVh0VGl0 + bGUARGVsZXRlO0RlbGV0ZUl0ZW07UmVtb3ZlO1JlbW92ZUl0ZW07RGVsZXRlTGlzdDtMaXN0O1JlbW92 + ZUxpc3Q7SXRlbTtMaXN0O0NsZWFyO0VyYXNlWOIXCwAAB81JREFUWEell3tM1ecZx9FavBVFra5pV2ma + dZlduiVbsi3dP+tfa8yWuizruk7nEm2NK65qnTqLIBxuIjfhIKhcvaBy1dQK9QbIRahUq5BSi7agFSe3 + A5zDuXD77vs8v3PggECa9E0+PO/vct7v93lvvxcfAD5eZUZWwWeXs4uuI7vwOrI8USj4DNkFRhQyC+qR + mV+PjLx6pDOm511T4g6XhbGdWWSmtJeYVe2TmFnpk0C8i+iqtpeBGWSmCH6X4nINwmZ3oafXjkedfWi5 + 343rjQ9QVd+CqJRSE9t6UtqTdvnMJ+ZgGatjhU1MauAJyVbK0NAIhobdDA0zDmOQ94QBXjuchgFLnwP/ + 67Ti7r0uJB+pwcgIcL6yGSFxZ8PZni9RE+FJFxjGiuiqtv4xihiYJd0rZUzUQESVwRG4BocVh3MA1n4X + Orv7aaATsekVasBqH0RJxW3sjCyKYJuzyRPu9keL6Kq2/jGKvPBkBsdTipEpoeAgxQxxQ9g1MAznwBDj + EPodA+jiMNxhD0SYL6oBu2tYTZy9+AW2hJyMZLtzyDgToqva+scohgFOJCkiJhw8VT+ekxM4UY+4jCo0 + t3Rid9w5NSCmHWpiCKfPN+JfO488ZkJ0VVv/GEUe+B4+5WWAmUr22gNsdFwvuHEODnEuDOBOSxe2R57R + 34oJvqo96HANoajkJtZ/kCEmPHNiUgPyYPbBk4YB6WbhQO41N5+O1Y+zTlLc7D10Ba0PexCeVIr3Qwqw + KTgfm3bnIzBIyENx6U320hURmkekF6Y0MCctt070dXxlnCfLWO473fNAVoOdtFvs+Pq+BbduP8S1hnuo + vdHKJfkNymrv4ErdHcQeqhAhPzK9gdTjtaJvNE7MR+uQrNQa8YjEWiQdqSO12E+ScoSrrBPW97MecaAM + 33xr0blxt7UTMWllIrSAyCY1pYG5KccMA3aOnZ2bjVOy1ozHcPC+jK2g77EH+t09IdHmGEQfl2e7pR9t + 7Va0d1kRnXZJhBaSaQ3MM8tmIgacXGJsLJHZJGZfRQJJzK5BYlYNErJ47SFTrmsQL7DuITTpErq4ScnQ + yGYVaVYD/mRKAzI285NyqtRAP7MQA07NVDI2MvRk+Rh838Yo2du4B8g+YLFyk+p1wGpzcYJeEKFFZFoD + TyVm0QAdaIMkLqMasVznsemM6Yxar8I+D4eFSoPR6yqEJJ5Hd59Tkc3KlPSJCC0m0xpYEOe1nfZxfT+W + pRt5bmTK7Vje7R94jK5eJ3vAqb0XEl8iQk8T+UjNmMyAOFuw72A5DYxoA70k5lClrnNP3HuQUdA6SRMq + Ec16FInmtfBh/Cfo7HGgo8epw7Y79mMRWkqmNbBQlosYEPFejp1m60Ezdmer0ajru4pLf9NrM6473Aak + 93bFfDcD/tGpFzFMAz2cQBY2FpVWgahUg0iN5RqVAwKvPej9Kxp3xZSgvcdOHJrEh/vUwDIi2/GUBhZF + mC8YBigus1gz9cp2YsY9zFbelW52DnCVOFwarTwrPOrmWaHbrs9uNX0rQj8ksh3Lkp/UwOLw/YaBbqsx + g8NTyhEhmMtZL9NrEwnntclcps8+utTEj1EHvjx6As0fbMbNE4W8bh9dBQ6aasgrxu2N73TX/HON58uo + veBtQMZmSVhCKYZ5CpIfyiwenzGzFaR3PNCoHEzu5Z1Ce3YKXA3laNqzE18VFfOw4kCf1Y77paVoS97H + ZxV4lGlG9Zq3o0Rv1IDbhBh4eg+XixjwLKGw5MujhEpMMmIoo9RNKZfR+FUbbm54F/aaYtgK4+Gsysfn + 29/HrWO5aD59Bq3xkXDVfwxbQRxspTn4/B9rLNSa690DehghS4Njz+k5UHawDmKM8YDOB4vNqRlL3TNE + gox7U14+bgSug7U4Gb05JjjKcvHppg24GxUM59Vi9B016f2qt1Yh4aUVW6nlO5mBZUGcrWJAlk+7Rfby + MR4JnFQysTw87LLThNHV13OOoXr1X2DJiUBX6k7YzqWjvyQD3an/RdeBHbi48jWEPhuwgzrzRdPbgMxK + WR7P7Ij6SM+DKqSibjEKiZiHtk5+6bqIRCI9Zum1ojr1EC6vWomOpG14aFpH1ms897vfINB/aTQ1lpDR + M4F3D6iB7RFn9BQ8MUsVHRW04wHjgw4isdOmBrp7+lCXkYOr69bggWkD7m376yg1q99E0IqfxVBDNqMp + DSzbZjqtZ7/Rrx43EWP/N/Z8z06oq0J2PK4EedbbZ1XxitVvoS3uP2hevxLN77hh/b5pI8rf/DPCfvxK + EHXkZDRzogHdiAKDciu2hBVja2gRtpDNe4RCbA4p1PPev4O9znxkS1gRbjS24uzeZJx/449oCX4XX7z9 + GprIiR8F4OSKl7QufL317yhd+Tp2B/xkF7XGrQIpeiQj8s1+hjxHZOd6fhKWexFAXjYvf9n6ZeDf0PCn + 3+LWG68i98XlWDtrftzaWfPic198AQ2rXlUa1/4B5oCf9vI3/hMNSC+ICekJGQ75j2YiYnAy/HctCUgp + /uUvUP/6r3B8+fN4z9cvmPd/IGycvXDP8RcCUP/7X6Po569gx+KAFN6fP2rg+8Iixhdu83suKdI/wLLJ + 10+6WA6gcl+fvTdnURCf9Wz2e9bMazmYjM2B74u7iJB8aOTcN9d97SmeZyL8FHGvAvj8H0dnIylwnHcG + AAAAAElFTkSuQmCC + + + + + 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 + IbOtAAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/TsSFCDeviceService/App_Code/Class1.cs b/TsSFCDeviceService/App_Code/Class1.cs deleted file mode 100644 index aa57ee8..0000000 --- a/TsSFCDeviceService/App_Code/Class1.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; - -namespace TsSFCDeviceService.App_Code -{ - public class Class1 - { - } -} \ No newline at end of file diff --git a/TsSFCDeviceService/Nlog.config b/TsSFCDeviceService/Nlog.config deleted file mode 100644 index 8729ed6..0000000 --- a/TsSFCDeviceService/Nlog.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/TsSFCDeviceService/Properties/AssemblyInfo.cs b/TsSFCDeviceService/Properties/AssemblyInfo.cs deleted file mode 100644 index 33f5408..0000000 --- a/TsSFCDeviceService/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的常规信息通过下列特性集 -// 控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("TsSFCDeviceService")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TsSFCDeviceService")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 会使此程序集中的类型 -// 对 COM 组件不可见。如果需要 -// 从 COM 访问此程序集中的某个类型，请针对该类型将 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于 typelib 的 ID -[assembly: Guid("9b3687bd-c715-4bf6-be91-9c91be74d478")] - -// 程序集的版本信息由下列四个值组成: -// -// 主版本 -// 次版本 -// 内部版本号 -// 修订版本 -// -// 可以指定所有值，也可以使用“修订号”和“内部版本号”的默认值， -// 方法是按如下所示使用 "*": -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/TsSFCDeviceService/TsSFCDeviceService.csproj b/TsSFCDeviceService/TsSFCDeviceService.csproj deleted file mode 100644 index 7ee9714..0000000 --- a/TsSFCDeviceService/TsSFCDeviceService.csproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - Debug - AnyCPU - - - 2.0 - {9B3687BD-C715-4BF6-BE91-9C91BE74D478} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - TsSFCDeviceService - TsSFCDeviceService - v4.5.2 - true - - - - - - - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - true - pdbonly - true - bin\ - TRACE - prompt - 4 - - - - - ..\packages\NLog.5.3.2\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - - - - - - - - deviceData.asmx - Component - - - - - - PreserveNewest - - - - Web.config - - - Web.config - - - - - {2a1ffb12-b20f-4f9b-905e-1f928f17b4ee} - DeviceRepair.Models - - - {2ae8089a-c70a-47be-921b-de6a502f8d04} - DeviceRepair.Utils - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - True - True - 63402 - / - http://localhost:63402/ - False - False - - - False - - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - \ No newline at end of file diff --git a/TsSFCDeviceService/TsSFCDeviceService.csproj.user b/TsSFCDeviceService/TsSFCDeviceService.csproj.user deleted file mode 100644 index 5831b7b..0000000 --- a/TsSFCDeviceService/TsSFCDeviceService.csproj.user +++ /dev/null @@ -1,38 +0,0 @@ - - - - true - - - - - - - Debug|Any CPU - - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - False - - - - - \ No newline at end of file diff --git a/TsSFCDeviceService/Web.Debug.config b/TsSFCDeviceService/Web.Debug.config deleted file mode 100644 index b9a9fde..0000000 --- a/TsSFCDeviceService/Web.Debug.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/TsSFCDeviceService/Web.Release.config b/TsSFCDeviceService/Web.Release.config deleted file mode 100644 index 755e745..0000000 --- a/TsSFCDeviceService/Web.Release.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/TsSFCDeviceService/Web.config b/TsSFCDeviceService/Web.config deleted file mode 100644 index f83d7ca..0000000 --- a/TsSFCDeviceService/Web.config +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TsSFCDeviceService/deviceData.asmx b/TsSFCDeviceService/deviceData.asmx deleted file mode 100644 index a5075af..0000000 --- a/TsSFCDeviceService/deviceData.asmx +++ /dev/null @@ -1 +0,0 @@ -<%@ WebService Language="C#" CodeBehind="deviceData.asmx.cs" Class="TsSFCDeviceService.deviceData" %> diff --git a/TsSFCDeviceService/deviceData.asmx.cs b/TsSFCDeviceService/deviceData.asmx.cs deleted file mode 100644 index 7ff9405..0000000 --- a/TsSFCDeviceService/deviceData.asmx.cs +++ /dev/null @@ -1,43 +0,0 @@ -using NLog; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Services; -using System.Web.Services.Protocols; - -namespace TsSFCDeviceService -{ - [WebService(Namespace = "http://www.TechScan.cn/")] - [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] - [System.ComponentModel.ToolboxItem(false)] - // 若要允许使用 ASP.NET AJAX 从脚本中调用此 Web 服务，请取消注释以下行。 - // [System.Web.Script.Services.ScriptService] - public class deviceData : System.Web.Services.WebService - { - private static readonly Logger log = LogManager.GetCurrentClassLogger(); - - [WebMethod(Description = "测试")] - public string HelloWorld() - { - //HttpAuthtication(); - return "Hello World"; - } - } - - //private void HttpAuthtication() - //{ - // #region 校验 - - // if (authentication == null || !authentication.ValidUser(authentication.Username, authentication.Password)) - // { - // HttpException soapEx = new HttpException(403, "服务不允许访问此页面，也不允许匿名访问。"); - - // SvcLog.Warn(string.Format("客户端[{0}]我们试图执行远程匿名访问Func[{1}]!这是被禁止的！", HttpContext.Current.Request.UserHostAddress, "GetDatas"), soapEx); - - // throw soapEx; - // } - - // #endregion 校验 - //} -} diff --git a/TsSFCDeviceService/packages.config b/TsSFCDeviceService/packages.config deleted file mode 100644 index 8bb43a3..0000000 --- a/TsSFCDeviceService/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/TsSFCDeviceSvc/MainService.asmx.cs b/TsSFCDeviceSvc/MainService.asmx.cs index f44426a..7ca34c3 100644 --- a/TsSFCDeviceSvc/MainService.asmx.cs +++ b/TsSFCDeviceSvc/MainService.asmx.cs @@ -163,6 +163,10 @@ namespace TsSFCDeviceSvc UserDa udCmd = new UserDa(Parameters); dsResults = udCmd.GetAuths(); break; + case SysModelType.Get_JumpCheck: + var jpCmd = new EquipmentJumpPlanCheckDa(Parameters); + dsResults = jpCmd.GetDatas(); + break; default: break; } @@ -216,36 +220,6 @@ namespace TsSFCDeviceSvc } } - [WebMethod(Description = "判断当前开工设备是否存在未完成的保养计划")] - [SoapHeader("auth")] - public APIResponseData Get_EquipmentPlanIsComplete(string inParams) - { - HttpAuthtication(); - Dictionary Parameters = GetParameters(inParams); - - try - { - #region 检查APP版本是否是最新版本，否则返回错误 - - AppVersionValid(Parameters); - - #endregion - - if (!Parameters.ContainsKey("EquipmentID")) - { - throw new ArgumentException("缺少传入参数设备编号(EquipmentID)"); - } - - PlanDa cmd = new PlanDa(Parameters); - return cmd.Get_EquipmentPlanIsComplete(Parameters["EquipmentID"]); - } - catch (Exception ex) - { - log.Error(ex); - return new APIResponseData { Code = -1, Message = ex.Message }; - } - } - #region 设备信息 [WebMethod(Description = "获取树形结构")] @@ -1750,6 +1724,91 @@ namespace TsSFCDeviceSvc #endregion + #region 设备计划完成校验 + + [WebMethod(Description = "判断当前开工设备是否存在未完成的保养计划")] + [SoapHeader("auth")] + public APIResponseData Get_EquipmentPlanIsComplete(string inParams) + { + HttpAuthtication(); + Dictionary Parameters = GetParameters(inParams); + + try + { + #region 检查APP版本是否是最新版本，否则返回错误 + + AppVersionValid(Parameters); + + #endregion + + if (!Parameters.ContainsKey("EquipmentID")) + { + throw new ArgumentException("缺少传入参数设备编号(EquipmentID)"); + } + + PlanDa cmd = new PlanDa(Parameters); + return cmd.Get_EquipmentPlanIsComplete(Parameters["EquipmentID"]); + } + catch (Exception ex) + { + log.Error(ex); + return new APIResponseData { Code = -1, Message = ex.Message }; + } + } + + + [WebMethod(Description = "跳过指定设备指定日期的设备计划完成校验")] + [SoapHeader("auth")] + public APIResponseData News_JumpCheckData(string inParams) + { + HttpAuthtication(); + Dictionary Parameters = GetParameters(inParams); + + try + { + #region 检查APP版本是否是最新版本，否则返回错误 + + AppVersionValid(Parameters); + + #endregion + + EquipmentJumpPlanCheckDa cmd = new EquipmentJumpPlanCheckDa(Parameters); + return cmd.DataNews(); + } + catch (Exception ex) + { + log.Error(ex); + return new APIResponseData { Code = -1, Message = ex.Message }; + } + } + + [WebMethod(Description = "删除跳过指定设备指定日期的设备计划完成校验")] + [SoapHeader("auth")] + public APIResponseData Remove_JumpCheckData(string inParams) + { + HttpAuthtication(); + Dictionary Parameters = GetParameters(inParams); + + try + { + #region 检查APP版本是否是最新版本，否则返回错误 + + AppVersionValid(Parameters); + + #endregion + + EquipmentJumpPlanCheckDa cmd = new EquipmentJumpPlanCheckDa(Parameters); + return cmd.DataDel(); + } + catch (Exception ex) + { + log.Error(ex); + return new APIResponseData { Code = -1, Message = ex.Message }; + } + } + + #endregion + [WebMethod(Description = "电子签")] [SoapHeader("auth")] public APIResponseData UserConfirm(string inParams, DataTable DataContent, out DataTable dtData)