diff --git a/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj b/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj index b91547a..383f4dd 100644 --- a/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj +++ b/DeviceRepair.DataAccess/DeviceRepair.DataAccess.csproj @@ -105,7 +105,6 @@ - diff --git a/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql b/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql index 6019ca6..7539cc9 100644 --- a/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql +++ b/DeviceRepair.DataAccess/Script/5.0/Datas/Auths.sql @@ -25,7 +25,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK' + WHERE AuthCode = 'BIZ_EQUIP_72' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -37,7 +37,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_JUMP_CHECK', N'跳过当天保养计划校验', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_72', N'跳过当天保养计划校验', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -45,7 +45,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK_01' + WHERE AuthCode = 'BIZ_EQUIP_73' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -57,7 +57,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_JUMP_CHECK_01', N'跳过当天保养计划校验查看', N'BIZ_EQUIP_JUMP_CHECK', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_73', N'跳过当天保养计划校验查看', N'BIZ_EQUIP_72', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -65,7 +65,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK_02' + WHERE AuthCode = 'BIZ_EQUIP_74' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -77,7 +77,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_JUMP_CHECK_02', N'跳过当天保养计划校验新增', N'BIZ_EQUIP_JUMP_CHECK', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_74', N'跳过当天保养计划校验新增', N'BIZ_EQUIP_72', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -85,7 +85,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_JUMP_CHECK_03' + WHERE AuthCode = 'BIZ_EQUIP_75' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -97,7 +97,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_JUMP_CHECK_03', N'跳过当天保养计划校验删除', N'BIZ_EQUIP_JUMP_CHECK', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_75', N'跳过当天保养计划校验删除', N'BIZ_EQUIP_72', N'SYSADMIN', GETDATE() ); END; /* 软件配置 */ @@ -106,7 +106,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_BASE_CONFIG' + WHERE AuthCode = 'BIZ_EQUIP_71' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -118,7 +118,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_BASE_CONFIG', N'软件配置', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_71', N'软件配置', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; /* 设备软件的设备信息权限 */ @@ -127,7 +127,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_DEVICE' + WHERE AuthCode = 'BIZ_EQUIP_65' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -139,7 +139,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_DEVICE', N'设备数据权限', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_65', N'设备数据权限', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -147,7 +147,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_DEVICE_01' + WHERE AuthCode = 'BIZ_EQUIP_66' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -159,7 +159,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_DEVICE_01', N'设备新增', N'BIZ_EQUIP_DEVICE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_66', N'设备新增', N'BIZ_EQUIP_65', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -167,7 +167,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_DEVICE_02' + WHERE AuthCode = 'BIZ_EQUIP_67' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -179,7 +179,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_DEVICE_02', N'设备修改', N'BIZ_EQUIP_DEVICE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_67', N'设备修改', N'BIZ_EQUIP_65', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -187,7 +187,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_DEVICE_03' + WHERE AuthCode = 'BIZ_EQUIP_68' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -199,7 +199,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_DEVICE_03', N'设备状态修改', N'BIZ_EQUIP_DEVICE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_68', N'设备状态修改', N'BIZ_EQUIP_65', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -207,7 +207,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_DEVICE_OEM' + WHERE AuthCode = 'BIZ_EQUIP_70' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -219,7 +219,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_DEVICE_OEM', N'设备的OEM数据权限', N'BIZ_EQUIP_DEVICE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_70', N'设备的OEM数据权限', N'BIZ_EQUIP_65', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -227,7 +227,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_DEVICE_KH' + WHERE AuthCode = 'BIZ_EQUIP_69' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -239,41 +239,16 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_DEVICE_KH', N'设备的KH数据权限', N'BIZ_EQUIP_DEVICE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_69', N'设备的KH数据权限', N'BIZ_EQUIP_65', N'SYSADMIN', GETDATE() ); END; - - -/* 设备保修 */ -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_001' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_001', N'设备报修', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); -END; - - - /* Tag 红卡片 */ IF NOT EXISTS ( SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_TAG' + WHERE AuthCode = 'BIZ_EQUIP_59' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -285,7 +260,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_TAG', N'Tag', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_59', N'Tag', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -293,7 +268,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_TAG_01' + WHERE AuthCode = 'BIZ_EQUIP_60' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -305,7 +280,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_TAG_01', N'Tag查看', N'BIZ_EQUIP_TAG', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_60', N'Tag查看', N'BIZ_EQUIP_59', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -313,7 +288,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_TAG_02' + WHERE AuthCode = 'BIZ_EQUIP_61' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -325,7 +300,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_TAG_02', N'Tag新增', N'BIZ_EQUIP_TAG', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_61', N'Tag新增', N'BIZ_EQUIP_59', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -333,7 +308,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_TAG_03' + WHERE AuthCode = 'BIZ_EQUIP_62' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -345,7 +320,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_TAG_03', N'Tag修改', N'BIZ_EQUIP_TAG', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_62', N'Tag修改', N'BIZ_EQUIP_59', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -353,7 +328,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_TAG_04' + WHERE AuthCode = 'BIZ_EQUIP_63' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -365,7 +340,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_TAG_04', N'Tag维修', N'BIZ_EQUIP_TAG', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_63', N'Tag维修', N'BIZ_EQUIP_59', N'SYSADMIN', GETDATE() ); END; @@ -375,7 +350,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM' + WHERE AuthCode = 'BIZ_EQUIP_25' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -387,7 +362,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM', N'设备的PM保养', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_25', N'设备的PM保养', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; @@ -398,7 +373,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PLAN' + WHERE AuthCode = 'BIZ_EQUIP_26' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -410,7 +385,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PLAN', N'设备的PM保养计划', N'BIZ_EQUIP_PM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_26', N'设备的PM保养计划', N'BIZ_EQUIP_25', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -418,7 +393,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PLAN_01' + WHERE AuthCode = 'BIZ_EQUIP_27' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -430,7 +405,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PLAN_01', N'设备的PM保养计划查看', N'BIZ_EQUIP_PM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_27', N'设备的PM保养计划查看', N'BIZ_EQUIP_26', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -438,7 +413,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PLAN_02' + WHERE AuthCode = 'BIZ_EQUIP_28' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -450,7 +425,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PLAN_02', N'设备的PM保养计划新增', N'BIZ_EQUIP_PM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_28', N'设备的PM保养计划新增', N'BIZ_EQUIP_26', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -458,7 +433,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PLAN_03' + WHERE AuthCode = 'BIZ_EQUIP_29' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -470,7 +445,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PLAN_03', N'设备的PM保养计划编辑', N'BIZ_EQUIP_PM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_29', N'设备的PM保养计划编辑', N'BIZ_EQUIP_26', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -478,7 +453,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PLAN_04' + WHERE AuthCode = 'BIZ_EQUIP_30' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -490,7 +465,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PLAN_04', N'设备的PM保养计划导入', N'BIZ_EQUIP_PM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_30', N'设备的PM保养计划导入', N'BIZ_EQUIP_26', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -498,7 +473,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PLAN_05' + WHERE AuthCode = 'BIZ_EQUIP_31' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -510,7 +485,30 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PLAN_05', N'设备的PM保养计划删除', N'BIZ_EQUIP_PM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_31', N'设备的PM保养计划删除', N'BIZ_EQUIP_26', N'SYSADMIN', GETDATE() ); +END; + + + +/* AM保养权限 */ +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_42' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_42', N'设备的AM保养', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; /* AM 保养计划 */ @@ -519,7 +517,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PLAN' + WHERE AuthCode = 'BIZ_EQUIP_43' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -531,7 +529,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PLAN', N'设备的AM保养计划', N'BIZ_EQUIP_AM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_43', N'设备的AM保养计划', N'BIZ_EQUIP_42', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -539,7 +537,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PLAN_01' + WHERE AuthCode = 'BIZ_EQUIP_44' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -551,7 +549,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PLAN_01', N'设备的AM保养计划查看', N'BIZ_EQUIP_AM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_44', N'设备的AM保养计划查看', N'BIZ_EQUIP_43', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -559,7 +557,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PLAN_02' + WHERE AuthCode = 'BIZ_EQUIP_45' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -571,7 +569,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PLAN_02', N'设备的AM保养计划新增', N'BIZ_EQUIP_AM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_45', N'设备的AM保养计划新增', N'BIZ_EQUIP_43', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -579,7 +577,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PLAN_03' + WHERE AuthCode = 'BIZ_EQUIP_46' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -591,7 +589,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PLAN_03', N'设备的AM保养计划编辑', N'BIZ_EQUIP_AM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_46', N'设备的AM保养计划编辑', N'BIZ_EQUIP_43', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -599,7 +597,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PLAN_04' + WHERE AuthCode = 'BIZ_EQUIP_47' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -611,7 +609,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PLAN_04', N'设备的AM保养计划导入', N'BIZ_EQUIP_AM_PLAN', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_47', N'设备的AM保养计划导入', N'BIZ_EQUIP_43', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -619,7 +617,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PLAN_05' + WHERE AuthCode = 'BIZ_EQUIP_48' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -631,28 +629,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PLAN_05', N'设备的AM保养计划删除', N'BIZ_EQUIP_AM_PLAN', N'SYSADMIN', GETDATE() ); -END; - -/* AM保养权限 */ -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_AM', N'设备的AM保养', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_48', N'设备的AM保养计划删除', N'BIZ_EQUIP_43', N'SYSADMIN', GETDATE() ); END; /* PM 点检表*/ @@ -661,7 +638,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_FORM' + WHERE AuthCode = 'BIZ_EQUIP_32' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -673,7 +650,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_FORM', N'设备的PM点检表', N'BIZ_EQUIP_PM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_32', N'设备的PM点检表', N'BIZ_EQUIP_25', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -681,7 +658,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_FORM_01' + WHERE AuthCode = 'BIZ_EQUIP_33' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -693,7 +670,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_FORM_01', N'设备的PM点检表查看', N'BIZ_EQUIP_PM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_33', N'设备的PM点检表查看', N'BIZ_EQUIP_32', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -701,7 +678,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_FORM_02' + WHERE AuthCode = 'BIZ_EQUIP_34' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -713,7 +690,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_FORM_02', N'设备的PM点检表新增', N'BIZ_EQUIP_PM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_34', N'设备的PM点检表新增', N'BIZ_EQUIP_32', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -721,7 +698,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_FORM_03' + WHERE AuthCode = 'BIZ_EQUIP_35' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -733,7 +710,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_FORM_03', N'设备的PM点检表修改', N'BIZ_EQUIP_PM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_35', N'设备的PM点检表修改', N'BIZ_EQUIP_32', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -741,7 +718,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_FORM_04' + WHERE AuthCode = 'BIZ_EQUIP_36' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -753,7 +730,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_FORM_04', N'设备的PM点检表启用/禁用', N'BIZ_EQUIP_PM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_36', N'设备的PM点检表启用/禁用', N'BIZ_EQUIP_32', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -761,7 +738,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_FORM_05' + WHERE AuthCode = 'BIZ_EQUIP_37' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -773,7 +750,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_FORM_05', N'设备的PM点检表分配', N'BIZ_EQUIP_PM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_37', N'设备的PM点检表分配', N'BIZ_EQUIP_32', N'SYSADMIN', GETDATE() ); END; /* AM 点检表*/ @@ -782,7 +759,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_FORM' + WHERE AuthCode = 'BIZ_EQUIP_49' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -794,7 +771,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_FORM', N'设备的AM点检表', N'BIZ_EQUIP_AM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_49', N'设备的AM点检表', N'BIZ_EQUIP_42', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -802,7 +779,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_FORM_01' + WHERE AuthCode = 'BIZ_EQUIP_50' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -814,7 +791,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_FORM_01', N'设备的AM点检表查看', N'BIZ_EQUIP_AM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_50', N'设备的AM点检表查看', N'BIZ_EQUIP_49', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -822,7 +799,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_FORM_02' + WHERE AuthCode = 'BIZ_EQUIP_51' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -834,7 +811,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_FORM_02', N'设备的AM点检表新增', N'BIZ_EQUIP_AM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_51', N'设备的AM点检表新增', N'BIZ_EQUIP_49', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -842,7 +819,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_FORM_03' + WHERE AuthCode = 'BIZ_EQUIP_52' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -854,7 +831,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_FORM_03', N'设备的AM点检表修改', N'BIZ_EQUIP_AM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_52', N'设备的AM点检表修改', N'BIZ_EQUIP_49', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -862,7 +839,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_FORM_04' + WHERE AuthCode = 'BIZ_EQUIP_53' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -874,7 +851,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_FORM_04', N'设备的AM点检表启用/禁用', N'BIZ_EQUIP_AM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_53', N'设备的AM点检表启用/禁用', N'BIZ_EQUIP_49', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -882,7 +859,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_FORM_05' + WHERE AuthCode = 'BIZ_EQUIP_54' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -894,7 +871,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_FORM_05', N'设备的AM点检表分配', N'BIZ_EQUIP_AM_FORM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_54', N'设备的AM点检表分配', N'BIZ_EQUIP_49', N'SYSADMIN', GETDATE() ); END; /* 设备的PM保养 */ @@ -903,7 +880,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PRESERVE' + WHERE AuthCode = 'BIZ_EQUIP_38' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -915,7 +892,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PRESERVE', N'PM的设备保养', N'BIZ_EQUIP_PM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_38', N'PM的设备保养', N'BIZ_EQUIP_25', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -923,7 +900,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PRESERVE_01' + WHERE AuthCode = 'BIZ_EQUIP_39' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -935,7 +912,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PRESERVE_01', N'PM的设备保养记录查看', N'BIZ_EQUIP_PM_PRESERVE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_39', N'PM的设备保养记录查看', N'BIZ_EQUIP_38', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -943,7 +920,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PRESERVE_02' + WHERE AuthCode = 'BIZ_EQUIP_40' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -955,7 +932,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PRESERVE_02', N'PM的设备保养记录新增', N'BIZ_EQUIP_PM_PRESERVE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_40', N'PM的设备保养记录新增', N'BIZ_EQUIP_38', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -963,7 +940,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_PM_PRESERVE_03' + WHERE AuthCode = 'BIZ_EQUIP_41' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -975,7 +952,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_PM_PRESERVE_03', N'PM的设备保养记录修改', N'BIZ_EQUIP_PM_PRESERVE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_41', N'PM的设备保养记录修改', N'BIZ_EQUIP_38', N'SYSADMIN', GETDATE() ); END; /* 设备的AM保养 */ @@ -984,7 +961,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PRESERVE' + WHERE AuthCode = 'BIZ_EQUIP_55' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -996,7 +973,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PRESERVE', N'AM的设备保养', N'BIZ_EQUIP_AM', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_55', N'AM的设备保养', N'BIZ_EQUIP_41', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1004,7 +981,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PRESERVE_01' + WHERE AuthCode = 'BIZ_EQUIP_56' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1016,7 +993,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PRESERVE_01', N'AM的设备保养记录查看', N'BIZ_EQUIP_AM_PRESERVE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_56', N'AM的设备保养记录查看', N'BIZ_EQUIP_42', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1024,7 +1001,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PRESERVE_02' + WHERE AuthCode = 'BIZ_EQUIP_57' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1036,7 +1013,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PRESERVE_02', N'AM的设备保养记录新增', N'BIZ_EQUIP_AM_PRESERVE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_57', N'AM的设备保养记录新增', N'BIZ_EQUIP_42', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1044,7 +1021,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_AM_PRESERVE_03' + WHERE AuthCode = 'BIZ_EQUIP_58' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1056,7 +1033,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_AM_PRESERVE_03', N'AM的设备保养记录修改', N'BIZ_EQUIP_AM_PRESERVE', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_58', N'AM的设备保养记录修改', N'BIZ_EQUIP_42', N'SYSADMIN', GETDATE() ); END; @@ -1066,7 +1043,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD' + WHERE AuthCode = 'BIZ_EQUIP_01' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1078,7 +1055,28 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD', N'设备维修', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_01', N'设备维修', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); +END; + +/* 设备报修 */ +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_64' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_64', N'设备报修', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1086,7 +1084,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD_01' + WHERE AuthCode = 'BIZ_EQUIP_02' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1098,7 +1096,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD_01', N'设备维修查看', N'BIZ_EQUIP_REPAIRRECORD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_02', N'设备维修查看', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1106,7 +1104,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD_02' + WHERE AuthCode = 'BIZ_EQUIP_03' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1118,7 +1116,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD_02', N'设备维修编辑', N'BIZ_EQUIP_REPAIRRECORD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_03', N'设备维修编辑', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1126,7 +1124,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD_03' + WHERE AuthCode = 'BIZ_EQUIP_04' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1138,7 +1136,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD_03', N'设备维修导入', N'BIZ_EQUIP_REPAIRRECORD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_04', N'设备维修导入', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1146,7 +1144,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD_04' + WHERE AuthCode = 'BIZ_EQUIP_05' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1158,7 +1156,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD_04', N'设备维修确认权限-工程师', N'BIZ_EQUIP_REPAIRRECORD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_05', N'设备维修确认权限-工程师', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1166,7 +1164,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD_05' + WHERE AuthCode = 'BIZ_EQUIP_06' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1178,7 +1176,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD_05', N'设备维修确认权限-技术人员', N'BIZ_EQUIP_REPAIRRECORD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_06', N'设备维修确认权限-技术人员', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1186,7 +1184,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_REPAIRRECORD_06' + WHERE AuthCode = 'BIZ_EQUIP_07' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1198,7 +1196,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_REPAIRRECORD_06', N'设备维修确认权限-维修主管', N'BIZ_EQUIP_REPAIRRECORD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_07', N'设备维修确认权限-维修主管', N'BIZ_EQUIP_01', N'SYSADMIN', GETDATE() ); END; @@ -1208,7 +1206,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD' + WHERE AuthCode = 'BIZ_EQUIP_08' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1220,7 +1218,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD', N'字段配置', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_08', N'字段配置', N'BIZ_EQUIP', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1228,7 +1226,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION' + WHERE AuthCode = 'BIZ_EQUIP_09' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1240,7 +1238,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION', N'现象区分', N'BIZ_EQUIP_FIELD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_09', N'现象区分', N'BIZ_EQUIP_08', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1248,7 +1246,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_01' + WHERE AuthCode = 'BIZ_EQUIP_10' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1260,71 +1258,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_01', N'现象区分新增', N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION', N'SYSADMIN', GETDATE() ); -END; - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_02' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_02', N'现象区分编辑', N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION', N'SYSADMIN', GETDATE() ); -END; - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_03' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_03', N'现象区分禁用/启用', N'BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION', N'SYSADMIN', GETDATE() ); -END; - - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_MAINTENANCEN' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_MAINTENANCEN', N'维修方式', N'BIZ_EQUIP_FIELD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_10', N'现象区分新增', N'BIZ_EQUIP_09', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1332,7 +1266,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_MAINTENANCEN_01' + WHERE AuthCode = 'BIZ_EQUIP_11' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1344,72 +1278,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_MAINTENANCEN_01', N'维修方式新增', N'BIZ_EQUIP_FIELD_MAINTENANCEN', N'SYSADMIN', GETDATE() ); -END; - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_MAINTENANCEN_02' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_MAINTENANCEN_02', N'维修方式编辑', N'BIZ_EQUIP_FIELD_MAINTENANCEN', N'SYSADMIN', GETDATE() ); -END; - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_MAINTENANCEN_03' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_MAINTENANCEN_03', N'维修方式禁用/启用', N'BIZ_EQUIP_FIELD_MAINTENANCEN', N'SYSADMIN', GETDATE() ); -END; - - - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_ACCESSORIES' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_ACCESSORIES', N'配件维护', N'BIZ_EQUIP_FIELD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_11', N'现象区分编辑', N'BIZ_EQUIP_09', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1417,7 +1286,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_ACCESSORIES_01' + WHERE AuthCode = 'BIZ_EQUIP_12' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1429,71 +1298,7 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_ACCESSORIES_01', N'配件维护新增', N'BIZ_EQUIP_FIELD_ACCESSORIES', N'SYSADMIN', GETDATE() ); -END; - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_ACCESSORIES_02' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_ACCESSORIES_02', N'配件维护编辑', N'BIZ_EQUIP_FIELD_ACCESSORIES', N'SYSADMIN', GETDATE() ); -END; - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_ACCESSORIES_03' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_ACCESSORIES_03', N'配件维护禁用/启用', N'BIZ_EQUIP_FIELD_ACCESSORIES', N'SYSADMIN', GETDATE() ); -END; - - - -IF NOT EXISTS -( - SELECT TOP (1) - * - FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED' -) -BEGIN - INSERT INTO SFCData.dbo.Auths - ( - AuthCode, - AuthName, - FatherAuthCode, - CreateBy, - CreateOn - ) - VALUES - (N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED', N'故障发生地', N'BIZ_EQUIP_FIELD', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_12', N'现象区分禁用/启用', N'BIZ_EQUIP_09', N'SYSADMIN', GETDATE() ); END; IF NOT EXISTS @@ -1501,7 +1306,7 @@ IF NOT EXISTS SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_01' + WHERE AuthCode = 'BIZ_EQUIP_13' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1513,16 +1318,15 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_01', N'故障发生地新增', N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_13', N'维修方式', N'BIZ_EQUIP_08', N'SYSADMIN', GETDATE() ); END; - IF NOT EXISTS ( SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_02' + WHERE AuthCode = 'BIZ_EQUIP_14' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1534,16 +1338,15 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_02', N'故障发生地编辑', N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_14', N'维修方式新增', N'BIZ_EQUIP_13', N'SYSADMIN', GETDATE() ); END; - IF NOT EXISTS ( SELECT TOP (1) * FROM dbo.Auths WITH (NOLOCK) - WHERE AuthCode = 'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_03' + WHERE AuthCode = 'BIZ_EQUIP_15' ) BEGIN INSERT INTO SFCData.dbo.Auths @@ -1555,5 +1358,185 @@ BEGIN CreateOn ) VALUES - (N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_03', N'故障发生地禁用/启用', N'BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED', N'SYSADMIN', GETDATE() ); + (N'BIZ_EQUIP_15', N'维修方式编辑', N'BIZ_EQUIP_13', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_16' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_16', N'维修方式禁用/启用', N'BIZ_EQUIP_13', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_17' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_17', N'配件维护', N'BIZ_EQUIP_08', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_18' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_18', N'配件维护新增', N'BIZ_EQUIP_17', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_19' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_19', N'配件维护编辑', N'BIZ_EQUIP_17', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_20' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_20', N'配件维护禁用/启用', N'BIZ_EQUIP_17', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_21' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_21', N'故障发生地', N'BIZ_EQUIP_08', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_22' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_22', N'故障发生地新增', N'BIZ_EQUIP_21', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_23' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_23', N'故障发生地编辑', N'BIZ_EQUIP_21', N'SYSADMIN', GETDATE() ); +END; + +IF NOT EXISTS +( + SELECT TOP (1) + * + FROM dbo.Auths WITH (NOLOCK) + WHERE AuthCode = 'BIZ_EQUIP_24' +) +BEGIN + INSERT INTO SFCData.dbo.Auths + ( + AuthCode, + AuthName, + FatherAuthCode, + CreateBy, + CreateOn + ) + VALUES + (N'BIZ_EQUIP_24', N'故障发生地禁用/启用', N'BIZ_EQUIP_21', N'SYSADMIN', GETDATE() ); END; diff --git a/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql b/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql index 6302ffb..6d14e5f 100644 --- a/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql +++ b/DeviceRepair.DataAccess/Script/5.0/Proc/proc_EquipmentPlanIsComplete.sql @@ -1,9 +1,9 @@ USE DriveMaintenance; GO -IF OBJECT_ID('Proc_AnnualEquipmentMaintenanceProgram', 'P') IS NOT NULL +IF OBJECT_ID('proc_EquipmentPlanIsComplete', 'P') IS NOT NULL BEGIN - DROP PROCEDURE [dbo].[Proc_AnnualEquipmentMaintenanceProgram]; + DROP PROCEDURE [dbo].[proc_EquipmentPlanIsComplete]; END; SET ANSI_NULLS ON @@ -27,6 +27,15 @@ BEGIN @MaintenanceMonth INT, @Msg NVARCHAR(MAX); + /* 判断是否跳过当日检测 */ + IF EXISTS(SELECT * FROM dbo.DriveMaintencePlan pln + INNER JOIN dbo.DriveInformation dev ON pln.EquipmentID = dev.AutoID + INNER JOIN dbo.EquipmentJumpPlanCheck jum ON jum.EquipmentAutoID = dev.AutoID + WHERE pln.AutoID = @planId AND DATEDIFF(DAY, jum.CheckDate, GETDATE()) = 0 ) + BEGIN + RETURN; + END + DECLARE cursor_plan CURSOR FOR SELECT pl.AutoID, diff --git a/DeviceRepair.DataAccess/Script/5.0/Table/DriveMaintencePlanDaily.sql b/DeviceRepair.DataAccess/Script/5.0/Table/DriveMaintencePlanDaily.sql deleted file mode 100644 index dc22294..0000000 --- a/DeviceRepair.DataAccess/Script/5.0/Table/DriveMaintencePlanDaily.sql +++ /dev/null @@ -1,48 +0,0 @@ -USE [DriveMaintenance] -GO - -/****** Object: Table [dbo].[DriveMaintencePlanDaily] Script Date: 2024/7/24 22:18:29 ******/ -SET ANSI_NULLS ON -GO - -SET QUOTED_IDENTIFIER ON -GO - -CREATE TABLE [dbo].[DriveMaintencePlanDaily]( - [AutoID] [INT] IDENTITY(1,1) NOT NULL, - [GUID] [UNIQUEIDENTIFIER] NOT NULL, - [EquipmentID] [INT] NULL, - [CompleteDate] [DATETIME] NULL, - [MaintenanceYear] [INT] NULL, - [MaintenanceDate] [INT] NULL, - [MaintenanceType] [VARCHAR](50) NULL, - [PMStartMonth] [DATETIME] NULL, - [PlanStatus] [CHAR](1) NULL, - [CreatDate] [DATETIME] NULL, - [CreatUser] [INT] NULL, - [ChangeDate] [DATETIME] NULL, - [ChangeUser] [INT] NULL, - [Remarks] [NVARCHAR](2000) NULL, - CONSTRAINT [PK_DriveMaintencePlanDaily] PRIMARY KEY CLUSTERED -( - [AutoID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设备编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriveMaintencePlanDaily', @level2type=N'COLUMN',@level2name=N'EquipmentID' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'预计保养日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriveMaintencePlanDaily', @level2type=N'COLUMN',@level2name=N'CompleteDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'保养年份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriveMaintencePlanDaily', @level2type=N'COLUMN',@level2name=N'MaintenanceYear' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'保养类型(Semi-an、Quarterly、Annual、Monthly)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriveMaintencePlanDaily', @level2type=N'COLUMN',@level2name=N'MaintenanceType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'新PM起始月份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DriveMaintencePlanDaily', @level2type=N'COLUMN',@level2name=N'PMStartMonth' -GO - - diff --git a/DeviceRepairAndOptimization/App.config b/DeviceRepairAndOptimization/App.config index 1eb95c7..d2a9180 100644 --- a/DeviceRepairAndOptimization/App.config +++ b/DeviceRepairAndOptimization/App.config @@ -66,6 +66,14 @@ + + + + + + + + diff --git a/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj b/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj index 5ddd767..30423c9 100644 --- a/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj +++ b/DeviceRepairAndOptimization/DeviceRepairAndOptimization.csproj @@ -75,9 +75,8 @@ ..\packages\Autoupdater.NET.Official.1.6.4\lib\net45\AutoUpdater.NET.dll True - - ..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll - True + + ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll ..\packages\DevExpress.CodeParser.20.2.3\lib\net452\DevExpress.CodeParser.v20.2.dll @@ -197,9 +196,8 @@ DLLs\HttpHelper.dll True - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll - True + + ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\JWT.1.3.3\lib\3.5\JWT.dll @@ -224,21 +222,17 @@ ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.OOXML.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.OOXML.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXml4Net.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.OpenXml4Net.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.OpenXmlFormats.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll diff --git a/DeviceRepairAndOptimization/packages.config b/DeviceRepairAndOptimization/packages.config index 88f41f5..3368f12 100644 --- a/DeviceRepairAndOptimization/packages.config +++ b/DeviceRepairAndOptimization/packages.config @@ -19,10 +19,10 @@ - + - - + + diff --git a/TsSFCDevice.Client.Biz/Base/Utils/SysRuntimeInfo.cs b/TsSFCDevice.Client.Biz/Base/Utils/SysRuntimeInfo.cs index af842c3..a1bda08 100644 --- a/TsSFCDevice.Client.Biz/Base/Utils/SysRuntimeInfo.cs +++ b/TsSFCDevice.Client.Biz/Base/Utils/SysRuntimeInfo.cs @@ -9,8 +9,8 @@ namespace TsSFCDevice.Client.Biz.Base.Utils { public class SysRuntimeInfo { - public readonly string DEVICE_OEM = "BIZ_EQUIP_DEVICE_OEM"; - public readonly string DEVICE_KH = "BIZ_EQUIP_DEVICE_KH"; + public readonly string DEVICE_OEM = "BIZ_EQUIP_70"; + public readonly string DEVICE_KH = "BIZ_EQUIP_69"; /// /// 当前机器名 diff --git a/TsSFCDevice.Client.Launch/App.config b/TsSFCDevice.Client.Launch/App.config index 20d4a78..b1b83d2 100644 --- a/TsSFCDevice.Client.Launch/App.config +++ b/TsSFCDevice.Client.Launch/App.config @@ -16,7 +16,11 @@ - + + + + + diff --git a/TsSFCDevice.Client.Launch/CustomField/pageFieldCode.cs b/TsSFCDevice.Client.Launch/CustomField/pageFieldCode.cs index 167429b..35f632e 100644 --- a/TsSFCDevice.Client.Launch/CustomField/pageFieldCode.cs +++ b/TsSFCDevice.Client.Launch/CustomField/pageFieldCode.cs @@ -34,6 +34,7 @@ namespace TsSFCDevice.Client.Launch.CustomField /// 基础权限 /// public string BaseAuthCode = ""; + public int BaseAuthNumber = 0; List CurrentDatas; int m_SelectedCurrentRowIndex = 0; @@ -84,7 +85,8 @@ namespace TsSFCDevice.Client.Launch.CustomField InitializeComponent(); FieldCode = Code; - BaseAuthCode = baseAuthCode; + BaseAuthCode = baseAuthCode.Substring(0, baseAuthCode.LastIndexOf('_')); + BaseAuthNumber = Convert.ToInt32(baseAuthCode.Substring(baseAuthCode.LastIndexOf('_') + 1)); Caption = $"字段配置 - {DisPlayTitle}"; this.Load += PageFieldCode_Load; } @@ -186,7 +188,7 @@ namespace TsSFCDevice.Client.Launch.CustomField { try { - if (!Utility.SystemRuntimeInfo.AuthValidate($"{BaseAuthCode}_01")) + if (!Utility.SystemRuntimeInfo.AuthValidate($"{BaseAuthCode}_{(BaseAuthNumber + 1)}")) { throw new Exception($"当前账号缺少此操作的权限"); } @@ -353,7 +355,7 @@ namespace TsSFCDevice.Client.Launch.CustomField if (CurrentFieldInfo == null) throw new Exception("请选择字段所在行！"); - if (!Utility.SystemRuntimeInfo.AuthValidate($"{BaseAuthCode}_03")) + if (!Utility.SystemRuntimeInfo.AuthValidate($"{BaseAuthCode}_{(BaseAuthNumber + 3)}")) { throw new Exception($"当前账号缺少此操作的权限"); } @@ -417,7 +419,7 @@ namespace TsSFCDevice.Client.Launch.CustomField if (CurrentFieldInfo == null) throw new Exception("请选择字段所在行！"); - if (!Utility.SystemRuntimeInfo.AuthValidate($"{BaseAuthCode}_02")) + if (!Utility.SystemRuntimeInfo.AuthValidate($"{BaseAuthCode}_{(BaseAuthNumber + 2)}")) { throw new Exception($"当前账号缺少此操作的权限"); } diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs index 0be56ab..dd65122 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.Designer.cs @@ -28,11 +28,11 @@ /// private void InitializeComponent() { - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageDeviceTreeView)); this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl(); this.baripsEquipmentID = new DevExpress.XtraBars.BarEditItem(); @@ -46,7 +46,6 @@ this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::TsSFCDevice.Client.Launch.frmWaiting), true, true); - this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); this.treeList1 = new DevExpress.XtraTreeList.TreeList(); this.gcAutoID = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.gcEquipmentName = new DevExpress.XtraTreeList.Columns.TreeListColumn(); @@ -65,18 +64,12 @@ this.gcOwningUnit = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.gcOperatingParameters = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.gcRemarks = new DevExpress.XtraTreeList.Columns.TreeListColumn(); - this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.UsingDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); - this.layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeList1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); this.SuspendLayout(); // // ribbon @@ -146,16 +139,16 @@ this.ipsEquipmentID.AppearanceReadOnly.Options.UseTextOptions = true; this.ipsEquipmentID.AppearanceReadOnly.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; this.ipsEquipmentID.AutoHeight = false; - serializableAppearanceObject1.Font = new System.Drawing.Font("Tahoma", 12F); - serializableAppearanceObject1.Options.UseFont = true; - serializableAppearanceObject2.Font = new System.Drawing.Font("Tahoma", 12F); - serializableAppearanceObject2.Options.UseFont = true; - serializableAppearanceObject3.Font = new System.Drawing.Font("Tahoma", 2F); - serializableAppearanceObject3.Options.UseFont = true; - serializableAppearanceObject4.Font = new System.Drawing.Font("Tahoma", 12F); - serializableAppearanceObject4.Options.UseFont = true; + serializableAppearanceObject5.Font = new System.Drawing.Font("Tahoma", 12F); + serializableAppearanceObject5.Options.UseFont = true; + serializableAppearanceObject6.Font = new System.Drawing.Font("Tahoma", 12F); + serializableAppearanceObject6.Options.UseFont = true; + serializableAppearanceObject7.Font = new System.Drawing.Font("Tahoma", 2F); + serializableAppearanceObject7.Options.UseFont = true; + serializableAppearanceObject8.Font = new System.Drawing.Font("Tahoma", 12F); + serializableAppearanceObject8.Options.UseFont = true; this.ipsEquipmentID.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.ipsEquipmentID.MaxLength = 20; this.ipsEquipmentID.Name = "ipsEquipmentID"; this.ipsEquipmentID.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.ipsEquipmentID_ButtonClick); @@ -235,17 +228,6 @@ // this.splashScreenManager1.ClosingDelay = 500; // - // layoutControl1 - // - this.layoutControl1.Controls.Add(this.treeList1); - this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.Location = new System.Drawing.Point(0, 133); - this.layoutControl1.Name = "layoutControl1"; - this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1331, 634); - this.layoutControl1.TabIndex = 5; - this.layoutControl1.Text = "layoutControl1"; - // // treeList1 // this.treeList1.Appearance.Caption.Font = new System.Drawing.Font("Tahoma", 12F); @@ -278,10 +260,11 @@ this.gcOwningUnit, this.gcOperatingParameters, this.gcRemarks}); + this.treeList1.Dock = System.Windows.Forms.DockStyle.Fill; this.treeList1.FixedLineWidth = 3; this.treeList1.Font = new System.Drawing.Font("Tahoma", 12F); this.treeList1.HorzScrollStep = 4; - this.treeList1.Location = new System.Drawing.Point(12, 12); + this.treeList1.Location = new System.Drawing.Point(0, 133); this.treeList1.Margin = new System.Windows.Forms.Padding(4); this.treeList1.MenuManager = this.ribbon; this.treeList1.MinimumSize = new System.Drawing.Size(3300, 0); @@ -299,7 +282,7 @@ this.treeList1.OptionsView.AutoWidth = false; this.treeList1.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All; this.treeList1.RowHeight = 31; - this.treeList1.Size = new System.Drawing.Size(3300, 593); + this.treeList1.Size = new System.Drawing.Size(3300, 634); this.treeList1.TabIndex = 13; this.treeList1.TreeLevelWidth = 23; this.treeList1.RowCellClick += new DevExpress.XtraTreeList.RowCellClickEventHandler(this.treeList1_RowCellClick); @@ -447,25 +430,6 @@ this.gcRemarks.Visible = true; this.gcRemarks.VisibleIndex = 15; // - // Root - // - this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.Root.GroupBordersVisible = false; - this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1}); - this.Root.Name = "Root"; - this.Root.Size = new System.Drawing.Size(3324, 617); - this.Root.TextVisible = false; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.treeList1; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(3304, 597); - this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem1.TextVisible = false; - // // UsingDate // this.UsingDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 12F); @@ -514,7 +478,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1331, 767); - this.Controls.Add(this.layoutControl1); + this.Controls.Add(this.treeList1); this.Controls.Add(this.ribbon); this.Font = new System.Drawing.Font("Tahoma", 12F); this.Margin = new System.Windows.Forms.Padding(4); @@ -526,11 +490,7 @@ this.Load += new System.EventHandler(this.pageDeviceTreeView_Load); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ipsEquipmentID)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); - this.layoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.treeList1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -550,10 +510,7 @@ private DevExpress.XtraBars.BarButtonItem barEditStatus; private DevExpress.XtraBars.BarButtonItem barRefresh; private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1; - private DevExpress.XtraLayout.LayoutControl layoutControl1; - private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraTreeList.TreeList treeList1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraTreeList.Columns.TreeListColumn gcAutoID; private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentID; private DevExpress.XtraTreeList.Columns.TreeListColumn gcEquipmentName; diff --git a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs index afd2c81..91f3c6a 100644 --- a/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs +++ b/TsSFCDevice.Client.Launch/Device/pageDeviceTreeView.cs @@ -13,6 +13,7 @@ using TsSFCDevice.Client.Biz.Base.Utils; using DevExpress.XtraEditors; using TsSFCDevice.Client.Biz.Impl; using TsSFCDevice.Client.Launch.FormatProviderExtend; +using DeviceRepair.Models; namespace TsSFCDevice.Client.Launch.Device { @@ -164,7 +165,35 @@ namespace TsSFCDevice.Client.Launch.Device /// private void barEditStatus_ItemClick(object sender, ItemClickEventArgs e) { + if (!Utility.SystemRuntimeInfo.AuthValidate(OperationAuthConstValue.PM_Device_Status)) + { + XtraMessageBoxHelper.Error("当前账号缺少此操作的权限！"); + return; + } + try + { + if (XtraMessageBoxHelper.Ask($"确认操作{(m_CurrentModel.EquipmentStatus == 1 ? "禁用" : "启用")} 设备:{m_CurrentModel.EquipmentName}({m_CurrentModel.EquipmentID}) 吗？") == DialogResult.OK) + { + DateTime dateTime; + APIResponseData apiResponseData = DevRepository.Instance.ChangeStatus(m_CurrentModel.AutoID, out dateTime); + if (!apiResponseData.IsSuccess) + throw new Exception(apiResponseData.Message); + + DeviceInformationInfoTree Item = ((IList)treeList1.DataSource).FirstOrDefault(x => x.AutoID == m_CurrentModel.AutoID); + Item.EquipmentStatus = m_CurrentModel.EquipmentStatus == 1 ? 0 : 1; + + var cache = Utility.SystemRuntimeInfo.CurrentDeviceCaches?.FirstOrDefault(x => x.AutoID == m_CurrentModel.AutoID); + cache.EquipmentStatus = m_CurrentModel.EquipmentStatus == 1 ? 0 : 1; + treeList1.Refresh(); + treeList1_RowCellClick(treeList1, new DevExpress.XtraTreeList.RowCellClickEventArgs(new DevExpress.Utils.DXMouseEventArgs(MouseButtons.Left, 1, 1, 1, 1), treeList1.FocusedNode, gcEquipmentID)); + XtraMessageBoxHelper.Info("操作成功！"); + } + } + catch (Exception ex) + { + XtraMessageBoxHelper.Error(ex.Message, "出错"); + } } /// diff --git a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx index ce532f9..3d9ce75 100644 --- a/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx +++ b/TsSFCDevice.Client.Launch/Maintain/dlgAccessoriesEdit.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 208, 17 + 205, 17 @@ -302,7 +302,7 @@ - 343, 17 + 336, 17 diff --git a/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.Designer.cs b/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.Designer.cs index 863c02d..77c03d0 100644 --- a/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.Designer.cs +++ b/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.Designer.cs @@ -206,7 +206,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl25 // - labelControl25.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl25.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl25.Appearance.Options.UseFont = true; labelControl25.Appearance.Options.UseTextOptions = true; labelControl25.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -255,7 +255,7 @@ namespace TsSFCDevice.Client.Launch.Maintain this.layoutControl2.Controls.Add(labelControl10); this.layoutControl2.Controls.Add(this.disCreatDeptName); this.layoutControl2.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl2.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControl2.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControl2.Location = new System.Drawing.Point(15, 3); this.layoutControl2.Name = "layoutControl2"; this.layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(201, 278, 1024, 774); @@ -277,7 +277,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl35 // - this.labelControl35.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl35.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl35.Appearance.Options.UseFont = true; this.labelControl35.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None; this.labelControl35.Location = new System.Drawing.Point(470, 35); @@ -288,7 +288,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl34 // - this.labelControl34.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl34.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl34.Appearance.Options.UseFont = true; this.labelControl34.Location = new System.Drawing.Point(470, 2); this.labelControl34.Name = "labelControl34"; @@ -322,7 +322,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem38 // - this.layoutControlItem38.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem38.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem38.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem38.Control = this.labelControl34; this.layoutControlItem38.Location = new System.Drawing.Point(0, 0); @@ -335,7 +335,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem39 // - this.layoutControlItem39.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem39.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem39.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem39.Control = this.labelControl35; this.layoutControlItem39.Location = new System.Drawing.Point(0, 33); @@ -350,7 +350,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // labelControl33 // this.labelControl33.AllowHtmlString = true; - this.labelControl33.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl33.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl33.Appearance.Options.UseFont = true; this.labelControl33.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None; this.labelControl33.Location = new System.Drawing.Point(10, 823); @@ -373,7 +373,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl32 // - this.labelControl32.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl32.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl32.Appearance.Options.UseFont = true; this.labelControl32.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None; this.labelControl32.Location = new System.Drawing.Point(149, 35); @@ -384,7 +384,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl31 // - this.labelControl31.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl31.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl31.Appearance.Options.UseFont = true; this.labelControl31.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None; this.labelControl31.Location = new System.Drawing.Point(149, 2); @@ -418,7 +418,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem34 // - this.layoutControlItem34.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem34.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem34.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem34.Control = this.labelControl31; this.layoutControlItem34.Location = new System.Drawing.Point(0, 0); @@ -431,7 +431,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem35 // - this.layoutControlItem35.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem35.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem35.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem35.Control = this.labelControl32; this.layoutControlItem35.Location = new System.Drawing.Point(0, 33); @@ -445,7 +445,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl30 // - this.labelControl30.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl30.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl30.Appearance.Options.UseFont = true; this.labelControl30.Location = new System.Drawing.Point(12, 685); this.labelControl30.Name = "labelControl30"; @@ -455,7 +455,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl29 // - this.labelControl29.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl29.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl29.Appearance.Options.UseFont = true; this.labelControl29.Location = new System.Drawing.Point(12, 615); this.labelControl29.Name = "labelControl29"; @@ -465,7 +465,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disFaultSymptoms // - this.disFaultSymptoms.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disFaultSymptoms.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disFaultSymptoms.Appearance.Options.UseFont = true; this.disFaultSymptoms.Appearance.Options.UseTextOptions = true; this.disFaultSymptoms.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near; @@ -478,7 +478,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl27 // - this.labelControl27.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl27.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl27.Appearance.Options.UseFont = true; this.labelControl27.Appearance.Options.UseTextOptions = true; this.labelControl27.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -491,7 +491,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl26 // - this.labelControl26.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl26.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl26.Appearance.Options.UseFont = true; this.labelControl26.Appearance.Options.UseTextOptions = true; this.labelControl26.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -504,7 +504,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl24 // - labelControl24.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl24.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl24.Appearance.Options.UseFont = true; labelControl24.Appearance.Options.UseTextOptions = true; labelControl24.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -518,7 +518,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disEvaluatorName_TL // - this.disEvaluatorName_TL.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disEvaluatorName_TL.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disEvaluatorName_TL.Appearance.Options.UseFont = true; this.disEvaluatorName_TL.Appearance.Options.UseTextOptions = true; this.disEvaluatorName_TL.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -532,7 +532,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disEvaluatorName_MT // - this.disEvaluatorName_MT.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disEvaluatorName_MT.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disEvaluatorName_MT.Appearance.Options.UseFont = true; this.disEvaluatorName_MT.Appearance.Options.UseTextOptions = true; this.disEvaluatorName_MT.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -546,7 +546,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disEvaluatorName_EA // - this.disEvaluatorName_EA.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disEvaluatorName_EA.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disEvaluatorName_EA.Appearance.Options.UseFont = true; this.disEvaluatorName_EA.Appearance.Options.UseTextOptions = true; this.disEvaluatorName_EA.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -560,7 +560,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // disEvaluatorName_QA // this.disEvaluatorName_QA.AllowHtmlString = true; - this.disEvaluatorName_QA.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disEvaluatorName_QA.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disEvaluatorName_QA.Appearance.Options.UseFont = true; this.disEvaluatorName_QA.Appearance.Options.UseTextOptions = true; this.disEvaluatorName_QA.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -573,7 +573,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl19 // - labelControl19.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl19.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl19.Appearance.Options.UseFont = true; labelControl19.Appearance.Options.UseTextOptions = true; labelControl19.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -587,7 +587,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl18 // - labelControl18.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl18.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl18.Appearance.Options.UseFont = true; labelControl18.Appearance.Options.UseTextOptions = true; labelControl18.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -601,7 +601,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl17 // - labelControl17.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl17.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl17.Appearance.Options.UseFont = true; labelControl17.Appearance.Options.UseTextOptions = true; labelControl17.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -615,7 +615,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl16 // - labelControl16.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl16.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl16.Appearance.Options.UseFont = true; labelControl16.Appearance.Options.UseTextOptions = true; labelControl16.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -629,7 +629,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl15 // - this.labelControl15.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl15.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl15.Appearance.Options.UseFont = true; this.labelControl15.Appearance.Options.UseTextOptions = true; this.labelControl15.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -642,7 +642,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl14 // - this.labelControl14.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl14.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl14.Appearance.Options.UseFont = true; this.labelControl14.Appearance.Options.UseTextOptions = true; this.labelControl14.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -655,7 +655,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl12 // - labelControl12.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl12.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl12.Appearance.Options.UseFont = true; labelControl12.Appearance.Options.UseTextOptions = true; labelControl12.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -669,7 +669,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl4 // - labelControl4.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl4.Appearance.Options.UseFont = true; labelControl4.Appearance.Options.UseTextOptions = true; labelControl4.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -683,7 +683,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disReceivingDep // - this.disReceivingDep.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disReceivingDep.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disReceivingDep.Appearance.Options.UseFont = true; this.disReceivingDep.Appearance.Options.UseTextOptions = true; this.disReceivingDep.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -702,7 +702,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl2 // - labelControl2.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl2.Appearance.Options.UseFont = true; labelControl2.Appearance.Options.UseTextOptions = true; labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -721,7 +721,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl1 // - labelControl1.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl1.Appearance.Options.UseFont = true; labelControl1.Appearance.Options.UseTextOptions = true; labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -740,7 +740,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl8 // - this.labelControl8.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl8.Appearance.Options.UseFont = true; this.labelControl8.Appearance.Options.UseTextOptions = true; this.labelControl8.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -758,7 +758,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl11 // - this.labelControl11.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl11.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl11.Appearance.Options.UseFont = true; this.labelControl11.Appearance.Options.UseTextOptions = true; this.labelControl11.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -776,13 +776,13 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disLocation // - this.disLocation.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disLocation.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disLocation.Appearance.Options.UseFont = true; this.disLocation.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None; this.disLocation.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; - this.disLocation.Location = new System.Drawing.Point(12, 115); + this.disLocation.Location = new System.Drawing.Point(12, 114); this.disLocation.Name = "disLocation"; - this.disLocation.Size = new System.Drawing.Size(586, 88); + this.disLocation.Size = new System.Drawing.Size(586, 89); this.disLocation.StyleController = this.layoutControl2; this.disLocation.TabIndex = 5; this.disLocation.UseMnemonic = false; @@ -790,7 +790,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // labelControl7 // labelControl7.Anchor = System.Windows.Forms.AnchorStyles.None; - labelControl7.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl7.Appearance.Options.UseFont = true; labelControl7.Appearance.Options.UseTextOptions = true; labelControl7.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -810,7 +810,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // labelControl13 // - this.labelControl13.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.labelControl13.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.labelControl13.Appearance.Options.UseFont = true; this.labelControl13.Appearance.Options.UseTextOptions = true; this.labelControl13.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near; @@ -831,7 +831,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disCreatOn // - this.disCreatOn.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disCreatOn.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disCreatOn.Appearance.Options.UseFont = true; this.disCreatOn.Appearance.Options.UseTextOptions = true; this.disCreatOn.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -849,7 +849,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disInProduction // - this.disInProduction.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disInProduction.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disInProduction.Appearance.Options.UseFont = true; this.disInProduction.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None; this.disInProduction.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; @@ -866,7 +866,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // labelControl10 // labelControl10.Anchor = System.Windows.Forms.AnchorStyles.None; - labelControl10.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); labelControl10.Appearance.Options.UseFont = true; labelControl10.Appearance.Options.UseTextOptions = true; labelControl10.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -885,7 +885,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // disCreatDeptName // - this.disCreatDeptName.Appearance.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disCreatDeptName.Appearance.Font = new System.Drawing.Font("Tahoma", 12F); this.disCreatDeptName.Appearance.Options.UseFont = true; this.disCreatDeptName.Appearance.Options.UseTextOptions = true; this.disCreatDeptName.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; @@ -1031,7 +1031,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem7 // - this.layoutControlItem7.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.layoutControlItem7.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem7.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem7.Control = this.disLocation; this.layoutControlItem7.Location = new System.Drawing.Point(0, 90); @@ -1044,7 +1044,7 @@ namespace TsSFCDevice.Client.Launch.Maintain this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(10, 0, 0, 0); this.layoutControlItem7.Text = "Where Failure Occurred故障发生地点："; this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top; - this.layoutControlItem7.TextSize = new System.Drawing.Size(359, 20); + this.layoutControlItem7.TextSize = new System.Drawing.Size(359, 19); // // layoutControlItem2 // @@ -1119,7 +1119,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // lb001 // - this.lb001.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.lb001.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.lb001.AppearanceItemCaption.Options.UseFont = true; this.lb001.Control = this.disCreatOn; this.lb001.Location = new System.Drawing.Point(0, 205); @@ -1191,7 +1191,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // disEquipmentName // this.disEquipmentName.AllowHotTrack = false; - this.disEquipmentName.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disEquipmentName.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.disEquipmentName.AppearanceItemCaption.Options.UseFont = true; this.disEquipmentName.Location = new System.Drawing.Point(0, 45); this.disEquipmentName.Name = "disEquipmentName"; @@ -1204,7 +1204,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // disEquipmentID // this.disEquipmentID.AllowHotTrack = false; - this.disEquipmentID.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.disEquipmentID.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.disEquipmentID.AppearanceItemCaption.Options.UseFont = true; this.disEquipmentID.Location = new System.Drawing.Point(300, 45); this.disEquipmentID.Name = "disEquipmentID"; @@ -1429,7 +1429,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem30 // - this.layoutControlItem30.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem30.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem30.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem30.Control = this.disFaultSymptoms; this.layoutControlItem30.Location = new System.Drawing.Point(0, 520); @@ -1446,7 +1446,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem31 // - this.layoutControlItem31.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem31.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem31.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem31.Control = this.labelControl29; this.layoutControlItem31.Location = new System.Drawing.Point(0, 590); @@ -1463,7 +1463,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem32 // - this.layoutControlItem32.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem32.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem32.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem32.Control = this.labelControl30; this.layoutControlItem32.Location = new System.Drawing.Point(0, 660); @@ -1492,7 +1492,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // layoutControlItem36 // - this.layoutControlItem36.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.layoutControlItem36.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.layoutControlItem36.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem36.Control = this.labelControl33; this.layoutControlItem36.Location = new System.Drawing.Point(0, 800); @@ -1521,7 +1521,7 @@ namespace TsSFCDevice.Client.Launch.Maintain // // lb // - this.lb.AppearanceItemCaption.Font = new System.Drawing.Font("Microsoft YaHei UI", 11.25F); + this.lb.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); this.lb.AppearanceItemCaption.Options.UseFont = true; this.lb.Control = this.disCreatOn; this.lb.Location = new System.Drawing.Point(0, 205); diff --git a/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.cs b/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.cs index ac99cac..5f71cc7 100644 --- a/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.cs +++ b/TsSFCDevice.Client.Launch/Maintain/ucMaintenance.cs @@ -33,11 +33,18 @@ namespace TsSFCDevice.Client.Launch.Maintain } } + public ucMaintenance() : this(null) + { + + } + public ucMaintenance(DeviceWarrantyRequestFormView requestForm) { InitializeComponent(); - RequestForm = requestForm; + if (requestForm != null) + RequestForm = requestForm; + this.Load += UcMaintenance_Load; } @@ -89,6 +96,9 @@ namespace TsSFCDevice.Client.Launch.Maintain void InitializeDataDisplay() { + if (RequestForm == null) + return; + disCreatDeptName.Text = "生产部 - " + RequestForm.CreatorName; disCreatOn.Text = RequestForm.CreatOn.HasValue ? RequestForm.CreatOn.Value.ToString("yyyy/MM/dd HH:mm:ss") : ""; disEquipmentID.Text += RequestForm.EquipmentID; diff --git a/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs b/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs index 27066ac..f52cc0b 100644 --- a/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs +++ b/TsSFCDevice.Client.Launch/OperationAuthConstValue.cs @@ -19,17 +19,17 @@ namespace TsSFCDevice.Client.Launch /// /// 设备新增 /// - public readonly static string PM_Device_ADD = "BIZ_EQUIP_DEVICE_01"; + public readonly static string PM_Device_ADD = "BIZ_EQUIP_66"; /// /// 设备编辑 /// - public readonly static string PM_Device_Edit = "BIZ_EQUIP_DEVICE_02"; + public readonly static string PM_Device_Edit = "BIZ_EQUIP_67"; /// /// 设备状态修改 /// - public readonly static string PM_Device_Status = "BIZ_EQUIP_DEVICE_03"; + public readonly static string PM_Device_Status = "BIZ_EQUIP_68"; #endregion @@ -37,74 +37,77 @@ namespace TsSFCDevice.Client.Launch /// /// 跳过当天保养计划校验 /// - 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"; + public readonly static string PLAN_JUMP_CHECK = "BIZ_EQUIP_72"; + public readonly static string PLAN_JUMP_CHECK_Watch = "BIZ_EQUIP_73"; + public readonly static string PLAN_JUMP_CHECK_Add = "BIZ_EQUIP_74"; + public readonly static string PLAN_JUMP_CHECK_DELETE = "BIZ_EQUIP_75"; #region PM 保养计划 + /// /// PM 保养计划 /// - public readonly static string PM_PLAN = "BIZ_EQUIP_PM_PLAN"; + public readonly static string PM_PLAN = "BIZ_EQUIP_26"; /// /// PM 保养计划查看 /// - public readonly static string PM_PLAN_Watch = "BIZ_EQUIP_PM_PLAN_01"; + public readonly static string PM_PLAN_Watch = "BIZ_EQUIP_27"; /// /// PM 保养计划新增 /// - public readonly static string PM_PLAN_Add = "BIZ_EQUIP_PM_PLAN_02"; + public readonly static string PM_PLAN_Add = "BIZ_EQUIP_28"; /// /// PM 保养计划编辑 /// - public readonly static string PM_PLAN_Edit = "BIZ_EQUIP_PM_PLAN_03"; + public readonly static string PM_PLAN_Edit = "BIZ_EQUIP_29"; /// /// PM 保养计划导入 /// - public readonly static string PM_PLAN_Import = "BIZ_EQUIP_PM_PLAN_04"; + public readonly static string PM_PLAN_Import = "BIZ_EQUIP_30"; /// /// PM 保养计划删除 /// - public readonly static string PM_PLAN_DELETE = "BIZ_EQUIP_PM_PLAN_05"; + public readonly static string PM_PLAN_DELETE = "BIZ_EQUIP_31"; #endregion #region PM 点检表 + /// /// PM 点检表 /// - public readonly static string PM_CheckFORM = "BIZ_EQUIP_PM_FORM"; + public readonly static string PM_CheckFORM = "BIZ_EQUIP_32"; /// /// PM 点检表查看 /// - public readonly static string PM_CheckFORM_Watch = "BIZ_EQUIP_PM_FORM_01"; + public readonly static string PM_CheckFORM_Watch = "BIZ_EQUIP_33"; /// /// PM 点检表新增 /// - public readonly static string PM_CheckFORM_Add = "BIZ_EQUIP_PM_FORM_02"; + public readonly static string PM_CheckFORM_Add = "BIZ_EQUIP_34"; /// /// PM 点检表编辑 /// - public readonly static string PM_CheckFORM_Edit = "BIZ_EQUIP_PM_FORM_03"; + public readonly static string PM_CheckFORM_Edit = "BIZ_EQUIP_35"; /// /// PM 点检表启用/禁用 /// - public readonly static string PM_CheckFORM_Status = "BIZ_EQUIP_PM_FORM_04"; + public readonly static string PM_CheckFORM_Status = "BIZ_EQUIP_36"; /// /// PM 点检表分配 /// - public readonly static string PM_CheckFORM_Assig = "BIZ_EQUIP_PM_FORM_05"; + public readonly static string PM_CheckFORM_Assig = "BIZ_EQUIP_37"; + #endregion #region AM 保养计划 @@ -112,64 +115,66 @@ namespace TsSFCDevice.Client.Launch /// /// AM 保养计划 /// - public readonly static string AM_PLAN = "BIZ_EQUIP_AM_PLAN"; + public readonly static string AM_PLAN = "BIZ_EQUIP_43"; /// /// AM 保养计划查看 /// - public readonly static string AM_PLAN_Watch = "BIZ_EQUIP_AM_PLAN_01"; + public readonly static string AM_PLAN_Watch = "BIZ_EQUIP_44"; /// /// AM 保养计划新增 /// - public readonly static string AM_PLAN_Add = "BIZ_EQUIP_AM_PLAN_02"; + public readonly static string AM_PLAN_Add = "BIZ_EQUIP_45"; /// /// AM 保养计划编辑 /// - public readonly static string AM_PLAN_Edit = "BIZ_EQUIP_AM_PLAN_03"; + public readonly static string AM_PLAN_Edit = "BIZ_EQUIP_46"; /// /// AM 保养计划导入 /// - public readonly static string AM_PLAN_Import = "BIZ_EQUIP_AM_PLAN_04"; + public readonly static string AM_PLAN_Import = "BIZ_EQUIP_47"; /// /// AM 保养计划删除 /// - public readonly static string AM_PLAN_DELETE = "BIZ_EQUIP_AM_PLAN_05"; + public readonly static string AM_PLAN_DELETE = "BIZ_EQUIP_48"; + #endregion #region AM 点检表 + /// /// PM 点检表 /// - public readonly static string AM_CheckFORM = "BIZ_EQUIP_AM_FORM"; + public readonly static string AM_CheckFORM = "BIZ_EQUIP_49"; /// /// PM 点检表查看 /// - public readonly static string AM_CheckFORM_Watch = "BIZ_EQUIP_AM_FORM_01"; + public readonly static string AM_CheckFORM_Watch = "BIZ_EQUIP_50"; /// /// PM 点检表新增 /// - public readonly static string AM_CheckFORM_Add = "BIZ_EQUIP_AM_FORM_02"; + public readonly static string AM_CheckFORM_Add = "BIZ_EQUIP_51"; /// /// PM 点检表编辑 /// - public readonly static string AM_CheckFORM_Edit = "BIZ_EQUIP_AM_FORM_03"; + public readonly static string AM_CheckFORM_Edit = "BIZ_EQUIP_52"; /// /// PM 点检表启用/禁用 /// - public readonly static string AM_CheckFORM_Status = "BIZ_EQUIP_AM_FORM_04"; + public readonly static string AM_CheckFORM_Status = "BIZ_EQUIP_53"; /// /// PM 点检表分配 /// - public readonly static string AM_CheckFORM_Assig = "BIZ_EQUIP_AM_FORM_05"; + public readonly static string AM_CheckFORM_Assig = "BIZ_EQUIP_54"; #endregion #region PM 设备保养 @@ -177,22 +182,22 @@ namespace TsSFCDevice.Client.Launch /// /// PM 设备保养 /// - public readonly static string PM_PRESERVE = "BIZ_EQUIP_PM_PRESERVE"; + public readonly static string PM_PRESERVE = "BIZ_EQUIP_38"; /// /// PM 设备保养记录查看 /// - public readonly static string PM_PRESERVE_Watch = "BIZ_EQUIP_PM_PRESERVE_01"; + public readonly static string PM_PRESERVE_Watch = "BIZ_EQUIP_39"; /// /// PM 设备保养记录新增 /// - public readonly static string PM_PRESERVE_Add = "BIZ_EQUIP_PM_PRESERVE_02"; + public readonly static string PM_PRESERVE_Add = "BIZ_EQUIP_40"; /// /// PM 设备保养记录修改 /// - public readonly static string PM_PRESERVE_Edit = "BIZ_EQUIP_PM_PRESERVE_03"; + public readonly static string PM_PRESERVE_Edit = "BIZ_EQUIP_41"; #endregion @@ -201,60 +206,61 @@ namespace TsSFCDevice.Client.Launch /// /// AM 设备保养 /// - public readonly static string AM_PRESERVE = "BIZ_EQUIP_AM_PRESERVE"; + public readonly static string AM_PRESERVE = "BIZ_EQUIP_55"; /// /// AM 设备保养记录查看 /// - public readonly static string AM_PRESERVE_Watch = "BIZ_EQUIP_AM_PRESERVE_01"; + public readonly static string AM_PRESERVE_Watch = "BIZ_EQUIP_56"; /// /// AM 设备保养记录新增 /// - public readonly static string AM_PRESERVE_Add = "BIZ_EQUIP_AM_PRESERVE_02"; + public readonly static string AM_PRESERVE_Add = "BIZ_EQUIP_57"; /// /// AM 设备保养记录修改 /// - public readonly static string AM_PRESERVE_Edit = "BIZ_EQUIP_AM_PRESERVE_03"; + public readonly static string AM_PRESERVE_Edit = "BIZ_EQUIP_58"; #endregion #region 设备维修 + /// /// 设备维修 /// - public readonly static string Device_REPAIRRECORD = "BIZ_EQUIP_REPAIRRECORD"; + public readonly static string Device_REPAIRRECORD = "BIZ_EQUIP_01"; /// /// 设备维修查看 /// - public readonly static string Device_REPAIRRECORD_Watch = "BIZ_EQUIP_REPAIRRECORD_01"; + public readonly static string Device_REPAIRRECORD_Watch = "BIZ_EQUIP_02"; /// /// 设备维修编辑 /// - public readonly static string Device_REPAIRRECORD_Edit = "BIZ_EQUIP_REPAIRRECORD_02"; + public readonly static string Device_REPAIRRECORD_Edit = "BIZ_EQUIP_03"; /// /// 设备维修导入 /// - public readonly static string Device_REPAIRRECORD_Import = "BIZ_EQUIP_REPAIRRECORD_03"; + public readonly static string Device_REPAIRRECORD_Import = "BIZ_EQUIP_04"; /// /// 设备维修确认权限-工程师 /// - public readonly static string Device_REPAIRRECORD_Engineer = "BIZ_EQUIP_REPAIRRECORD_04"; + public readonly static string Device_REPAIRRECORD_Engineer = "BIZ_EQUIP_05"; /// /// 设备维修确认权限-技术人员 /// - public readonly static string Device_REPAIRRECORD_Echnician = "BIZ_EQUIP_REPAIRRECORD_05"; + public readonly static string Device_REPAIRRECORD_Echnician = "BIZ_EQUIP_06"; /// /// 设备维修确认权限-维修主管 /// - public readonly static string Device_REPAIRRECORD_Manager = "BIZ_EQUIP_REPAIRRECORD_06"; + public readonly static string Device_REPAIRRECORD_Manager = "BIZ_EQUIP_07"; #endregion @@ -263,120 +269,122 @@ namespace TsSFCDevice.Client.Launch /// /// Tag /// - public readonly static string Device_TAG = "BIZ_EQUIP_TAG"; + public readonly static string Device_TAG = "BIZ_EQUIP_59"; /// /// Tag查看 /// - public readonly static string Device_TAG_Watch = "BIZ_EQUIP_TAG_01"; + public readonly static string Device_TAG_Watch = "BIZ_EQUIP_60"; /// /// Tag新增 /// - public readonly static string Device_TAG_Add = "BIZ_EQUIP_TAG_02"; + public readonly static string Device_TAG_Add = "BIZ_EQUIP_61"; /// /// Tag修改 /// - public readonly static string Device_TAG_Edit = "BIZ_EQUIP_TAG_03"; + public readonly static string Device_TAG_Edit = "BIZ_EQUIP_62"; /// /// Tag接受 /// - public readonly static string Device_TAG_Receipt = "BIZ_EQUIP_TAG_04"; + public readonly static string Device_TAG_Receipt = "BIZ_EQUIP_63"; #endregion #region 字段配置 + /// /// 字段配置 /// - public readonly static string Custom_FIELD = "BIZ_EQUIP_FIELD"; + public readonly static string Custom_FIELD = "BIZ_EQUIP_08"; /// /// 现象区分 /// - public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION = "BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION"; + public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION = "BIZ_EQUIP_09"; /// /// 现象区分新增 /// - public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION_ADD = "BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_01"; + public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION_ADD = "BIZ_EQUIP_10"; /// /// 现象区分编辑 /// - public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION_EDIT = "BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_02"; + public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION_EDIT = "BIZ_EQUIP_11"; /// /// 现象区分禁用/启用 /// - public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION_STATUS = "BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION_03"; + public readonly static string Custom_FIELD_SYMPTOMLDISTINCTION_STATUS = "BIZ_EQUIP_12"; /// /// 维修方式 /// - public readonly static string Custom_FIELD_MAINTENANCEN = "BIZ_EQUIP_FIELD_MAINTENANCEN"; + public readonly static string Custom_FIELD_MAINTENANCEN = "BIZ_EQUIP_13"; /// /// 维修方式新增 /// - public readonly static string Custom_FIELD_MAINTENANCEN_ADD = "BIZ_EQUIP_FIELD_MAINTENANCEN_01"; + public readonly static string Custom_FIELD_MAINTENANCEN_ADD = "BIZ_EQUIP_14"; /// /// 维修方式编辑 /// - public readonly static string Custom_FIELD_MAINTENANCEN_EDIT = "BIZ_EQUIP_FIELD_MAINTENANCEN_02"; + public readonly static string Custom_FIELD_MAINTENANCEN_EDIT = "BIZ_EQUIP_15"; /// /// 维修方式禁用/启用 /// - public readonly static string Custom_FIELD_MAINTENANCEN_STATUS = "BIZ_EQUIP_FIELD_MAINTENANCEN_03"; + public readonly static string Custom_FIELD_MAINTENANCEN_STATUS = "BIZ_EQUIP_16"; /// /// 配件维护 /// - public readonly static string Custom_FIELD_ACCESSORIES = "BIZ_EQUIP_FIELD_ACCESSORIES"; + public readonly static string Custom_FIELD_ACCESSORIES = "BIZ_EQUIP_17"; /// /// 配件维护新增 /// - public readonly static string Custom_FIELD_ACCESSORIES_ADD = "BIZ_EQUIP_FIELD_ACCESSORIES_01"; + public readonly static string Custom_FIELD_ACCESSORIES_ADD = "BIZ_EQUIP_18"; /// /// 配件维护编辑 /// - public readonly static string Custom_FIELD_ACCESSORIES_EDIT = "BIZ_EQUIP_FIELD_ACCESSORIES_02"; + public readonly static string Custom_FIELD_ACCESSORIES_EDIT = "BIZ_EQUIP_19"; /// /// 配件维护禁用/启用 /// - public readonly static string Custom_FIELD_ACCESSORIES_STATUS = "BIZ_EQUIP_FIELD_ACCESSORIES_03"; + public readonly static string Custom_FIELD_ACCESSORIES_STATUS = "BIZ_EQUIP_20"; /// /// 故障发生地 /// - public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED = "BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED"; + public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED = "BIZ_EQUIP_21"; /// /// 故障发生地新增 /// - public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED_ADD = "BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_01"; + public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED_ADD = "BIZ_EQUIP_22"; /// /// 故障发生地编辑 /// - public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED_EDIT = "BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_02"; + public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED_EDIT = "BIZ_EQUIP_23"; /// /// 故障发生地禁用/启用 /// - public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED_STATUS = "BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED_03"; + public readonly static string Custom_FIELD_WHEREFAILUREOCCURRED_STATUS = "BIZ_EQUIP_24"; + #endregion #region 软件配置 - public readonly static string Sys_Config = "BIZ_EQUIP_BASE_CONFIG"; + public readonly static string Sys_Config = "BIZ_EQUIP_71"; #endregion } diff --git a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj index 5338112..2635ddc 100644 --- a/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj +++ b/TsSFCDevice.Client.Launch/TsSFCDevice.Client.Launch.csproj @@ -32,12 +32,15 @@ prompt 4 + + + ..\packages\Autoupdater.NET.Official.1.6.4\lib\net45\AutoUpdater.NET.dll - - ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll + + ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll @@ -79,34 +82,29 @@ False C:\Program Files (x86)\FastReports\FastReport.Net\FastReport.Bars.dll - - ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll - True + + ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - - ..\packages\MailKit.2.5.0\lib\net45\MailKit.dll + + ..\packages\MailKit.3.0.0\lib\net452\MailKit.dll - - ..\packages\MimeKit.2.5.0\lib\net45\MimeKit.dll + + ..\packages\MimeKit.3.0.0\lib\net452\MimeKit.dll ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.OOXML.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.OOXML.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXml4Net.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.OpenXml4Net.dll - - ..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll - True + + ..\packages\NPOI.2.5.2\lib\net45\NPOI.OpenXmlFormats.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -115,6 +113,9 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll + + ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll + diff --git a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs index a93092d..4faabae 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.Designer.cs @@ -124,7 +124,7 @@ namespace TsSFCDevice.Client.Launch this.btn_FormVersionMaintenence.Id = 30; this.btn_FormVersionMaintenence.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btn_FormVersionMaintenence.ImageOptions.SvgImage"))); this.btn_FormVersionMaintenence.Name = "btn_FormVersionMaintenence"; - this.btn_FormVersionMaintenence.Tag = "BIZ_EQUIP_PM_FORM"; + this.btn_FormVersionMaintenence.Tag = "BIZ_EQUIP_32"; this.btn_FormVersionMaintenence.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_FormVersionMaintenence_ItemClick); // // ribbonControl @@ -234,7 +234,7 @@ namespace TsSFCDevice.Client.Launch this.btn_Report01.Id = 23; this.btn_Report01.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btn_Report01.ImageOptions.SvgImage"))); this.btn_Report01.Name = "btn_Report01"; - this.btn_Report01.Tag = "BIZ_EQUIP_DEVICE"; + this.btn_Report01.Tag = "BIZ_EQUIP_65"; this.btn_Report01.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_Report01_ItemClick); // // barButtonItem1 @@ -259,7 +259,7 @@ namespace TsSFCDevice.Client.Launch this.btn_DrivePlan.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_DrivePlan.ImageOptions.Image"))); this.btn_DrivePlan.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btn_DrivePlan.ImageOptions.LargeImage"))); this.btn_DrivePlan.Name = "btn_DrivePlan"; - this.btn_DrivePlan.Tag = "BIZ_EQUIP_PM_PLAN"; + this.btn_DrivePlan.Tag = "BIZ_EQUIP_26"; this.btn_DrivePlan.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_DrivePlan_ItemClick); // // btn_DeviceStopLst @@ -338,7 +338,7 @@ namespace TsSFCDevice.Client.Launch this.Am_Plans.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("Am_Plans.ImageOptions.Image"))); this.Am_Plans.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("Am_Plans.ImageOptions.LargeImage"))); this.Am_Plans.Name = "Am_Plans"; - this.Am_Plans.Tag = "BIZ_EQUIP_AM_PLAN"; + this.Am_Plans.Tag = "BIZ_EQUIP_43"; this.Am_Plans.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.Am_Plans_ItemClick); // // Am_Form @@ -347,7 +347,7 @@ namespace TsSFCDevice.Client.Launch this.Am_Form.Id = 48; this.Am_Form.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("Am_Form.ImageOptions.SvgImage"))); this.Am_Form.Name = "Am_Form"; - this.Am_Form.Tag = "BIZ_EQUIP_AM_FORM"; + this.Am_Form.Tag = "BIZ_EQUIP_49"; this.Am_Form.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.Am_Form_ItemClick); // // Am_Record @@ -357,7 +357,7 @@ namespace TsSFCDevice.Client.Launch this.Am_Record.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("Am_Record.ImageOptions.Image"))); this.Am_Record.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("Am_Record.ImageOptions.LargeImage"))); this.Am_Record.Name = "Am_Record"; - this.Am_Record.Tag = "BIZ_EQUIP_AM_PRESERVE_01"; + this.Am_Record.Tag = "BIZ_EQUIP_56"; this.Am_Record.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.Am_Record_ItemClick); // // barButtonItem6 @@ -367,7 +367,7 @@ namespace TsSFCDevice.Client.Launch this.barButtonItem6.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem6.ImageOptions.Image"))); this.barButtonItem6.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem6.ImageOptions.LargeImage"))); this.barButtonItem6.Name = "barButtonItem6"; - this.barButtonItem6.Tag = "BIZ_EQUIP_PM_PRESERVE_01"; + this.barButtonItem6.Tag = "BIZ_EQUIP_39"; this.barButtonItem6.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem6_ItemClick); // // Am_List @@ -392,14 +392,14 @@ namespace TsSFCDevice.Client.Launch new DevExpress.XtraBars.LinkPersistInfo(this.bar_Accessories), new DevExpress.XtraBars.LinkPersistInfo(this.barWherefailureoccurred)}); this.barSubItem1.Name = "barSubItem1"; - this.barSubItem1.Tag = "BIZ_EQUIP_BASE_FIELD"; + this.barSubItem1.Tag = "BIZ_EQUIP_08"; // // bar_SymptomlDistinction // this.bar_SymptomlDistinction.Caption = "现象区分"; this.bar_SymptomlDistinction.Id = 55; this.bar_SymptomlDistinction.Name = "bar_SymptomlDistinction"; - this.bar_SymptomlDistinction.Tag = "BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION"; + this.bar_SymptomlDistinction.Tag = "BIZ_EQUIP_09"; this.bar_SymptomlDistinction.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.bar_SymptomlDistinction_ItemClick); // // bar_Maintenance @@ -407,7 +407,7 @@ namespace TsSFCDevice.Client.Launch this.bar_Maintenance.Caption = "维修方式"; this.bar_Maintenance.Id = 56; this.bar_Maintenance.Name = "bar_Maintenance"; - this.bar_Maintenance.Tag = "BIZ_EQUIP_FIELD_MAINTENANCEN"; + this.bar_Maintenance.Tag = "BIZ_EQUIP_13"; this.bar_Maintenance.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.bar_Maintenance_ItemClick); // // bar_Accessories @@ -415,7 +415,7 @@ namespace TsSFCDevice.Client.Launch this.bar_Accessories.Caption = "配件"; this.bar_Accessories.Id = 58; this.bar_Accessories.Name = "bar_Accessories"; - this.bar_Accessories.Tag = "BIZ_EQUIP_FIELD_ACCESSORIES"; + this.bar_Accessories.Tag = "BIZ_EQUIP_17"; this.bar_Accessories.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem7_ItemClick); // // barWherefailureoccurred @@ -423,7 +423,7 @@ namespace TsSFCDevice.Client.Launch this.barWherefailureoccurred.Caption = "故障发生地点"; this.barWherefailureoccurred.Id = 59; this.barWherefailureoccurred.Name = "barWherefailureoccurred"; - this.barWherefailureoccurred.Tag = "BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED"; + this.barWherefailureoccurred.Tag = "BIZ_EQUIP_21"; this.barWherefailureoccurred.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem8_ItemClick); // // bar_btn_EquipmentMaintenanceLst @@ -433,7 +433,7 @@ namespace TsSFCDevice.Client.Launch this.bar_btn_EquipmentMaintenanceLst.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("bar_btn_EquipmentMaintenanceLst.ImageOptions.Image"))); this.bar_btn_EquipmentMaintenanceLst.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("bar_btn_EquipmentMaintenanceLst.ImageOptions.LargeImage"))); this.bar_btn_EquipmentMaintenanceLst.Name = "bar_btn_EquipmentMaintenanceLst"; - this.bar_btn_EquipmentMaintenanceLst.Tag = "BIZ_EQUIP_REPAIRRECORD"; + this.bar_btn_EquipmentMaintenanceLst.Tag = "BIZ_EQUIP_01"; this.bar_btn_EquipmentMaintenanceLst.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.bar_btn_EquipmentMaintenanceLst_ItemClick); // // barButtonItem9 @@ -461,7 +461,7 @@ namespace TsSFCDevice.Client.Launch this.btnSystemSetting.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSystemSetting.ImageOptions.Image"))); this.btnSystemSetting.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnSystemSetting.ImageOptions.LargeImage"))); this.btnSystemSetting.Name = "btnSystemSetting"; - this.btnSystemSetting.Tag = "BIZ_EQUIP_BASE_CONFIG"; + this.btnSystemSetting.Tag = "BIZ_EQUIP_71"; this.btnSystemSetting.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnSystemSetting_ItemClick); // // barButtonItem12 @@ -530,7 +530,7 @@ namespace TsSFCDevice.Client.Launch this.btnTagMgr.Id = 74; this.btnTagMgr.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnTagMgr.ImageOptions.SvgImage"))); this.btnTagMgr.Name = "btnTagMgr"; - this.btnTagMgr.Tag = "BIZ_EQUIP_TAG_01"; + this.btnTagMgr.Tag = "BIZ_EQUIP_59"; this.btnTagMgr.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnTagMgr_ItemClick); // // barButtonItem7 @@ -540,17 +540,17 @@ namespace TsSFCDevice.Client.Launch this.barButtonItem7.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem7.ImageOptions.Image"))); this.barButtonItem7.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem7.ImageOptions.LargeImage"))); this.barButtonItem7.Name = "barButtonItem7"; - this.barButtonItem7.Tag = "BIZ_EQUIP_REPAIRRECORD_01"; + this.barButtonItem7.Tag = "BIZ_EQUIP_01"; this.barButtonItem7.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem7_ItemClick_1); // // btn_treeView // this.btn_treeView.Caption = "设备总台账树"; this.btn_treeView.Id = 77; - this.btn_treeView.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_treeView.ImageOptions.Image"))); - this.btn_treeView.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btn_treeView.ImageOptions.LargeImage"))); + this.btn_treeView.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_treeView123.ImageOptions.Image"))); + this.btn_treeView.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btn_treeView123.ImageOptions.LargeImage"))); this.btn_treeView.Name = "btn_treeView"; - this.btn_treeView.Tag = "BIZ_EQUIP_DEVICE123"; + this.btn_treeView.Tag = "BIZ_EQUIP_DEVICE"; this.btn_treeView.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; this.btn_treeView.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_treeView_ItemClick); // @@ -564,9 +564,10 @@ namespace TsSFCDevice.Client.Launch // this.btnPlanCheckJump.Caption = "计划完成校验关闭"; this.btnPlanCheckJump.Id = 80; - this.btnPlanCheckJump.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.Image"))); - this.btnPlanCheckJump.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem8.ImageOptions.LargeImage"))); + this.btnPlanCheckJump.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPlanCheckJump.ImageOptions.Image"))); + this.btnPlanCheckJump.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnPlanCheckJump.ImageOptions.LargeImage"))); this.btnPlanCheckJump.Name = "btnPlanCheckJump"; + this.btnPlanCheckJump.Tag = "BIZ_EQUIP_72"; this.btnPlanCheckJump.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnPlanCheckJump_ItemClick); // // page_Main diff --git a/TsSFCDevice.Client.Launch/frm_Launch.cs b/TsSFCDevice.Client.Launch/frm_Launch.cs index e407bc7..ee62ee9 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.cs +++ b/TsSFCDevice.Client.Launch/frm_Launch.cs @@ -31,6 +31,57 @@ namespace TsSFCDevice.Client.Launch Scheduler.Instance.CallBack += InvokeChangeFormText; Scheduler.Instance.Run(); + + //btn_DrivePlan.Tag = OperationAuthConstValue.PM_PLAN; + //btn_FormVersionMaintenence.Tag = OperationAuthConstValue.PM_CheckFORM; + //barButtonItem6.Tag = OperationAuthConstValue.PM_PRESERVE_Watch; + + //Am_Plans.Tag = OperationAuthConstValue.AM_PLAN; + //Am_Form.Tag = OperationAuthConstValue.AM_CheckFORM; + //Am_Record.Tag = OperationAuthConstValue.AM_PRESERVE_Watch; + + //bar_btn_EquipmentMaintenanceLst.Tag = OperationAuthConstValue.Device_REPAIRRECORD; + //barButtonItem7.Tag = OperationAuthConstValue.Device_REPAIRRECORD; + + //btnTagMgr.Tag = OperationAuthConstValue.Device_TAG; + + //barSubItem1.Tag = OperationAuthConstValue.Custom_FIELD; + //bar_SymptomlDistinction.Tag = OperationAuthConstValue.Custom_FIELD_SYMPTOMLDISTINCTION; + //bar_Maintenance.Tag = OperationAuthConstValue.Custom_FIELD_MAINTENANCEN; + //bar_Accessories.Tag = OperationAuthConstValue.Custom_FIELD_ACCESSORIES; + //barWherefailureoccurred.Tag = OperationAuthConstValue.Custom_FIELD_WHEREFAILUREOCCURRED; + + //btn_Report01.Tag = "BIZ_EQUIP_65"; + //btn_treeView.Tag = "BIZ_EQUIP_65"; + //btnPlanCheckJump.Tag = OperationAuthConstValue.PLAN_JUMP_CHECK; + //btnSystemSetting.Tag = OperationAuthConstValue.Sys_Config; + + + //btn_DrivePlan.Tag = "BIZ_EQUIP_26"; + //btn_FormVersionMaintenence.Tag = "BIZ_EQUIP_32"; + //barButtonItem6.Tag = "BIZ_EQUIP_39"; + + //Am_Plans.Tag = "BIZ_EQUIP_43"; + //Am_Form.Tag = "BIZ_EQUIP_49"; + //Am_Record.Tag = "BIZ_EQUIP_56"; + + //bar_btn_EquipmentMaintenanceLst.Tag = "BIZ_EQUIP_01"; + //barButtonItem7.Tag = "BIZ_EQUIP_01"; + + //btnTagMgr.Tag = "BIZ_EQUIP_59"; + + //barSubItem1.Tag = "BIZ_EQUIP_08"; + //bar_SymptomlDistinction.Tag = "BIZ_EQUIP_09"; + //bar_Maintenance.Tag = "BIZ_EQUIP_13"; + //bar_Accessories.Tag = "BIZ_EQUIP_17"; + //barWherefailureoccurred.Tag = "BIZ_EQUIP_21"; + + //btn_Report01.Tag = "BIZ_EQUIP_65"; + //btn_treeView.Tag = "BIZ_EQUIP_65"; + //btnPlanCheckJump.Tag = "BIZ_EQUIP_72"; + //btnSystemSetting.Tag = "BIZ_EQUIP_71"; + + this.FormClosing += (ss, ee) => { if (XtraMessageBoxHelper.AskYesNo("确认现在退出系统吗？") != DialogResult.Yes) @@ -374,7 +425,7 @@ namespace TsSFCDevice.Client.Launch throw new Exception($"当前账号缺少此操作的权限"); } - using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("SYMPTOMLDISTINCTION", "BIZ_EQUIP_FIELD_SYMPTOMLDISTINCTION", "现象区分")) + using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("SYMPTOMLDISTINCTION", OperationAuthConstValue.Custom_FIELD_SYMPTOMLDISTINCTION, "现象区分")) { view.ShowDialog(this); } @@ -400,7 +451,7 @@ namespace TsSFCDevice.Client.Launch throw new Exception($"当前账号缺少此操作的权限"); } - using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("MAINTENANCE", "BIZ_EQUIP_FIELD_MAINTENANCEN", "维修方式")) + using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("MAINTENANCE", OperationAuthConstValue.Custom_FIELD_MAINTENANCEN, "维修方式")) { view.ShowDialog(this); } @@ -426,7 +477,7 @@ namespace TsSFCDevice.Client.Launch throw new Exception($"当前账号缺少此操作的权限"); } - using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("ACCESSORIES", "BIZ_EQUIP_FIELD_ACCESSORIES", "配件维护")) + using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("ACCESSORIES", OperationAuthConstValue.Custom_FIELD_ACCESSORIES, "配件维护")) { view.ShowDialog(this); } @@ -452,7 +503,7 @@ namespace TsSFCDevice.Client.Launch throw new Exception($"当前账号缺少此操作的权限"); } - using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("WHEREFAILUREOCCURRED", "BIZ_EQUIP_FIELD_WHEREFAILUREOCCURRED", "故障发生地")) + using (CustomField.pageFieldCode view = new CustomField.pageFieldCode("WHEREFAILUREOCCURRED", OperationAuthConstValue.Custom_FIELD_ACCESSORIES, "故障发生地")) { view.ShowDialog(this); } diff --git a/TsSFCDevice.Client.Launch/frm_Launch.resx b/TsSFCDevice.Client.Launch/frm_Launch.resx index f0e0b97..98df47d 100644 --- a/TsSFCDevice.Client.Launch/frm_Launch.resx +++ b/TsSFCDevice.Client.Launch/frm_Launch.resx @@ -1019,7 +1019,7 @@ - 205, 17 + 208, 17 @@ -1120,7 +1120,7 @@ T8b7/XCa++SfYzx6ji0+TvBM8H7ggpfB6zUUxspgn/viAVPMYcP/AGBDyOsdZH9HAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA @@ -1133,7 +1133,7 @@ FGQA6bHgFVJ83jO46L9HUOF/t4A80mMBGYNsITkWkDEQEIiF/wwAEzc5In1OcF0AAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAFRyZWVWaWV3O1RyZWU7X0Ij1wAA @@ -1165,76 +1165,76 @@ q6y9RcvvZHEJIj7KGs2/P84ZFqX5IpcAAAAASUVORK5CYII= - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAATdEVYdFRpdGxlAEhpc3Rvcnk7SXRlbTuQPSVvAAADmklEQVQ4T2WSe0yTZxSHX5i3ZcmYcVu2 - /bHMuSk6mDNR2OayRTJQLgGHFkRRWDKjDpjgwJA4YcCEdpRyESm36KwhgO1sK1rl0tLSGy1QWpFysdIG - QltoOxw355blt/dr3B/LTvLk5Ms5vyd58x2S1mAmJ+qHyXG+iaTWDRFagUkV6vjkKkM9i9c/wKo0PDvM - 619O5OpG4znKEjp/gRIQW6YmMZdUhAkWDMw/ZYIBsReEbyZV6aX5wjE0amcgtXqhd69A51rBfdsCiqQT - iCvtc0ac/zWU2d9frCTkaO0QjtQYCuN/uheczh/y3DC6oHEuo9uxiFLZJI7X6pHAUSG7xQLRmBeCQRcS - y7V/f5bdsoeRkORqI7hddrB4BmebeR6yx7/jqtGNQ1wNTlerwBZoUX5DhzM1KkT+KMflvmlUKOzYd7Hb - RQXryOFKA+SOJVT3TkNsXUClchZJFVp0GexYWvnDj9Xmhui+BezrOuwvkUMwPIdTV034NFfMJ19x9bgz - 8QT1hjlU97kQx1bDOO7G8uqz/zDnXYJAMojvrqiRKbCg+M4kwvM6PCSerUGrxQeu0okC2QyOXDGBJ3kI - l2cRbsqk3envUzNeCO+Z0SAaQExZH/i6WezOFq+SLwsV+PxCFz7Ok2HXWSlCM8TYcUqEgmv9UOosSIhN - gWRvCBShb0H2zkYIOx8gorgXjf1u7MoQ/sX8vhcjC3t8NaoZxHDUaO96CJXRhlsyPeIOnURdsxAK7Qg6 - VWbc7h5CG51H02eW9zgQ8k2LhxFs+CL/tiLvphXp9YMoaR1Gj/oBohLS0HT9FsZtTjxyzGP0kQuDI9P+ - +dfNZmT+YkJwagM9BELWhp25lpXwsxqFHTZE/NCJDu1jyLq1mJ71wuNbgtu7CMesD7J+O6I5GhTdncK+ - 8xJsjivKYASBL73+7ivhOeKxk00mnG0ZQVSpBhVSKyxTPqw+/RMW+2/gdUwgqkyLnPZxpF/W4X1WtZxm - g8gnuXcZyZot0bnhu7NE3pQqHb5vt+Io34QDbD0iLmlwgKOn38PIaR0Fi6PA9mONvld3HvyQyZE92RJG - EEBZ90ZY8vYdaY3yvefESKsz4FybFflimz94gp50WEYrtiSW9276IDqE2ffnPvpWSHaebv9XsoYStDn2 - YubW5BrNtmNNC8Gpzdiawn/yHr3ttyPzsuh8I2Uts78tqZa2/xcjWk95mbKJ8trzHkTZQAmkPC9C/gFM - gks/ML6Z5gAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0 + bGUASGlzdG9yeTtJdGVtO5A9JW8AAAOaSURBVDhPZZJ7TJNnFIdfmLdlyZhxW7b9scy5KTqYM1HY5rJF + MlAuAYcWRFFYMqMOmODAkDhhwIR2lHIRKbforCGA7WwrWuXS0tIbLVBakXKx0gZCW2g7HDfnluW392vc + H8tO8uTkyzm/J3nzHZLWYCYn6ofJcb6JpNYNEVqBSRXq+OQqQz2L1z/AqjQ8O8zrX07k6kbjOcoSOn+B + EhBbpiYxl1SECRYMzD9lggGxF4RvJlXppfnCMTRqZyC1eqF3r0DnWsF92wKKpBOIK+1zRpz/NZTZ31+s + JORo7RCO1BgK43+6F5zOH/LcMLqgcS6j27GIUtkkjtfqkcBRIbvFAtGYF4JBFxLLtX9/lt2yh5GQ5Goj + uF12sHgGZ5t5HrLHv+Oq0Y1DXA1OV6vAFmhRfkOHMzUqRP4ox+W+aVQo7Nh3sdtFBevI4UoD5I4lVPdO + Q2xdQKVyFkkVWnQZ7Fha+cOP1eaG6L4F7Os67C+RQzA8h1NXTfg0V8wnX3H1uDPxBPWGOVT3uRDHVsM4 + 7sby6rP/MOddgkAyiO+uqJEpsKD4ziTC8zo8JJ6tQavFB67SiQLZDI5cMYEneQiXZxFuyqTd6e9TM14I + 75nRIBpATFkf+LpZ7M4Wr5IvCxX4/EIXPs6TYddZKUIzxNhxSoSCa/1Q6ixIiE2BZG8IFKFvQfbORgg7 + HyCiuBeN/W7syhD+xfy+FyMLe3w1qhnEcNRo73oIldGGWzI94g6dRF2zEArtCDpVZtzuHkIbnUfTZ5b3 + OBDyTYuHEWz4Iv+2Iu+mFen1gyhpHUaP+gGiEtLQdP0Wxm1OPHLMY/SRC4Mj0/75181mZP5iQnBqAz0E + QtaGnbmWlfCzGoUdNkT80IkO7WPIurWYnvXC41uC27sIx6wPsn47ojkaFN2dwr7zEmyOK8pgBIEvvf7u + K+E54rGTTSacbRlBVKkGFVIrLFM+rD79Exb7b+B1TCCqTIuc9nGkX9bhfVa1nGaDyCe5dxnJmi3RueG7 + s0TelCodvm+34ijfhANsPSIuaXCAo6ffw8hpHQWLo8D2Y42+V3ce/JDJkT3ZEkYQQFn3Rljy9h1pjfK9 + 58RIqzPgXJsV+WKbP3iCnnRYRiu2JJb3bvogOoTZ9+c++lZIdp5u/1eyhhK0OfZi5tbkGs22Y00LwanN + 2JrCf/Ieve23I/Oy6HwjZS2zvy2plrb/FyNaT3mZsony2vMeRNlACaQ8L0L+AUyCSz8wvpnmAAAAAElF + TkSuQmCC - + - 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 - /03icbjO+DeTqe1BwSGzrQAAAABJRU5ErkJggg== + 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 + IbOtAAAAAElFTkSuQmCC diff --git a/TsSFCDevice.Client.Launch/packages.config b/TsSFCDevice.Client.Launch/packages.config index e2c8239..25df672 100644 --- a/TsSFCDevice.Client.Launch/packages.config +++ b/TsSFCDevice.Client.Launch/packages.config @@ -2,10 +2,11 @@ - - + + - - - + + + + \ No newline at end of file diff --git a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml index 37844a8..e6a08e2 100644 --- a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml +++ b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - D:\UGit\DeviceManager\TsSFCDevice.Client.Launch\bin\WebSVC + C:\Users\Clove\Desktop\WebSVC FileSystem <_TargetId>Folder diff --git a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user index ae69ab5..602e8b5 100644 --- a/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/TsSFCDeviceSvc/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,37 +4,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>D:\UGit\DeviceManager\TsSFCDevice.Client.Launch\bin\WebSVC - True|2024-07-31T06:35:03.5193183Z||;True|2024-07-30T14:28:13.0791440+08:00||;True|2024-07-30T10:59:11.3180131+08:00||;True|2024-07-29T17:09:46.7471489+08:00||;True|2024-07-29T15:26:48.9648578+08:00||;True|2024-07-29T09:23:55.9996131+08:00||;True|2024-07-26T07:08:01.2867511+08:00||; + <_PublishTargetUrl>C:\Users\Clove\Desktop\WebSVC + True|2024-08-07T01:52:28.1648821Z||;True|2024-07-31T14:35:03.5193183+08:00||;True|2024-07-30T14:28:13.0791440+08:00||;True|2024-07-30T10:59:11.3180131+08:00||;True|2024-07-29T17:09:46.7471489+08:00||;True|2024-07-29T15:26:48.9648578+08:00||;True|2024-07-29T09:23:55.9996131+08:00||;True|2024-07-26T07:08:01.2867511+08:00||; - 07/31/2024 14:35:02 + 08/07/2024 09:52:26 07/18/2024 13:30:47 - 07/31/2024 14:35:02 + 08/07/2024 09:52:26 - 07/31/2024 14:34:42 + 08/06/2024 17:51:48 05/30/2024 11:42:20 - 07/31/2024 14:34:42 + 08/06/2024 17:51:48 - 07/31/2024 14:34:43 + 08/07/2024 09:52:26 07/04/2024 09:35:30 - 07/31/2024 14:34:43 + 08/07/2024 09:52:26 06/12/2023 14:20:18 @@ -100,10 +100,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/28/2024 22:39:54 - 07/31/2024 14:35:03 + 08/07/2024 09:52:27 - 07/31/2024 14:35:03 + 08/07/2024 09:52:27 07/21/2024 00:35:30