lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目主数据对接

This commit is contained in:
夏菊 2025-03-28 14:22:04 +08:00
parent b0f56d5f4e
commit dbf8b972bc
11 changed files with 1139 additions and 1025 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
DataBase/版本日志/SGGLDB_WH_V2025-03-27-xiaj.sql → DataBase/版本日志/SGGLDB_WH_V2025-03-28（项目主数据对接）-xiaj.sql
View File

@ -1,19 +1,46 @@
insert into Sys_Set(SetId,SetName,SetValue) --insert into Sys_Set(SetId,SetName,SetValue)
select 3,'MDMToken','eyJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6bnVsbCwiZGVwdE5hbWUiOiJXRUMiLCJzdWIiOiJ6Z3doIiwib3JnTmFtZSI6IldFQyIsInN5c1VzZXJOYW1lIjoiemd3aCIsImNvbXBhbnlOYW1lIjpudWxsLCJkZXB0SWQiOjIzODY2LCJpc3MiOiLkupHmmbrmlbDnu7QiLCJ0eXBlIjoxLCJvcmdJZCI6MjM4NjYsInVzZXJDb2RlIjpudWxsLCJjb21wYW55SWQiOjAsIm9yZ0NvZGUiOiItMSIsImRpc0lkIjoxMTIsImV4cCI6MTc0MzIxNDI1NSwiaWF0IjoxNzQzMDQxNDU1LCJkZXB0Q29kZSI6Ii0xIiwianRpIjoiMTU1MyJ9.tqYpeG4t7r8r05fGV2h-wBYihoFH9jH-veAmuCXG4EI' --select 3,'PMPToken','eyJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6bnVsbCwiZGVwdE5hbWUiOiJXRUMiLCJzdWIiOiJ6Z3doIiwib3JnTmFtZSI6IldFQyIsInN5c1VzZXJOYW1lIjoiemd3aCIsImNvbXBhbnlOYW1lIjpudWxsLCJkZXB0SWQiOjIzODY2LCJpc3MiOiLkupHmmbrmlbDnu7QiLCJ0eXBlIjoxLCJvcmdJZCI6MjM4NjYsInVzZXJDb2RlIjpudWxsLCJjb21wYW55SWQiOjAsIm9yZ0NvZGUiOiItMSIsImRpc0lkIjoxMTIsImV4cCI6MTc0MzIxNDI1NSwiaWF0IjoxNzQzMDQxNDU1LCJkZXB0Q29kZSI6Ii0xIiwianRpIjoiMTU1MyJ9.tqYpeG4t7r8r05fGV2h-wBYihoFH9jH-veAmuCXG4EI'
insert into Sys_Set(SetId,SetName,SetValue) --insert into Sys_Set(SetId,SetName,SetValue)
select 4,'MDMTokenExTime','2025/03/27 11:18:00' --select 4,'PMPTokenExTime','2025/03/27 11:18:00'
insert into Sys_Set(SetId,SetName,SetValue) --insert into Sys_Set(SetId,SetName,SetValue)
select 5,'MDM接口地址','http://mdm.cwcec.com:8020/' --select 5,'PMP接口地址','http://mdm.cwcec.com:8020/'
--MDM项目数据 delete Sys_Set where SetName like '%MDM%'
IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'MDM_Project') AND type = N'U') IF NOT EXISTS (SELECT 1 FROM Sys_Set WHERE SetName = 'PMP接口地址')
BEGIN BEGIN
CREATE TABLE [dbo].[MDM_Project]( insert into Sys_Set(SetId,SetName,SetValue)
select 5,'PMP接口地址','http://mdm.cwcec.com:8020/'
END
GO
/**********************************************************
--drop table MDM_Project;
select* from Sys_Set;
select* from PMP_Project;
***********************************************************/
--PMP项目数据补充开工日期和竣工日期
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PMP_Project' AND COLUMN_NAME = 'realEndDate')
BEGIN
ALTER TABLE PMP_Project ADD realStartDate datetime;
ALTER TABLE PMP_Project ADD realEndDate datetime;
END
GO
--PMP项目数据
IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PMP_Project') AND type = N'U')
BEGIN
CREATE TABLE [dbo].[PMP_Project](
[id] [int] NOT NULL, [id] [int] NOT NULL,
[code] [nvarchar](100) NOT NULL, [code] [nvarchar](100) NOT NULL,
[stNum] [nvarchar](100) NOT NULL, [stNum] [nvarchar](100) NOT NULL,
@ -39,39 +66,43 @@ BEGIN
[provinceName] [nvarchar](100) NULL, [provinceName] [nvarchar](100) NULL,
[remarkA] [nvarchar](100) NULL, [remarkA] [nvarchar](100) NULL,
[remarkB] [nvarchar](100) NULL, [remarkB] [nvarchar](100) NULL,
[realStartDate] [datetime] NULL,
[realEndDate] [datetime] NULL,
[CreateTime] [datetime] NOT NULL, [CreateTime] [datetime] NOT NULL,
CONSTRAINT [PK_MDM_Project] PRIMARY KEY CLUSTERED CONSTRAINT [PK_PMP_Project] PRIMARY KEY CLUSTERED
( (
[id] ASC [id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY] ) ON [PRIMARY]
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'id' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'id'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'code' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'code'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目号(源头)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'stNum' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目号(源头)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stNum'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'disType' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'disType'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'name' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'name'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目简称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'projShortName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目简称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projShortName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoCode' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoCode'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目类型一级' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'stProjectTypeVals' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目类型一级' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stProjectTypeVals'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目类型二级' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'stProjectStepVals' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目类型二级' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stProjectStepVals'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoVals' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoVals'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目性质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'stProjectPropertyVals' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目性质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stProjectPropertyVals'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注3_新系统项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'remarkC' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注3_新系统项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'remarkC'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'详细地址' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'address' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'详细地址' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'address'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'市编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'cityCode' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'市编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'cityCode'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'市名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'cityName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'市名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'cityName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'国家编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'countryCode' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'国家编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countryCode'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'国家名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'countryName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'国家名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countryName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'区县编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'countyCode' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'区县编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countyCode'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'区县名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'countyName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'区县名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countyName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目英文名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'projectNameEn' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目英文名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projectNameEn'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'省编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'provinceCode' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'省编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'provinceCode'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'省名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'provinceName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'省名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'provinceName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'经度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'remarkA' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'经度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'remarkA'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'纬度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'remarkB' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'纬度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'remarkB'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project', @level2type=N'COLUMN',@level2name=N'CreateTime' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目开工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'realStartDate'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'MDM项目数据' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MDM_Project' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目竣工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'realEndDate'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'CreateTime'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'PMP项目数据' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project'
END END
GO GO

2
SGGL/BLL/BLL.csproj
View File

@ -626,7 +626,7 @@
<Compile Include="JDGL\WBS\WbsSetMatchCostControlService.cs" /> <Compile Include="JDGL\WBS\WbsSetMatchCostControlService.cs" />
<Compile Include="JDGL\WBS\WbsSetService.cs" /> <Compile Include="JDGL\WBS\WbsSetService.cs" />
<Compile Include="JDGL\WBS\WorkloadStatisticsService.cs" /> <Compile Include="JDGL\WBS\WorkloadStatisticsService.cs" />
<Compile Include="MDM\MDMDataService.cs" /> <Compile Include="PMP\PMPDataService.cs" />
<Compile Include="Notice\NoticeService.cs" /> <Compile Include="Notice\NoticeService.cs" />
<Compile Include="OfficeCheck\Check\CheckNoticeService.cs" /> <Compile Include="OfficeCheck\Check\CheckNoticeService.cs" />
<Compile Include="OfficeCheck\Check\CheckReportService.cs" /> <Compile Include="OfficeCheck\Check\CheckReportService.cs" />

260
SGGL/BLL/MDM/MDMDataService.cs
View File

File diff suppressed because one or more lines are too long

269
SGGL/BLL/PMP/PMPDataService.cs Normal file
View File

File diff suppressed because one or more lines are too long

24
SGGL/BLL/SysManage/SysConstSetService.cs
View File

@ -174,11 +174,11 @@
public static string WuHuanMDMPath public static string WuHuanPMPPath
{ {
get get
{ {
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "MDM接口地址" select x).ToList().FirstOrDefault(); var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMP接口地址" select x).ToList().FirstOrDefault();
if (sysSet5 != null) if (sysSet5 != null)
{ {
_CNCECPath = sysSet5.SetValue; _CNCECPath = sysSet5.SetValue;
@ -194,11 +194,11 @@
_CNCECPath = value; _CNCECPath = value;
} }
} }
public static string WuHuanMDMToken public static string WuHuanPMPToken
{ {
get get
{ {
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "MDMToken" select x).ToList().FirstOrDefault(); var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPToken" select x).ToList().FirstOrDefault();
if (sysSet5 != null) if (sysSet5 != null)
{ {
_CNCECToken = sysSet5.SetValue; _CNCECToken = sysSet5.SetValue;
@ -210,11 +210,11 @@
return _CNCECToken; return _CNCECToken;
} }
} }
public static string WuHuanMDMTokenExTime public static string WuHuanPMPTokenExTime
{ {
get get
{ {
var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "MDMTokenExTime" select x).ToList().FirstOrDefault(); var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPTokenExTime" select x).ToList().FirstOrDefault();
if (sysSet5 != null) if (sysSet5 != null)
{ {
_CNCECTokenExTime = sysSet5.SetValue; _CNCECTokenExTime = sysSet5.SetValue;
@ -226,9 +226,9 @@
return _CNCECTokenExTime; return _CNCECTokenExTime;
} }
} }
public static void SetWuHuanMDMToken(string token) public static void SetWuHuanPMPToken(string token)
{ {
Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "MDMToken"); Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "PMPToken");
if (sysSet != null) if (sysSet != null)
{ {
if (!string.IsNullOrEmpty(token)) if (!string.IsNullOrEmpty(token))
@ -253,14 +253,14 @@
{ {
newSysSet5.SetValue = token; newSysSet5.SetValue = token;
} }
newSysSet5.SetName = "MDMToken"; newSysSet5.SetName = "PMPToken";
Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5); Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }
public static void SetWuHuanMDMTokenExpirationTime(string ExpirationTime) public static void SetWuHuanPMPTokenExpirationTime(string ExpirationTime)
{ {
Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "MDMTokenExTime"); Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "PMPTokenExTime");
if (sysSet != null) if (sysSet != null)
{ {
if (!string.IsNullOrEmpty(ExpirationTime)) if (!string.IsNullOrEmpty(ExpirationTime))
@ -285,7 +285,7 @@
{ {
newSysSet5.SetValue = ExpirationTime; newSysSet5.SetValue = ExpirationTime;
} }
newSysSet5.SetName = "MDMTokenExTime"; newSysSet5.SetName = "PMPTokenExTime";
Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5); Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5);
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }

19
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
View File

@ -19,7 +19,7 @@
<%-- <f:DropDownList ID="drpProject" runat="server" Label="项目名称" EnableEdit="true" Required="true" ShowRedStar="true"> <%-- <f:DropDownList ID="drpProject" runat="server" Label="项目名称" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>--%> </f:DropDownList>--%>
<f:DropDownBox runat="server" ID="drpProjectBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="项目名称" EmptyText="请从下拉表格中选择项目" DataControlID="Grid2" <f:DropDownBox runat="server" ID="drpProjectBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="项目名称" EmptyText="请从下拉表格中选择PMP系统项目" DataControlID="Grid2"
EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true"> EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel> <PopPanel>
<f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true" <f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
@ -29,8 +29,8 @@
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号、名称查找" ShowLabel="false" ID="ttbMdmProCodeSearch" <f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号、名称查找" ShowLabel="false" ID="ttbPmpProCodeSearch"
ShowTrigger1="false" OnTrigger1Click="ttbMdmProCodeSearch_Trigger1Click" OnTrigger2Click="ttbMdmProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search"> ShowTrigger1="false" OnTrigger1Click="ttbPmpProCodeSearch_Trigger1Click" OnTrigger2Click="ttbPmpProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox> </f:TwinTriggerBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -38,12 +38,17 @@
</f:Form> </f:Form>
<f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name" <f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name"
DataIDField="Name" DataTextField="Name" EnableMultiSelect="false" DataIDField="Name" DataTextField="Name" EnableMultiSelect="false"
PageSize="5" ShowBorder="true" ShowHeader="false" PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true" AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="StNum" SortDirection="DESC" AllowSorting="false" SortField="StNum" SortDirection="DESC"
OnSort="Grid2_Sort"> OnSort="Grid2_Sort">
<Columns> <Columns>
<f:RowNumberField TextAlign="Center" /> <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" /> <f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" /> <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" /> <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" />
@ -67,7 +72,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目" EmptyText="请从下拉表格中选择项目" DataControlID="Grid1" <f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目" EmptyText="请从下拉表格中选择集团项目" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false"> EnableMultiSelect="false" MatchFieldWidth="false">
<PopPanel> <PopPanel>
<f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true" <f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"

44
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
View File

@ -422,14 +422,16 @@ namespace FineUIPro.Web.ProjectData
} }
var mdmProject = Funs.DB.MDM_Project.Where(x => x.Name == proName).FirstOrDefault(); var pmpProject = Funs.DB.PMP_Project.Where(x => x.Name == proName).FirstOrDefault();
if (mdmProject != null) if (pmpProject != null)
{ {
this.txtProjectCode.Text = mdmProject.StNum; this.txtProjectCode.Text = pmpProject.StNum;
this.txtShortName.Text = mdmProject.ProjShortName; this.txtShortName.Text = pmpProject.ProjShortName;
this.txtProjectAddress.Text = mdmProject.Address; this.txtProjectAddress.Text = pmpProject.Address;
this.txtCity.Text = mdmProject.CityName; this.txtCity.Text = pmpProject.CityName;
//this.txtEnglishRemark.Text = mdmProject.ProjectNameEn; this.txtStartDate.Text = pmpProject.RealStartDate != null ? ((DateTime)pmpProject.RealStartDate).ToString("yyyy-MM-dd") : "";
this.txtEndDate.Text = pmpProject.RealEndDate != null ? ((DateTime)pmpProject.RealEndDate).ToString("yyyy-MM-dd") : "";
//this.txtEnglishRemark.Text = pmpProject.ProjectNameEn;
} }
@ -1773,20 +1775,20 @@ namespace FineUIPro.Web.ProjectData
#endregion #endregion
#region 获取五环mdm项目数据 #region 获取五环pmp项目数据
private void BindGrid2() private void BindGrid2()
{ {
var lastMdmProject = (from x in Funs.DB.MDM_Project orderby x.CreateTime descending select x).FirstOrDefault(); var lastPmpProject = (from x in Funs.DB.PMP_Project orderby x.CreateTime descending select x).FirstOrDefault();
if (lastMdmProject == null || DateTime.Now > lastMdmProject.CreateTime.AddHours(30)) if (lastPmpProject == null || DateTime.Now > lastPmpProject.CreateTime.AddHours(30))
{ {
MDMDataService.GetMDMProjectMasterData(); PMPDataService.GetPMPProjectMasterData();
} }
//var mdmtoken = MDMDataService.GetToken(); //var pmptoken = PMPDataService.GetToken();
var list = (from x in Funs.DB.MDM_Project orderby x.StNum descending select x).ToList(); var list = (from x in Funs.DB.PMP_Project orderby x.StNum descending select x).ToList();
string codeName = ttbMdmProCodeSearch.Text.Trim(); string codeName = ttbPmpProCodeSearch.Text.Trim();
//string name = ttbMdmProNameSearch.Text.Trim(); //string name = ttbPmpProNameSearch.Text.Trim();
if (!string.IsNullOrWhiteSpace(codeName)) if (!string.IsNullOrWhiteSpace(codeName))
{ {
list = list.Where(x => x.StNum.Contains(codeName) || x.Name.Contains(codeName)).ToList(); list = list.Where(x => x.StNum.Contains(codeName) || x.Name.Contains(codeName)).ToList();
@ -1821,18 +1823,18 @@ namespace FineUIPro.Web.ProjectData
} }
protected void ttbMdmProCodeSearch_Trigger1Click(object sender, EventArgs e) protected void ttbPmpProCodeSearch_Trigger1Click(object sender, EventArgs e)
{ {
ttbMdmProCodeSearch.Text = string.Empty; ttbPmpProCodeSearch.Text = string.Empty;
ttbMdmProCodeSearch.ShowTrigger1 = false; ttbPmpProCodeSearch.ShowTrigger1 = false;
BindGrid2(); BindGrid2();
} }
protected void ttbMdmProCodeSearch_Trigger2Click(object sender, EventArgs e) protected void ttbPmpProCodeSearch_Trigger2Click(object sender, EventArgs e)
{ {
ttbMdmProCodeSearch.ShowTrigger1 = true; ttbPmpProCodeSearch.ShowTrigger1 = true;
BindGrid2(); BindGrid2();
} }
//protected void ttbMdmProCodeSearch_Trigger2Click(object sender, EventArgs e) //protected void ttbPmpProCodeSearch_Trigger2Click(object sender, EventArgs e)
//{ //{
// ttbCodeSearch.ShowTrigger3 = true; // ttbCodeSearch.ShowTrigger3 = true;
// BindGrid2(); // BindGrid2();

13
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.ProjectData
protected global::FineUIPro.Form Form2; protected global::FineUIPro.Form Form2;
/// <summary> /// <summary>
/// ttbMdmProCodeSearch 控件。 /// ttbPmpProCodeSearch 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TwinTriggerBox ttbMdmProCodeSearch; protected global::FineUIPro.TwinTriggerBox ttbPmpProCodeSearch;
/// <summary> /// <summary>
/// Grid2 控件。 /// Grid2 控件。
@ -86,6 +86,15 @@ namespace FineUIPro.Web.ProjectData
/// </remarks> /// </remarks>
protected global::FineUIPro.Grid Grid2; protected global::FineUIPro.Grid Grid2;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary> /// <summary>
/// txtProjectCode 控件。 /// txtProjectCode 控件。
/// </summary> /// </summary>

1394
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff

2
SGGL/Model/Model.csproj
View File

@ -230,7 +230,7 @@
<Compile Include="JDGL\WBSDetailItem.cs" /> <Compile Include="JDGL\WBSDetailItem.cs" />
<Compile Include="JDGL\WBSSetInitItem.cs" /> <Compile Include="JDGL\WBSSetInitItem.cs" />
<Compile Include="JDGL\WBSSetItem.cs" /> <Compile Include="JDGL\WBSSetItem.cs" />
<Compile Include="MDM\MdmProject.cs" /> <Compile Include="PMP\PMPProject.cs" />
<Compile Include="Model.cs" /> <Compile Include="Model.cs" />
<Compile Include="ModelProc.cs" /> <Compile Include="ModelProc.cs" />
<Compile Include="Num.cs" /> <Compile Include="Num.cs" />

32
SGGL/Model/MDM/MdmProject.cs → SGGL/Model/PMP/PMPProject.cs
View File

@ -20,7 +20,7 @@ namespace Model
/// <summary> /// <summary>
/// 项目 /// 项目
/// </summary> /// </summary>
public partial class MdmResponseData public partial class PMPResponseData
{ {
/// <summary> /// <summary>
/// 返回状态 /// 返回状态
@ -42,7 +42,7 @@ namespace Model
/// 返回状态 /// 返回状态
/// </summary> /// </summary>
[JsonProperty("rows")] [JsonProperty("rows")]
public System.Collections.Generic.List<MdmProject> rows { get; set; } public System.Collections.Generic.List<PMPProject> rows { get; set; }
/// <summary> /// <summary>
/// 返回消息 /// 返回消息
/// </summary> /// </summary>
@ -62,7 +62,7 @@ namespace Model
/// <summary> /// <summary>
/// 项目 /// 项目
/// </summary> /// </summary>
public partial class MdmProject public partial class PMPProject
{ {
/// <summary> /// <summary>
/// 主键ID /// 主键ID
@ -80,11 +80,6 @@ namespace Model
[JsonProperty("stNum")] [JsonProperty("stNum")]
public string stNum { get; set; } public string stNum { get; set; }
/// <summary> /// <summary>
/// 操作类型
/// </summary>
[JsonProperty("disType")]
public string disType { get; set; }
/// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name")]
@ -95,6 +90,21 @@ namespace Model
[JsonProperty("projShortName")] [JsonProperty("projShortName")]
public string projShortName { get; set; } public string projShortName { get; set; }
/// <summary> /// <summary>
/// 项目开工日期
/// </summary>
[JsonProperty("realStartDate")]
public DateTime? realStartDate { get; set; }
/// <summary>
/// 项目竣工日期
/// </summary>
[JsonProperty("realEndDate")]
public DateTime? realEndDate { get; set; }
/// <summary>
/// 操作类型
/// </summary>
[JsonProperty("disType")]
public string disType { get; set; }
/// <summary>
/// 项目阶段编码 /// 项目阶段编码
/// </summary> /// </summary>
[JsonProperty("projStepZxnoCode")] [JsonProperty("projStepZxnoCode")]
@ -193,11 +203,11 @@ namespace Model
} }
public partial class MdmResponseData public partial class PMPResponseData
{ {
public static MdmResponseData FromJson(string json) public static PMPResponseData FromJson(string json)
{ {
return JsonConvert.DeserializeObject<MdmResponseData>(json, Model.Converter.Settings); return JsonConvert.DeserializeObject<PMPResponseData>(json, Model.Converter.Settings);
} }
} }