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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
汪青 2024-07-15 22:38:49 +08:00
parent 20d7c09645 d2daed8a91
commit 8cbc218584
29 changed files with 896 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
DataBase/版本日志/SGGLDB_WH_2024-7-11-phf.sql Normal file
View File

@ -0,0 +1,36 @@
--安管人员增加特岗证书
alter table QualityAudit_SafePersonQuality
add CertificateId nvarchar(50) null;
update sys_menu set MenuName='施工机具和设备' where menuid='28C8EDB9-F1C2-4287-8013-28A976B093E2'
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('2556CFA6-63F7-4FC1-9B2B-5E43A84640EC','特种设备','',1,'28C8EDB9-F1C2-4287-8013-28A976B093E2','Menu_HSSE',0,0,1)
go
update sys_menu set menuname='入场验收记录',SuperMenu='2556CFA6-63F7-4FC1-9B2B-5E43A84640EC' ,SortIndex='20'
where menuid='9703D711-85DA-4A0B-B08B-70F791418696';
update sys_menu set menuname='资质报审及检验报告',SuperMenu='2556CFA6-63F7-4FC1-9B2B-5E43A84640EC' ,SortIndex='10'
where menuid='2DEDD752-8BAF-43CD-933D-932AF9AF2F58';
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('8E2FB782-66B3-46C4-8F71-8A5A37585785','普通机具设备','',2,'28C8EDB9-F1C2-4287-8013-28A976B093E2','Menu_HSSE',0,0,1)
go
update sys_menu set menuname='资质报审及检验记录',SuperMenu='8E2FB782-66B3-46C4-8F71-8A5A37585785',SortIndex='10'
where menuid='BFD62699-47F0-49FA-AD39-FAEE8A6C3313';
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('CE2687BF-7BBB-4FD5-8FFE-B3B26F712D34','入场验收记录','HSSE/License/EquipmentSafetyList.aspx',
20,'8E2FB782-66B3-46C4-8F71-8A5A37585785','Menu_HSSE',0,1,1)
go
update sys_menu set IsUsed=0 where menuid='3E167389-4775-4AC3-9D31-2E570682EDA1';
update sys_menu set IsUsed=0 where menuid='A4832598-E3D4-4906-88E5-A3886A85FC5A';
update sys_menu set IsUsed=0 where menuid='56F241A9-0AA3-4EDB-8C5C-999C487C06DA';
update sys_menu set IsUsed=0 where menuid='06EA1483-7397-46DD-818D-56911EA7B679';
update sys_menu set IsUsed=0 where menuid='42E7E869-67EA-446E-A910-BE7BF95EDC00';

58
SGGL/BLL/BoSheng/BOSHENGMonitorService.cs
View File

@ -125,7 +125,7 @@ namespace BLL
if (type == "0")
{
//isOk = AddPerson(projectId, arr, sysUser);
isOk = AddPerson(projectId, arr, sysUser);
}
else if (type == "1")
{
@ -216,7 +216,7 @@ namespace BLL
try
{
List<Model.Bo_Sheng_Person> insertPersons = new List<Model.Bo_Sheng_Person>();
List<Model.SitePerson_Person> insertSitePersons = new List<Model.SitePerson_Person>();
//List<Model.SitePerson_Person> insertSitePersons = new List<Model.SitePerson_Person>();
foreach (var item in arr)
{
string getID = item["ID"].ToString();
@ -292,39 +292,39 @@ namespace BLL
db.SubmitChanges();
}
}
var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString());
if (!string.IsNullOrEmpty(getID))
{
if (getSitePerson == null)
{
Model.SitePerson_Person newPerson = new Model.SitePerson_Person
{
PersonId = SQLHelper.GetNewID(),
ProjectId = projectId,
PersonName = item["Name"].ToString(),
Sex = item["Sex"].ToString(),
Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()),
Address = item["Address"].ToString(),
Nation = item["Nation"].ToString(),
IdentityCard = item["IdentifyID"].ToString(),
UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()),
Telephone = item["Telephone"].ToString(),
MaritalStatus = item["MaritalStatus"].ToString(),
};
insertSitePersons.Add(newPerson);
}
}
//var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString());
//if (!string.IsNullOrEmpty(getID))
//{
// if (getSitePerson == null)
// {
// Model.SitePerson_Person newPerson = new Model.SitePerson_Person
// {
// PersonId = SQLHelper.GetNewID(),
// ProjectId = projectId,
// PersonName = item["Name"].ToString(),
// Sex = item["Sex"].ToString(),
// Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()),
// Address = item["Address"].ToString(),
// Nation = item["Nation"].ToString(),
// IdentityCard = item["IdentifyID"].ToString(),
// UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()),
// Telephone = item["Telephone"].ToString(),
// MaritalStatus = item["MaritalStatus"].ToString(),
// };
// insertSitePersons.Add(newPerson);
// }
//}
if (insertPersons.Count() > 0)
{
db.Bo_Sheng_Person.InsertAllOnSubmit(insertPersons);
db.SubmitChanges();
}
if (insertSitePersons.Count() > 0)
{
db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons);
db.SubmitChanges();
}
//if (insertSitePersons.Count() > 0)
//{
// db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons);
// db.SubmitChanges();
//}
}
}
catch (Exception ex)

46
SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
View File

@ -139,29 +139,31 @@ namespace BLL
/// <param name="inspectionMachine"></param>
public static void UpdateInspectionMachine(Model.Comprehensive_InspectionMachine inspectionMachine)
{
Model.SGGLDB db = Funs.DB;
Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
if (newInspectionMachine != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
newInspectionMachine.ProjectId = inspectionMachine.ProjectId;
newInspectionMachine.UnitId = inspectionMachine.UnitId;
newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode;
newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName;
newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel;
newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
newInspectionMachine.InspectionType = inspectionMachine.InspectionType;
newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
newInspectionMachine.Status = inspectionMachine.Status;
newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
db.SubmitChanges();
Model.Comprehensive_InspectionMachine newInspectionMachine = db.Comprehensive_InspectionMachine.FirstOrDefault(e => e.InspectionMachineId == inspectionMachine.InspectionMachineId);
if (newInspectionMachine != null)
{
newInspectionMachine.ProjectId = inspectionMachine.ProjectId;
newInspectionMachine.UnitId = inspectionMachine.UnitId;
newInspectionMachine.InspectionMachineCode = inspectionMachine.InspectionMachineCode;
newInspectionMachine.InspectionMachineName = inspectionMachine.InspectionMachineName;
newInspectionMachine.SpecificationModel = inspectionMachine.SpecificationModel;
newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
newInspectionMachine.InspectionType = inspectionMachine.InspectionType;
newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
newInspectionMachine.IsOnSite = inspectionMachine.IsOnSite;
newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
newInspectionMachine.Status = inspectionMachine.Status;
newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
db.SubmitChanges();
}
}
}

4
SGGL/BLL/Common/Const.cs
View File

@ -4731,6 +4731,10 @@ namespace BLL
/// 开车人员月绩效报告模板文件原始虚拟路径
/// </summary>
public const string TestRunPerformanceMonthReportTemplateUrl = "File\\Excel\\DataOut\\开车人员月绩效报告.xlsx";
/// <summary>
/// 月度计划情况模板文件原始虚拟路径
/// </summary>
public const string MonthPlanOutTemplateUrl = "File\\Excel\\DataOut\\月度计划情况.xlsx";
#endregion
#endregion

4
SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs
View File

@ -46,6 +46,8 @@ namespace BLL
CompileDate = SafePersonQuality.CompileDate,
AuditDate = SafePersonQuality.AuditDate,
AuditorId = SafePersonQuality.AuditorId,
CertificateId= SafePersonQuality.CertificateId,
};
db.QualityAudit_SafePersonQuality.InsertOnSubmit(newSafePersonQuality);
db.SubmitChanges();
@ -74,6 +76,8 @@ namespace BLL
newSafePersonQuality.CompileDate = SafePersonQuality.CompileDate;
newSafePersonQuality.AuditDate = SafePersonQuality.AuditDate;
newSafePersonQuality.AuditorId = SafePersonQuality.AuditorId;
newSafePersonQuality.CertificateId = SafePersonQuality.CertificateId;
db.SubmitChanges();
}
}

6
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataIn.aspx.cs
View File

@ -261,11 +261,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
string row9 = pds.Rows[i][9].ToString();
if (string.IsNullOrEmpty(row9))
{
result += (i + 2).ToString() + "," + "上报日期" + "," + "此项为必填项！" + "|";
}
else
if (!string.IsNullOrEmpty(row9))
{
try
{

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
View File

@ -459,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()));
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][14].ToString().Trim()));
if (oldViewInfo==null)
{
Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();

148
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -302,3 +302,151 @@ IP地址:::1
出错时间:07/04/2024 09:53:49
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
出错时间:07/15/2024 11:49:20
出错时间:07/15/2024 11:49:21
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
出错时间:07/15/2024 12:19:20
出错时间:07/15/2024 12:19:20
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
出错时间:07/15/2024 12:49:20
出错时间:07/15/2024 12:49:20
错误信息开始=====>
错误类型:ArgumentException
错误信息:提供的 URI 方案“http”无效，应为“https”。
参数名: via
错误堆栈:
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
在 System.ServiceModel.ClientBase`1.get_Channel()
在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827
在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20
错误信息开始=====>
错误类型:ArgumentException
错误信息:提供的 URI 方案“http”无效，应为“https”。
参数名: via
错误堆栈:
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
在 System.ServiceModel.ClientBase`1.get_Channel()
在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851
在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20
错误信息开始=====>
错误类型:ArgumentException
错误信息:提供的 URI 方案“http”无效，应为“https”。
参数名: via
错误堆栈:
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
在 System.ServiceModel.ClientBase`1.get_Channel()
在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843
在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20
错误信息开始=====>
错误类型:ArgumentException
错误信息:提供的 URI 方案“http”无效，应为“https”。
参数名: via
错误堆栈:
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannel()
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
在 System.ServiceModel.ClientBase`1.get_Channel()
在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643
在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 320
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20

BIN
SGGL/FineUIPro.Web/File/Excel/DataOut/月度计划情况.xlsx Normal file
View File

Binary file not shown.

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19048,7 +19048,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

2
SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
View File

@ -203,6 +203,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
BLL.PersonQualityService.AddPersonQuality(personQuality);
BLL.LogService.AddSys_Log(this.CurrUser, personQuality.CertificateNo, personQuality.PersonQualityId, BLL.Const.PersonQualityMenuId, BLL.Const.BtnAdd);
}
if (isClose)
{
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());

13
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx
View File

@ -33,9 +33,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCertificateName" runat="server" Label="证书名称" LabelAlign="Right"
MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox>
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" AutoPostBack="true" OnSelectedIndexChanged="drpCertificate_TextChanged"
LabelAlign="Right" LabelWidth="120px" EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DropDownList>
<f:TextBox ID="txtCertificateNo" runat="server" Label="证书编号" LabelAlign="Right"
MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
</f:TextBox>
@ -76,8 +77,10 @@
<f:DatePicker ID="txtLateCheckDate" Label="最近复查日期" runat="server" LabelAlign="Right"
EnableEdit="true" LabelWidth="120px">
</f:DatePicker>
<f:Label ID="Label1" runat="server">
</f:Label>
<f:TextBox ID="txtCertificateName" runat="server" Label="证书名称" LabelAlign="Right"
MaxLength="50" LabelWidth="120px" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>

27
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs
View File

@ -1,5 +1,6 @@
using BLL;
using System;
using System.Linq;
namespace FineUIPro.Web.HSSE.QualityAudit
{
@ -61,6 +62,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
if (!IsPostBack)
{
CertificateService.InitCertificateDropDownList(this.drpCertificate, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.PersonId = Request.Params["PersonId"];
this.ProjectId = this.CurrUser.LoginProjectId;
@ -102,6 +105,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
}
this.txtRemark.Text = SafePersonQuality.Remark;
this.txtAuditDate.Text = string.Format("{0:yyyy-MM-dd}", SafePersonQuality.AuditDate);
this.drpCertificate.SelectedValue = SafePersonQuality.CertificateId;
}
}
else
@ -135,6 +140,12 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
if (string.IsNullOrEmpty(this.SafePersonQualityId))
{
if (this.drpCertificate.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpCertificate.SelectedValue))
{
Alert.ShowInTop("请选择特岗证书！", MessageBoxIcon.Warning);
return;
}
SaveData(false);
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafePersonQualityAttachUrl&menuId={1}", SafePersonQualityId, BLL.Const.SafePersonQualityMenuId)));
@ -150,9 +161,22 @@ namespace FineUIPro.Web.HSSE.QualityAudit
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpCertificate.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpCertificate.SelectedValue))
{
Alert.ShowInTop("请选择特岗证书！", MessageBoxIcon.Warning);
return;
}
SaveData(true);
}
protected void drpCertificate_TextChanged(object sender, EventArgs e) {
if (this.drpCertificate.SelectedValue!=Const._Null)
{
this.txtCertificateName.Text = this.drpCertificate.SelectedItem.Text;
}
}
/// <summary>
/// 保存数据
/// </summary>
@ -165,7 +189,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit
{
PersonId = this.PersonId,
CertificateNo = this.txtCertificateNo.Text.Trim(),
CertificateName = this.txtCertificateName.Text.Trim(),
CertificateId = this.drpCertificate.SelectedValue,
CertificateName = this.drpCertificate.SelectedItem.Text,
Grade = this.txtGrade.Text.Trim(),
SendUnit = this.txtSendUnit.Text.Trim(),
SendDate = Funs.GetNewDateTime(this.txtSendDate.Text.Trim()),

66
SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.QualityAudit {
public partial class SafePersonQualityEdit {
namespace FineUIPro.Web.HSSE.QualityAudit
{
public partial class SafePersonQualityEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtUnitCode 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitCode;
/// <summary>
/// txtUnitName 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// txtPersonName 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// txtWorkPostName 控件。
/// </summary>
@ -74,16 +76,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPostName;
/// <summary>
/// txtCertificateName 控件。
/// drpCertificate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateName;
protected global::FineUIPro.DropDownList drpCertificate;
/// <summary>
/// txtCertificateNo 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateNo;
/// <summary>
/// txtGrade 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtGrade;
/// <summary>
/// txtSendUnit 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSendUnit;
/// <summary>
/// txtSendDate 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSendDate;
/// <summary>
/// txtLimitDate 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLimitDate;
/// <summary>
/// drpAuditor 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAuditor;
/// <summary>
/// txtAuditDate 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtAuditDate;
/// <summary>
/// txtLateCheckDate 控件。
/// </summary>
@ -155,16 +157,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtLateCheckDate;
/// <summary>
/// Label1 控件。
/// txtCertificateName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
protected global::FineUIPro.TextBox txtCertificateName;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>

11
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
View File

@ -244,6 +244,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.txtCertificateCode.Text = personQuality.CertificateNo;
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
}
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
{
this.drpCertificate.SelectedValue = safePersonQuality.CertificateId;
this.txtCertificateCode.Text = safePersonQuality.CertificateNo;
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", safePersonQuality.LimitDate);
}
}
else
{
@ -625,8 +633,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
safePersonQuality.CertificateId = this.drpCertificate.SelectedValue;
safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
safePersonQuality.CompileMan = this.CurrUser.UserId;
@ -644,6 +654,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
};
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
newSafePersonQuality.CertificateId = drpCertificate.SelectedValue;
newSafePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
newSafePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();

3
SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx
View File

@ -41,6 +41,9 @@
<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" runat="server"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>

121
SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs
View File

@ -8,6 +8,7 @@ using System.Data;
using System.Data.SqlClient;
using BLL;
using Newtonsoft.Json.Linq;
using System.IO;
namespace FineUIPro.Web.JDGL.Check
{
@ -170,5 +171,125 @@ left join Sys_User us on us.UserId=mp.DutyPerson where mp.ProjectId=@ProjectId a
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanStatisc.aspx", "统计 - ")));
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
if (Grid1.Rows.Count == 0)
{
ShowNotify("无数据可导出！", MessageBoxIcon.Warning);
return;
}
string rootPath = Server.MapPath("~/");
string initTemplatePath = string.Empty;
string uploadfilepath = string.Empty;
string newUrl = string.Empty;
string filePath = string.Empty;
initTemplatePath = Const.MonthPlanOutTemplateUrl;
uploadfilepath = rootPath + initTemplatePath;
newUrl = uploadfilepath.Replace(".xlsx", "(" + this.txtMonths.Text.Trim() + ").xlsx");
File.Copy(uploadfilepath, newUrl);
// 第一步：读取文件流
NPOI.SS.UserModel.IWorkbook workbook;
using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
{
workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
}
Model.SGGLDB db = Funs.DB;
var units = from x in db.Base_Unit select x;
var users = from x in db.Sys_User select x;
DateTime months = Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01");
var lists = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months orderby x.SortIndex select x;
// 创建单元格样式
NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
cellStyle.WrapText = true;
var font = workbook.CreateFont();
font.FontHeightInPoints = 10;
//font.FontHeightInPoints = (short)8.5;字号为小数时要转为short
cellStyle.SetFont(font);
// 第二步：创建新数据行
NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
int i = 1;
int sum = 0;
foreach (var item in lists)
{
// 第二步：创建新数据行
NPOI.SS.UserModel.IRow row = sheet.GetRow(i);
NPOI.SS.UserModel.ICell cell;
// 添加数据
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.SetCellValue(i.ToString());
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
string unitName = string.Empty;
var unit = units.FirstOrDefault(x => x.UnitId == item.UnitId);
if (unit != null)
{
unitName = unit.UnitName;
}
cell.SetCellValue(unitName);
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.NodeContent);
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
string planDate = string.Empty;
if (item.PlanDate != null)
{
planDate = string.Format("{0:yyyy-MM-dd}", item.PlanDate);
}
cell.SetCellValue(planDate);
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
string userName = string.Empty;
var user = users.FirstOrDefault(x => x.UserId == item.DutyPerson);
if (user != null)
{
userName = user.UserName;
}
cell.SetCellValue(userName);
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
string realDate = string.Empty;
if (item.RealDate != null)
{
realDate = string.Format("{0:yyyy-MM-dd}", item.RealDate);
}
cell.SetCellValue(realDate);
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Remark);
i++;
}
// 第三步：写入文件流
using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
{
workbook.Write(stream);
workbook.Close();
}
string fileName = Path.GetFileName(newUrl);
FileInfo info = new FileInfo(newUrl);
long fileSize = info.Length;
Response.Clear();
Response.ContentType = "application/x-zip-compressed";
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
Response.AddHeader("Content-Length", fileSize.ToString());
Response.TransmitFile(newUrl, 0, fileSize);
Response.Flush();
Response.Close();
File.Delete(newUrl);
}
#endregion
}
}

9
SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs generated
View File

@ -111,6 +111,15 @@ namespace FineUIPro.Web.JDGL.Check {
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>

20
SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs
View File

@ -45,6 +45,8 @@ namespace FineUIPro.Web.JDGL.Check
Model.SGGLDB db = Funs.DB;
//所有集合
var totalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months select x;
//所有集合
var sumTotalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months <= months select x;
if (this.ckType.SelectedValue == "1") //按责任单位
{
var pUnit = from x in db.Project_ProjectUnit
@ -103,7 +105,7 @@ namespace FineUIPro.Web.JDGL.Check
i++;
}
}
if (StatisticsList.Count() > 0) //增加总计
if (StatisticsList.Count() > 0) //增加合计
{
Model.JDGL_MonthPlan StatisticsLast = new Model.JDGL_MonthPlan();
StatisticsLast.NodeContent = "合计";
@ -121,6 +123,22 @@ namespace FineUIPro.Web.JDGL.Check
}
StatisticsList.Add(StatisticsLast);
}
//增加累计
Model.JDGL_MonthPlan StatisticsSum = new Model.JDGL_MonthPlan();
StatisticsSum.NodeContent = "累计";
int c = sumTotalList.Count();
int d = sumTotalList.Count(x => x.RealDate.HasValue);
StatisticsSum.UnitId = c.ToString();
StatisticsSum.DutyPerson = d.ToString();
if (c != 0)//被除数不能为零
{
StatisticsSum.Remark = Math.Round((double)d / (double)c * 100, 2) + "%";//保留两位小数、后四舍五入
}
else
{
StatisticsSum.Remark = "0%";
}
StatisticsList.Add(StatisticsSum);
this.Grid1.DataSource = StatisticsList;
this.Grid1.DataBind();
}

24
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs
View File

@ -161,6 +161,30 @@ namespace FineUIPro.Web.JDGL.Check
}
StatisticsList.Add(StatisticsLast);
}
//增加累计
List<Model.JDGL_WeekPlan> sumTotalList = new List<Model.JDGL_WeekPlan>();
if (totalList.Count() > 0)
{
var startDate = totalList.First().StartDate;
sumTotalList = (from x in db.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.StartDate <= startDate select x).ToList();
}
Model.JDGL_WeekPlan StatisticsSum = new Model.JDGL_WeekPlan();
StatisticsSum.WorkContent = "累计";
int c = sumTotalList.Count();
int d = sumTotalList.Count(x => x.IsOK == true);
StatisticsSum.UnitId = c.ToString();
StatisticsSum.DutyPerson = d.ToString();
if (c != 0)//被除数不能为零
{
StatisticsSum.Remark = Math.Round((double)d / (double)c * 100, 2) + "%";//保留两位小数、后四舍五入
}
else
{
StatisticsSum.Remark = "0%";
}
StatisticsList.Add(StatisticsSum);
this.Grid1.DataSource = StatisticsList;
this.Grid1.DataBind();
this.Grid1.DataSource = StatisticsList;
this.Grid1.DataBind();
}

4
SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
View File

@ -187,8 +187,8 @@ namespace FineUIPro.Web.TestRun
private void InitDropDownList()
{
//SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId,
Const.ProjectUnitType_2, false);
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId,
false);
}
/// <summary>

2
SGGL/FineUIPro.Web/Web.config
View File

@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

6
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
View File

@ -277,10 +277,10 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
//一次共检合格数
var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true
select new { x.ProjectId,x.CompileDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
select new { x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
////总数
var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement
select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.CompileDate }).ToList();
select new { x.ProjectId, x.InspectionId, Isid = x.InspectionId,x.InspectionDate }).ToList();
//关键事项
var list22 = (from x in Funs.DB.GJSX
@ -729,7 +729,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
if (hgs>0)
{
//验收日期
model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CompileDate).FirstOrDefault().CompileDate;
model.CompileDate = list20.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InspectionDate).FirstOrDefault().InspectionDate;
}
model.SummeryResult = hgs.ToString();
allList.Add(model);

2
SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx
View File

@ -41,7 +41,7 @@
<f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField ID="lk" ColumnID="export" Hidden="true" HeaderText="导出" Width="60px" Icon="ArrowUp" TextAlign="Center" HeaderTextAlign="Center" CommandName="export" EnableAjax="false" />
<f:LinkButtonField ID="lk" ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" TextAlign="Center" HeaderTextAlign="Center" CommandName="export" EnableAjax="false" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

362
SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx.cs
View File

@ -883,7 +883,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
cell = row.CreateCell(34);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
sheet.AddMergedRegion(new CellRangeAddress(i-1, i, 34, 34));
sheet.AddMergedRegion(new CellRangeAddress(i - 1, i, 34, 34));
cell = row.CreateCell(35);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
@ -900,17 +900,365 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
sheet.AddMergedRegion(new CellRangeAddress(i - 1, i, 38, 38));
i++;
string projectName = string.Empty;
string lastProjectName = string.Empty;
int b = 1;
foreach (var item in monthList)
{
bool isForeign = false;
string isForeignStr = "否";
row = sheet.CreateRow(i);
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.SetCellValue(b.ToString());
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
var project = projects.FirstOrDefault(x => x.ProjectId == item.ProjectId);
if (project != null)
{
projectName = project.ProjectName;
if (lastProjectName != projectName)
{
lastProjectName = projectName;
}
else
{
projectName = string.Empty;
}
if (project.IsForeign == true)
{
isForeign = true;
isForeignStr = "是";
}
}
else
{
if (lastProjectName != projectName)
{
lastProjectName = projectName;
}
else
{
projectName = string.Empty;
}
projectName = "本部";
}
cell.SetCellValue(projectName);
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.JobContent);
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue(isForeignStr);
if (item.Type == "部门基础工作")
{
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "公司培训")
{
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "项目投标")
{
cell = row.CreateCell(9);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(9);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "开车策划")
{
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "开车培训")
{
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(15);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(15);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "合同管理")
{
cell = row.CreateCell(16);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(17);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(16);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(17);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "预试车")
{
cell = row.CreateCell(18);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(19);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(20);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(18);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(19);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(20);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "试车")
{
cell = row.CreateCell(21);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(22);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(21);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(22);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "试运行及考核")
{
cell = row.CreateCell(23);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(24);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(25);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(23);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(24);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(25);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "开车收尾")
{
cell = row.CreateCell(26);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(27);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(28);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(26);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(27);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(28);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "项目协调")
{
cell = row.CreateCell(29);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(30);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
}
else
{
cell = row.CreateCell(29);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(30);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
if (item.Type == "其他")
{
cell = row.CreateCell(31);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Item);
cell = row.CreateCell(32);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Unit);
cell = row.CreateCell(33);
cell.CellStyle = cellStyle;
cell.SetCellValue((item.Days ?? 0).ToString());
}
else
{
cell = row.CreateCell(31);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(32);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(33);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
}
double sDays = 0, sDays1 = 0, sDays3 = 0;
if (isForeign) //境外项目
{
if (item.Code1 != 1 && item.Code1 != 2 && item.Code1 != 12)
{
sDays = (item.Days ?? 0) * 1.2;
}
else
{
sDays = item.Days ?? 0;
}
}
else
{
sDays = item.Days ?? 0;
}
if (item.Code1 == 1)
{
sDays1 = item.Days ?? 0;
}
else
{
sDays1 = 0;
}
if (item.Code1 == 3)
{
sDays3 = item.Days ?? 0;
}
else
{
sDays3 = 0;
}
cell = row.CreateCell(34);
cell.CellStyle = cellStyle;
cell.SetCellValue(sDays.ToString());
cell = row.CreateCell(35);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(36);
cell.CellStyle = cellStyle;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(37);
cell.CellStyle = cellStyle;
cell.SetCellValue(sDays1);
cell = row.CreateCell(38);
cell.CellStyle = cellStyle;
cell.SetCellValue(sDays3);
b++;
i++;
}
i++;
}

1
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
View File

@ -91,7 +91,6 @@
</TreeNode>
<TreeNode id="20ECB69E-28C4-4FAC-941A-15F446AEB634" Text="HSE费用" NavigateUrl=""><TreeNode id="C6CF3A5C-546B-483A-B742-A77F2E152523" Text="合同HSE费用额登记" NavigateUrl="HSSE/CostGoods/FeeRegistration.aspx"></TreeNode>
<TreeNode id="6FBF4B7D-21D2-4013-9465-12AC093109D4" Text="HSE措施费使用计划" NavigateUrl="HSSE/CostGoods/MeasuresPlan.aspx"></TreeNode>
<TreeNode id="E7B8059B-304B-47C6-90C8-D88E4A3EC506" Text="分包商HSE费用投入登记" NavigateUrl="HSSE/CostGoods/SubPayRegistration.aspx"></TreeNode>
<TreeNode id="9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E" Text="HSE费用投入登记" NavigateUrl="HSSE/CostGoods/PayRegistrationNew.aspx"></TreeNode>
<TreeNode id="19C1370F-92C0-4E31-87B4-8BADA74113E4" Text="合同HSE费用及支付台账" NavigateUrl="HSSE/CostGoods/CostLedgerNew.aspx"></TreeNode>
</TreeNode>

3
SGGL/FineUIPro.Web/common/Menu_Personal.xml
View File

@ -6,4 +6,7 @@
<TreeNode id="C6EF06E5-9019-4583-8122-EA94FCC545C6" Text="员工总结" NavigateUrl=""></TreeNode>
<TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
<TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
</Tree>

2
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
View File

@ -84,5 +84,7 @@
<TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
<TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
<TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
<TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
</TreeNode>
</Tree>

162
SGGL/Model/Model.cs
View File

@ -39710,8 +39710,6 @@ namespace Model
private EntitySet<Check_CheckRectify> _Check_CheckRectify;
private EntitySet<Check_CheckSpecialDetail> _Check_CheckSpecialDetail;
private EntitySet<Check_ContactList> _Check_ContactList;
private EntitySet<Check_IncentiveNotice> _Check_IncentiveNotice;
@ -40103,7 +40101,6 @@ namespace Model
this._Check_CheckDayDetail = new EntitySet<Check_CheckDayDetail>(new Action<Check_CheckDayDetail>(this.attach_Check_CheckDayDetail), new Action<Check_CheckDayDetail>(this.detach_Check_CheckDayDetail));
this._Check_CheckInfo = new EntitySet<Check_CheckInfo>(new Action<Check_CheckInfo>(this.attach_Check_CheckInfo), new Action<Check_CheckInfo>(this.detach_Check_CheckInfo));
this._Check_CheckRectify = new EntitySet<Check_CheckRectify>(new Action<Check_CheckRectify>(this.attach_Check_CheckRectify), new Action<Check_CheckRectify>(this.detach_Check_CheckRectify));
this._Check_CheckSpecialDetail = new EntitySet<Check_CheckSpecialDetail>(new Action<Check_CheckSpecialDetail>(this.attach_Check_CheckSpecialDetail), new Action<Check_CheckSpecialDetail>(this.detach_Check_CheckSpecialDetail));
this._Check_ContactList = new EntitySet<Check_ContactList>(new Action<Check_ContactList>(this.attach_Check_ContactList), new Action<Check_ContactList>(this.detach_Check_ContactList));
this._Check_IncentiveNotice = new EntitySet<Check_IncentiveNotice>(new Action<Check_IncentiveNotice>(this.attach_Check_IncentiveNotice), new Action<Check_IncentiveNotice>(this.detach_Check_IncentiveNotice));
this._Check_JointCheck = new EntitySet<Check_JointCheck>(new Action<Check_JointCheck>(this.attach_Check_JointCheck), new Action<Check_JointCheck>(this.detach_Check_JointCheck));
@ -41011,19 +41008,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Check_CheckSpecialDetail", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
public EntitySet<Check_CheckSpecialDetail> Check_CheckSpecialDetail
{
get
{
return this._Check_CheckSpecialDetail;
}
set
{
this._Check_CheckSpecialDetail.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ContactList_Base_Unit", Storage="_Check_ContactList", ThisKey="UnitId", OtherKey="SponsorUnitId", DeleteRule="NO ACTION")]
public EntitySet<Check_ContactList> Check_ContactList
{
@ -43313,18 +43297,6 @@ namespace Model
entity.Base_Unit = null;
}
private void attach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity)
{
this.SendPropertyChanging();
entity.Base_Unit = this;
}
private void detach_Check_CheckSpecialDetail(Check_CheckSpecialDetail entity)
{
this.SendPropertyChanging();
entity.Base_Unit = null;
}
private void attach_Check_ContactList(Check_ContactList entity)
{
this.SendPropertyChanging();
@ -61996,8 +61968,6 @@ namespace Model
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -62049,7 +62019,6 @@ namespace Model
public Check_CheckSpecial()
{
this._Base_Project = default(EntityRef<Base_Project>);
this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
OnCreated();
}
@ -62368,10 +62337,6 @@ namespace Model
{
if ((this._CheckItemSetId != value))
{
if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnCheckItemSetIdChanging(value);
this.SendPropertyChanging();
this._CheckItemSetId = value;
@ -62515,40 +62480,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
public Technique_CheckItemSet Technique_CheckItemSet
{
get
{
return this._Technique_CheckItemSet.Entity;
}
set
{
Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
if (((previousValue != value)
|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Technique_CheckItemSet.Entity = null;
previousValue.Check_CheckSpecial.Remove(this);
}
this._Technique_CheckItemSet.Entity = value;
if ((value != null))
{
value.Check_CheckSpecial.Add(this);
this._CheckItemSetId = value.CheckItemSetId;
}
else
{
this._CheckItemSetId = default(string);
}
this.SendPropertyChanged("Technique_CheckItemSet");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -62622,8 +62553,6 @@ namespace Model
private string _CheckOpinions;
private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<WBS_UnitWork> _WBS_UnitWork;
#region 可扩展性方法定义
@ -62680,7 +62609,6 @@ namespace Model
public Check_CheckSpecialDetail()
{
this._Base_Unit = default(EntityRef<Base_Unit>);
this._WBS_UnitWork = default(EntityRef<WBS_UnitWork>);
OnCreated();
}
@ -62820,10 +62748,6 @@ namespace Model
{
if ((this._UnitId != value))
{
if (this._Base_Unit.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnUnitIdChanging(value);
this.SendPropertyChanging();
this._UnitId = value;
@ -63153,40 +63077,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
get
{
return this._Base_Unit.Entity;
}
set
{
Base_Unit previousValue = this._Base_Unit.Entity;
if (((previousValue != value)
|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Base_Unit.Entity = null;
previousValue.Check_CheckSpecialDetail.Remove(this);
}
this._Base_Unit.Entity = value;
if ((value != null))
{
value.Check_CheckSpecialDetail.Add(this);
this._UnitId = value.UnitId;
}
else
{
this._UnitId = default(string);
}
this.SendPropertyChanged("Base_Unit");
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_ProjectData_WorkArea", Storage="_WBS_UnitWork", ThisKey="CheckArea", OtherKey="UnitWorkId", IsForeignKey=true)]
public WBS_UnitWork WBS_UnitWork
{
@ -312412,6 +312302,8 @@ namespace Model
private string _States;
private string _CertificateId;
private EntityRef<SitePerson_Person> _SitePerson_Person;
private EntityRef<Sys_User> _Sys_User;
@ -312456,6 +312348,8 @@ namespace Model
partial void OnAuditOpinionChanged();
partial void OnStatesChanging(string value);
partial void OnStatesChanged();
partial void OnCertificateIdChanging(string value);
partial void OnCertificateIdChanged();
#endregion
public QualityAudit_SafePersonQuality()
@ -312818,6 +312712,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")]
public string CertificateId
{
get
{
return this._CertificateId;
}
set
{
if ((this._CertificateId != value))
{
this.OnCertificateIdChanging(value);
this.SendPropertyChanging();
this._CertificateId = value;
this.SendPropertyChanged("CertificateId");
this.OnCertificateIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_SafePersonQuality_SitePerson_Person", Storage="_SitePerson_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)]
public SitePerson_Person SitePerson_Person
{
@ -370406,8 +370320,6 @@ namespace Model
private System.Nullable<bool> _IsBuiltIn;
private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
#region 可扩展性方法定义
@ -370434,7 +370346,6 @@ namespace Model
public Technique_CheckItemSet()
{
this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
OnCreated();
}
@ -370599,19 +370510,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
public EntitySet<Check_CheckSpecial> Check_CheckSpecial
{
get
{
return this._Check_CheckSpecial;
}
set
{
this._Check_CheckSpecial.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
{
@ -370645,18 +370543,6 @@ namespace Model
}
}
private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
{
this.SendPropertyChanging();
entity.Technique_CheckItemSet = this;
}
private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
{
this.SendPropertyChanging();
entity.Technique_CheckItemSet = null;
}
private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
{
this.SendPropertyChanging();