lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2023-11-10 15:21:46 +08:00
parent 13cfea61ed f68955d921
commit 833dc56cb6
19 changed files with 1344 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
DataBase/版本日志/SGGLDB_V2023-11-09.sql Normal file
View File

@ -0,0 +1,32 @@
ALTER VIEW [dbo].[View_WBS]
AS
select '1' as Id,'0' as SupId ,'JZ' as Code, '½¨Öþ¹¤³Ì' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,null as JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,null as RealStartDate,null as IsMileStone,null as PlanCost,null as PreWorkCode,'' as ShowId,
ProjectId from dbo.Base_Project
Union
select '2' as Id,'0' as SupId ,'AZ' as Code, '°²×°¹¤³Ì' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,null as JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,null as RealStartDate,null as IsMileStone,null as PlanCost,null as PreWorkCode,'' as ShowId,
ProjectId from dbo.Base_Project
Union
select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,RealStartDate,null as IsMileStone,PlanCost,null as PreWorkCode,'' as ShowId,
ProjectId from dbo.WBS_UnitWork
Union all
select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,Unit,PlanProjectQuantity,RealProjectQuantity,RealStartDate,IsMileStone,PlanCost,PreWorkCode,case when (select COUNT(*) from WBS_WorkPackage a where a.SuperWorkPackageId=w.WorkPackageId and a.IsApprove=1)=0 then WorkPackageId else '' end as ShowId,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
Union all
select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,Unit,PlanProjectQuantity,RealProjectQuantity,RealStartDate,IsMileStone,PlanCost,PreWorkCode,case when (select COUNT(*) from WBS_WorkPackage a where a.SuperWorkPackageId=w.WorkPackageId and a.IsApprove=1)=0 then WorkPackageId else '' end as ShowId,
ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
GO

45
DataBase/版本日志/SGGLDB_V2023-11-10.sql Normal file
View File

@ -0,0 +1,45 @@
CREATE VIEW [dbo].[View_Hazard_HazardRegisterList]
AS
/**********°²È«Ñ²¼ìÊÓͼ*************/
SELECT Registration.ProjectId,
Registration.HazardRegisterId,
Registration.ResponsibleUnit,
Registration.CheckTime,
Registration.ProblemTypes,
User2.PersonName AS CheckManName,
RegisterTypes.RegisterTypesName,
ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
Unit.UnitName AS ResponsibilityUnitName,
Registration.RectificationTime,
Registration.states,
Registration.RegisterDef,
Registration.HazardValue,
Registration.RegisterTypes2Id ,
RegisterTypes2.RegisterTypesName as RegisterTypes2Name,
Registration.RegisterTypes3Id ,
RegisterTypes3.RegisterTypesName as RegisterTypes3Name,
Registration.RegisterTypes4Id ,
RegisterTypes4.RegisterTypesName as RegisterTypes4Name,
User1.PersonName AS ResponsibilityManName,
User2.UnitId AS SendUnitId,
Registration.Rectification,
Registration.RectificationPeriod,
Registration.RegisterDate,
(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä'
WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ'
WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä'
WHEN Registration.states='3' THEN 'Òѱջ·' ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr
FROM dbo.HSSE_Hazard_HazardRegister AS Registration
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes2 ON RegisterTypes2.RegisterTypesId = Registration.RegisterTypes2Id
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes3 ON RegisterTypes3.RegisterTypesId = Registration.RegisterTypes3Id
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes4 ON RegisterTypes4.RegisterTypesId = Registration.RegisterTypes4Id
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
LEFT JOIN dbo.Person_Persons AS User1 ON User1.PersonId = Registration.ResponsibleMan
LEFT JOIN dbo.Person_Persons AS User2 ON User2.PersonId = Registration.CheckManId
LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place
GO

190
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
View File

@ -245,7 +245,7 @@ namespace BLL
/// 获取模拟树表格
/// </summary>
/// <returns></returns>
public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK)
public static DataTable GetAllTreeDataTable0(string projectId, string IsOut, string startTime, string endTime, string isOK)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
@ -292,11 +292,6 @@ namespace BLL
table.Columns.Add(new DataColumn("PlanCost", typeof(String)));
table.Columns.Add(new DataColumn("PreWorkCode", typeof(String)));
table.Columns.Add(new DataColumn("Code", typeof(String)));
for (int i = 0; i < months.Count; i++)
{
table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String)));
table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String)));
}
if (getWBSs.Count() > 0)
{
List<Model.View_WBS> newList = new List<Model.View_WBS>();
@ -372,19 +367,6 @@ namespace BLL
row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2);
}
row[16] = workPackage.PreWorkCode;
var details = getDetails.Where(x => x.WorkPackageId == item.Id).ToList();
foreach (var item1 in details)
{
var index = months.FindIndex(x => x.Equals(item1.Months));
if (item1.PlanNum != 0)
{
row[18 + index * 2] = decimal.Round(Convert.ToDecimal(item1.PlanNum), 2);
}
if (item1.ThisNum != 0)
{
row[19 + index * 2] = decimal.Round(Convert.ToDecimal(item1.ThisNum), 2);
}
}
}
else
{
@ -454,6 +436,168 @@ namespace BLL
}
}
public static List<Model.View_WBS> GetAllTreeDataTable2(string projectId, string IsOut, string startTime, string endTime, string isOK)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
List<Model.View_WBS> getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList();
List<Model.View_WBS> newList = new List<Model.View_WBS>();
if (getWBSs.Count() > 0)
{
var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0");
int a = 1;
foreach (var item in projectTypes)
{
item.Code = a.ToString();
newList.Add(item);
if (string.IsNullOrEmpty(IsOut))
{
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK);
}
else
{
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK);
}
a++;
}
}
return newList;
}
}
/// <summary>
/// 获取模拟树表格
/// </summary>
/// <returns></returns>
public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
IQueryable<Model.View_WBS_WorkPackageDetail> getDetails = from x in db.View_WBS_WorkPackageDetail where x.ProjectId == projectId select x;
List<Model.View_WBS> getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList();
DateTime startDate, endDate, startMonth, endMonth;
List<DateTime> months = new List<DateTime>();
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId);
if (project.StartDate != null)
{
startDate = Convert.ToDateTime(project.StartDate);
endDate = DateTime.Now;
if (project.EndDate != null)
{
endDate = Convert.ToDateTime(project.EndDate);
}
startMonth = Convert.ToDateTime(startDate.Year + "-" + startDate.Month + "-01");
endMonth = Convert.ToDateTime(endDate.Year + "-" + endDate.Month + "-01");
do
{
months.Add(startMonth);
startMonth = startMonth.AddMonths(1);
} while (startMonth <= endMonth);
}
DataTable table = new DataTable();
table.Columns.Add(new DataColumn("Id", typeof(String)));
table.Columns.Add(new DataColumn("SupId", typeof(String)));
table.Columns.Add(new DataColumn("Name", typeof(String)));
table.Columns.Add(new DataColumn("WBSType", typeof(String)));
table.Columns.Add(new DataColumn("ProjectId", typeof(String)));
table.Columns.Add(new DataColumn("ShowId", typeof(String)));
table.Columns.Add(new DataColumn("JDWeights", typeof(String)));
table.Columns.Add(new DataColumn("Unit", typeof(String)));
table.Columns.Add(new DataColumn("PlanProjectQuantity", typeof(String)));
table.Columns.Add(new DataColumn("RealProjectQuantity", typeof(String)));
table.Columns.Add(new DataColumn("PlanStartDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("PlanEndDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("RealStartDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("RealEndDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("IsMileStone", typeof(bool)));
table.Columns.Add(new DataColumn("PlanCost", typeof(String)));
table.Columns.Add(new DataColumn("PreWorkCode", typeof(String)));
table.Columns.Add(new DataColumn("Code", typeof(String)));
for (int i = 0; i < months.Count; i++)
{
table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String)));
table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String)));
}
if (getWBSs.Count() > 0)
{
List<Model.View_WBS> newList = new List<Model.View_WBS>();
var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0");
int a = 1;
foreach (var item in projectTypes)
{
item.Code = a.ToString();
newList.Add(item);
if (string.IsNullOrEmpty(IsOut))
{
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK);
}
else
{
AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK);
}
a++;
}
DataRow row;
foreach (Model.View_WBS item in newList)
{
row = table.NewRow();
row[0] = item.Id;
row[1] = item.SupId;
row[2] = item.Name;
row[3] = item.WBSType;
row[4] = item.ProjectId;
row[5] = item.ShowId;
row[6] = item.JDWeights;
row[7] = item.Unit;
row[8] = item.PlanProjectQuantity;
row[9] = item.RealProjectQuantity;
if (item.PlanStartDate != null)
{
row[10] = item.PlanStartDate;
}
if (item.PlanEndDate != null)
{
row[11] = item.PlanEndDate;
}
if (item.RealStartDate != null)
{
row[12] = item.RealStartDate;
}
if (item.RealEndDate != null)
{
row[13] = item.RealEndDate;
}
if (item.IsMileStone != null)
{
row[14] = item.IsMileStone;
}
row[15] = item.PlanCost;
row[16] = item.PreWorkCode;
row[17] = item.Code;
if (!string.IsNullOrEmpty(item.ShowId))
{
var details = getDetails.Where(x => x.WorkPackageId == item.Id).ToList();
foreach (var item1 in details)
{
var index = months.FindIndex(x => x.Equals(item1.Months));
if (item1.PlanNum != 0)
{
row[18 + index * 2] = decimal.Round(Convert.ToDecimal(item1.PlanNum), 2);
}
if (item1.ThisNum != 0)
{
row[19 + index * 2] = decimal.Round(Convert.ToDecimal(item1.ThisNum), 2);
}
}
}
table.Rows.Add(row);
}
}
return table;
}
}
private static void AddDetail(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string startTime, string endTime, string isOK)
{
if (isOK == "0")
@ -760,7 +904,7 @@ namespace BLL
public static string getWorkPageNamesByControlItemAndCycle(string workPackageId, string controlItemAndCycleId)
{
string returnValues = string.Empty;
string ControlItemName=string.Empty;
string ControlItemName = string.Empty;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
@ -802,7 +946,7 @@ namespace BLL
var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId);
if (getSupWorkPackage != null)
{
returnValues = getWorkPackage.PackageContent + "|" + returnValues;
returnValues = getWorkPackage.PackageContent + "|" + returnValues;
returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues);
}
@ -820,7 +964,7 @@ namespace BLL
{
returnValues = "安装工程|" + getUnitWork.UnitWorkName + "|" + returnValues;
}
}
}
}
@ -1093,7 +1237,7 @@ namespace BLL
}
}
private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime,List<string> ids)
private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime, List<string> ids)
{
var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code);
int b = 1;

2
SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
View File

@ -221,7 +221,7 @@ namespace BLL
{
Model.SGGLDB db = Funs.DB;
Model.HJGL_Pipeline_Component newPipeline = new Model.HJGL_Pipeline_Component();
pipeline.IsPrint ??= false;
pipeline.IsPrint = false;
newPipeline.PipelineComponentId = pipeline.PipelineComponentId;
newPipeline.PipelineId = pipeline.PipelineId;
newPipeline.PreUnit = pipeline.PreUnit;

123
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
View File

@ -1,7 +1,8 @@
using System;
using FineUIPro;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
namespace BLL
{
@ -9,6 +10,124 @@ namespace BLL
{
public static Model.SGGLDB db = Funs.DB;
#region 获取安全巡检列表信息
/// <summary>
/// 记录数
/// </summary>
public static int count
{
get;
set;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.View_Hazard_HazardRegisterList> getDataLists = from x in db.View_Hazard_HazardRegisterList
where x.ProblemTypes == "1"
select x;
/// <summary>
///
/// </summary>
/// <param name="projetcId"></param>
/// <param name="checkMan"></param>
/// <param name="type"></param>
/// <param name="workAreaName"></param>
/// <param name="responsibilityUnitName"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="startRectificationTime"></param>
/// <param name="endRectificationTime"></param>
/// <param name="states"></param>
/// <param name="personId"></param>
/// <param name="unitId"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime
,string states, string personId, string unitId, Grid Grid1)
{
IQueryable<Model.View_Hazard_HazardRegisterList> getDataList = getDataLists;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(e => e.ProjectId == projectId);
}
if (!string.IsNullOrEmpty(checkMan))
{
getDataList = getDataList.Where(e => e.CheckManName.Contains(checkMan));
}
if (!string.IsNullOrEmpty(type))
{
getDataList = getDataList.Where(e => e.RegisterTypesName.Contains(type));
}
if (!string.IsNullOrEmpty(workAreaName))
{
getDataList = getDataList.Where(e => e.WorkAreaName.Contains(workAreaName));
}
if (!string.IsNullOrEmpty(responsibilityUnitName))
{
getDataList = getDataList.Where(e => e.ResponsibilityUnitName.Contains(responsibilityUnitName));
}
if (startTime.HasValue)
{
getDataList = getDataList.Where(e => e.CheckTime >= startTime);
}
if (endTime.HasValue)
{
getDataList = getDataList.Where(e => e.CheckTime <= endTime);
}
if (startRectificationTime.HasValue)
{
getDataList = getDataList.Where(e => e.RectificationTime >= startRectificationTime);
}
if (endRectificationTime.HasValue)
{
getDataList = getDataList.Where(e => e.RectificationTime <= endRectificationTime);
}
if (!string.IsNullOrEmpty(states) && states != Const._Null)
{
getDataList = getDataList.Where(e => e.States.Contains(states));
}
if (!CommonService.IsMainUnitOrAdmin(personId))
{
getDataList = getDataList.Where(e => e.ResponsibleUnit == unitId || e.SendUnitId == unitId);
}
count = getDataList.Count();
if (count == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
select new
{
x.HazardRegisterId,
x.CheckTime,
x.RegisterDef,
x.RegisterTypes2Name,
x.RegisterTypesName,
x.RegisterTypes3Name,
x.HazardValue,
x.RegisterTypes4Name,
x.WorkAreaName,
x.ResponsibilityUnitName,
x.ResponsibilityManName,
x.Rectification,
x.RectificationPeriod,
//x.CCManNames,
x.RectificationTime,
x.CheckManName,
x.RegisterDate,
x.StatesStr,
};
}
#endregion
/// <summary>
/// 根据危险观察登记主键获取危险观察登记信息
/// </summary>

122
SGGL/BLL/HSSE/License/LicenseManagerService.cs
View File

@ -1,4 +1,10 @@
using System;
using FineUIPro;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
namespace BLL
@ -10,6 +16,120 @@ namespace BLL
{
public static Model.SGGLDB db = Funs.DB;
#region 获取安全巡检列表信息
/// <summary>
/// 记录数
/// </summary>
public static int count
{
get;
set;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.License_LicenseManager> getDataLists = from x in db.License_LicenseManager
select x;
/// <summary>
///
/// </summary>
/// <param name="projetcId"></param>
/// <param name="checkMan"></param>
/// <param name="type"></param>
/// <param name="workAreaName"></param>
/// <param name="responsibilityUnitName"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="startRectificationTime"></param>
/// <param name="endRectificationTime"></param>
/// <param name="states"></param>
/// <param name="personId"></param>
/// <param name="unitId"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projectId, string unitId, DateTime? startTime, DateTime? endTime, string licenseType, string unitId2, Grid Grid1)
{
IQueryable<Model.License_LicenseManager> getDataList = getDataLists;
if (!string.IsNullOrEmpty(projectId))
{
getDataList = getDataList.Where(e => e.ProjectId == projectId);
}
if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId))
{
getDataList = getDataList.Where(e => e.UnitId == unitId);
}
if (startTime.HasValue)
{
getDataList = getDataList.Where(e => e.StartDate >= startTime);
}
if (endTime.HasValue)
{
getDataList = getDataList.Where(e => e.EndDate <= endTime);
}
if (!string.IsNullOrEmpty(licenseType))
{
getDataList = getDataList.Where(e => e.LicenseTypeId == licenseType);
}
if (!string.IsNullOrEmpty(unitId2) && unitId2 != Const._Null)
{
getDataList = getDataList.Where(e => e.UnitId == unitId2 );
}
count = getDataList.Count();
if (count == 0)
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
select new
{
x.LicenseManagerId,
x.LicenseManagerCode,
LicenseTypeName = db.Base_LicenseType.First(t => t.LicenseTypeId == x.LicenseTypeId).LicenseTypeName,
UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
x.CompileDate,
x.StartDate,
x.EndDate,
FlowOperateName = getFlow(x.LicenseManagerId, x.States),
};
}
public static string getFlow(string id,string states)
{
string strrValue = string.Empty;
string name = string.Empty;
var getFlow = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == id && x.IsClosed != true);
if (getFlow != null)
{
var getPerson = Funs.DB.Person_Persons.FirstOrDefault(x => x.PersonId == getFlow.OperaterId);
if (getPerson != null)
{
name = getPerson.PersonName;
}
}
if (states == BLL.Const.State_0 || string.IsNullOrEmpty(states))
{
strrValue = "待[" + name + "]提交";
}
else if (states == BLL.Const.State_1)
{
strrValue = "审核/审批完成";
} else
{
strrValue = "待[" + name + "]办理";
}
return strrValue;
}
#endregion
/// <summary>
/// 根据主键获取安全许可证
/// </summary>

4
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
View File

@ -119,9 +119,9 @@
SortField="RectificationPeriod" FieldType="Date" Renderer="Date" HeaderText="整改期限"
TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CCManNames" DataField="CCManNames"
<%-- <f:RenderField Width="120px" ColumnID="CCManNames" DataField="CCManNames"
FieldType="String" HeaderText="抄送" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
SortField="RectificationTime" HeaderText="整改时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>

140
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -57,76 +57,84 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </summary>
private void BindGrid()
{
string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim()))
{
strSql += " AND CheckManName LIKE @CheckMan";
listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
{
strSql += " AND RegisterTypesName LIKE @Type";
listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
{
strSql += " AND WorkAreaName LIKE @WorkAreaName";
listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%"));
}
//if (this.ckType.SelectedValue != "0")
//string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' ";
//List<SqlParameter> listStr = new List<SqlParameter>();
//if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// strSql += " AND CheckCycle=@CheckCycle";
// listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue));
// strSql += " AND ProjectId = @ProjectId";
// listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
//}
if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim()))
{
strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName";
listStr.Add(new SqlParameter("@ResponsibilityUnitName", "%" + this.txtResponsibilityUnitName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
{
strSql += " AND CheckTime >= @StartTime";
listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
strSql += " AND CheckTime <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
}
if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim()))
{
strSql += " AND RectificationTime >= @StartRectificationTime";
listStr.Add(new SqlParameter("@StartRectificationTime", this.txtStartRectificationTime.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql += " AND RectificationTime <= @EndRectificationTime";
listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim()));
}
if (this.drpStates.SelectedValue != BLL.Const._Null)
{
strSql += " AND States LIKE @States";
listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%"));
}
if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId))
{
strSql += " AND (ResponsibleUnit =@ResponsibleUnit OR SendUnitId=@SendUnitId)";
listStr.Add(new SqlParameter("@ResponsibleUnit", this.CurrUser.UnitId));
listStr.Add(new SqlParameter("@SendUnitId", this.CurrUser.UnitId));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
//if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim()))
//{
// strSql += " AND CheckManName LIKE @CheckMan";
// listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
//}
//if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
//{
// strSql += " AND RegisterTypesName LIKE @Type";
// listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
//}
//if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
//{
// strSql += " AND WorkAreaName LIKE @WorkAreaName";
// listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%"));
//}
////if (this.ckType.SelectedValue != "0")
////{
//// strSql += " AND CheckCycle=@CheckCycle";
//// listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue));
////}
//if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim()))
//{
// strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName";
// listStr.Add(new SqlParameter("@ResponsibilityUnitName", "%" + this.txtResponsibilityUnitName.Text.Trim() + "%"));
//}
//if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
//{
// strSql += " AND CheckTime >= @StartTime";
// listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
//}
//if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
//{
// strSql += " AND CheckTime <= @EndTime";
// listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
//}
//if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim()))
//{
// strSql += " AND RectificationTime >= @StartRectificationTime";
// listStr.Add(new SqlParameter("@StartRectificationTime", this.txtStartRectificationTime.Text.Trim()));
//}
//if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
//{
// strSql += " AND RectificationTime <= @EndRectificationTime";
// listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim()));
//}
//if (this.drpStates.SelectedValue != BLL.Const._Null)
//{
// strSql += " AND States LIKE @States";
// listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%"));
//}
//if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId))
//{
// strSql += " AND (ResponsibleUnit =@ResponsibleUnit OR SendUnitId=@SendUnitId)";
// listStr.Add(new SqlParameter("@ResponsibleUnit", this.CurrUser.UnitId));
// listStr.Add(new SqlParameter("@SendUnitId", this.CurrUser.UnitId));
//}
//SqlParameter[] parameter = listStr.ToArray();
//DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
//Grid1.RecordCount = tb.Rows.Count;
//var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
//Grid1.DataSource = table;
//Grid1.DataBind();
var getData = HSSE_Hazard_HazardRegisterService.getListData(this.CurrUser.LoginProjectId, this.txtCheckMan.Text.Trim(), this.txtType.Text.Trim(), this.txtWorkAreaName.Text.Trim(),
this.txtResponsibilityUnitName.Text.Trim(),Funs.GetNewDateTime(txtStartTime.Text.Trim()),Funs.GetNewDateTime(this.txtEndTime.Text.Trim()), Funs.GetNewDateTime(this.txtStartRectificationTime.Text.Trim()), Funs.GetNewDateTime(this.txtEndRectificationTime.Text.Trim()),
this.drpStates.SelectedValue, this.CurrUser.PersonId, this.CurrUser.UnitId, Grid1);
Grid1.RecordCount = HSSE_Hazard_HazardRegisterService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
}
#endregion

5
SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
View File

@ -30,7 +30,10 @@
<Items>
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存"
<f:Button ID="btnShow" Icon="ChartPie" runat="server" ToolTip="统计" Text="统计"
OnClick="btnShow_Click">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存"
OnClick="btnSave_Click">
</f:Button>
</Items>

43
SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
View File

@ -132,31 +132,36 @@ namespace FineUIPro.Web.JDGL.Check
{
errorInfos = string.Empty;
string Id = Request.Params["Id"];
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0");
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
}
}
protected void btnShow_Click(object sender, EventArgs e)
{
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0");
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
{
if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString()))
{
if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString()))
System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
cbIsMileStone.Visible = false;
foreach (GridColumn column in Grid1.Columns)
{
System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
cbIsMileStone.Visible = false;
foreach (GridColumn column in Grid1.Columns)
if (column.ColumnIndex != 0 && column.ColumnIndex != 1)
{
if (column.ColumnIndex != 0 && column.ColumnIndex != 1)
{
this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
}
this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
}
}
else
}
else
{
System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.Grid1.Rows[i].DataKeys[2].ToString());
if (workPackage != null && workPackage.IsMileStone == true)
{
System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.Grid1.Rows[i].DataKeys[2].ToString());
if (workPackage != null && workPackage.IsMileStone == true)
{
cbIsMileStone.Checked = true;
}
cbIsMileStone.Checked = true;
}
}
}

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

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

2
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
View File

@ -28,7 +28,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目情况" BoxFlex="1" AllowColumnLocking="true" ForceFit="true"
runat="server" EnableCollapse="true" DataKeyNames="Id,Name,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="false">
TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>

2
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.JDGL.Check
private void BindGrid()
{
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue);
var table = BLL.WorkPackageService.GetAllTreeDataTable2(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue);
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)

63
SGGL/FineUIPro.Web/common/Menu_DigData.xml
View File

@ -1,51 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
<TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
<TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
</TreeNode>
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
</TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
</TreeNode>
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@ -58,15 +16,12 @@
<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
</TreeNode>
</TreeNode>
</Tree>

13
SGGL/FineUIPro.Web/common/Menu_HTGL.xml
View File

@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
</TreeNode>
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
<TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
</TreeNode>
<TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
<TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
<TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
</TreeNode>
<TreeNode id="C18B4A2E-7BE7-43E6-A969-8A6292D19987" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx"></TreeNode>
<TreeNode id="0A5DF9F5-B6B5-41B8-8951-C203C5749495" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractStandingBook.aspx"></TreeNode>
<TreeNode id="8213BE20-2680-4A13-91B8-49028BB89869" Text="工程量清单" NavigateUrl=""><TreeNode id="326AA80C-6B01-4214-ACF2-B29595BA28D5" Text="土建工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=0"></TreeNode>
@ -16,10 +14,7 @@
<TreeNode id="0E04FA16-FFA6-4987-A0A5-A4658F0099F2" Text="工艺管道安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=2"></TreeNode>
<TreeNode id="FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40" Text="工艺设备安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=3"></TreeNode>
<TreeNode id="10586190-0FDD-4DA8-A877-CE4599D6F0DF" Text="非标设备现场制作安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=4"></TreeNode>
<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl=""><TreeNode id="3593DF22-78C1-4A73-8468-B20CB44D88C9" Text="电气工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1"></TreeNode>
<TreeNode id="3ECE6333-6785-424D-996E-B923A650D8C7" Text="仪表工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2"></TreeNode>
<TreeNode id="480F8C85-F5F2-4C5C-BE72-2ADABB7250CF" Text="电信工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3"></TreeNode>
</TreeNode>
<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5"></TreeNode>
<TreeNode id="92101A90-9C22-4B43-B012-9AFF8402F85D" Text="水暖安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6"></TreeNode>
<TreeNode id="33A03E2C-4E00-4722-AA14-F50419468154" Text="防腐绝热工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=7"></TreeNode>
<TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>

6
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
</TreeNode>
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
</Tree>

21
SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
View File

@ -17,20 +17,19 @@
<TreeNode id="dedaf6f6-af14-4e4e-9fc6-164aa808cab9" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractFile.aspx"></TreeNode>
<TreeNode id="9a772430-8a74-4d70-876d-136db8ce01a4" Text="文件归档" NavigateUrl="PHTGL/Filing/Files.aspx"></TreeNode>
</TreeNode>
<TreeNode id="7D8CF5B4-B945-4254-B134-4ABF55255497" Text="价格体系" NavigateUrl=""><TreeNode id="C8C719BC-450F-43AB-B17F-AB5DECD83E17" Text="土建工程" NavigateUrl=""></TreeNode>
<TreeNode id="BBA09E69-5017-411C-A516-64D0140AF70E" Text="钢结构预制工程" NavigateUrl=""></TreeNode>
<TreeNode id="999FCA97-E28A-46FA-9293-0399D1172AC9" Text="工艺管道安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="838ED633-B375-4937-A4E1-F95FCCF640A0" Text="工艺设备安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="AD5C7CBB-310D-4D15-9AFF-530BF765F460" Text="非标设备现场制作安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="0141B1F4-970A-4C23-B58A-BDF0785CA96E" Text="电仪安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="8A1D2885-2584-44AD-A4DD-ED3F98198C8A" Text="水暖安装工程" NavigateUrl=""></TreeNode>
<TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="防腐绝热工程" NavigateUrl=""></TreeNode>
<TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="无损检测工程" NavigateUrl=""></TreeNode>
<TreeNode id="2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B" Text="消防工程" NavigateUrl=""></TreeNode>
<TreeNode id="7D8CF5B4-B945-4254-B134-4ABF55255497" Text="价格体系" NavigateUrl=""><TreeNode id="C8C719BC-450F-43AB-B17F-AB5DECD83E17" Text="土建" NavigateUrl=""></TreeNode>
<TreeNode id="BBA09E69-5017-411C-A516-64D0140AF70E" Text="工艺" NavigateUrl=""></TreeNode>
<TreeNode id="999FCA97-E28A-46FA-9293-0399D1172AC9" Text="电气" NavigateUrl=""></TreeNode>
<TreeNode id="838ED633-B375-4937-A4E1-F95FCCF640A0" Text="仪表" NavigateUrl=""></TreeNode>
<TreeNode id="AD5C7CBB-310D-4D15-9AFF-530BF765F460" Text="给排水" NavigateUrl=""></TreeNode>
<TreeNode id="0141B1F4-970A-4C23-B58A-BDF0785CA96E" Text="暖通" NavigateUrl=""></TreeNode>
<TreeNode id="8A1D2885-2584-44AD-A4DD-ED3F98198C8A" Text="防腐保温" NavigateUrl=""></TreeNode>
<TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="消防电信" NavigateUrl=""></TreeNode>
<TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="临建设施" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="73B84D49-940A-42DF-AC14-F4C75E10EC39" Text="合同执行跟踪" NavigateUrl=""><TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
<TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
<TreeNode id="98269480-3F36-4169-A91D-16144D903C6C" Text="WBS工作包" NavigateUrl="PHTGL/ContractCompile/ContractWBS.aspx"></TreeNode>
<TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
<TreeNode id="F545E899-B3B5-4B49-A741-DE19356553D5" Text="进度检测" NavigateUrl="PHTGL/ContractCompile/ContractTrackProgressDetection.aspx"></TreeNode>
</TreeNode>
<TreeNode id="A9BBF623-83AC-4353-A010-07A5D4CEB7D1" Text="工效统计" NavigateUrl=""><TreeNode id="118B3E91-073B-468C-BDE3-DD6DCF6034C6" Text="日工效统计" NavigateUrl="PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx"></TreeNode>

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

@ -48,6 +48,43 @@
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""></TreeNode>
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
</TreeNode>
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
</TreeNode>
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>

733
SGGL/Model/Model.cs
View File

@ -6409,6 +6409,14 @@ namespace Model
}
}
public System.Data.Linq.Table<View_Hazard_HazardRegisterList> View_Hazard_HazardRegisterList
{
get
{
return this.GetTable<View_Hazard_HazardRegisterList>();
}
}
public System.Data.Linq.Table<View_HJGL_Batch_PointBatch> View_HJGL_Batch_PointBatch
{
get
@ -11763,7 +11771,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
public string ApproveIdea
{
get
@ -39519,10 +39527,10 @@ namespace Model
private string _SaveHandleMan;
private string _WorkPackageId;
private string _WorkPackageName;
private string _WorkPackageId;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Person_Persons> _Person_Persons;
@ -39579,10 +39587,10 @@ namespace Model
partial void OnProposeUnitIdChanged();
partial void OnSaveHandleManChanging(string value);
partial void OnSaveHandleManChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion
public Check_CheckControl()
@ -40061,26 +40069,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName
{
@ -40101,6 +40089,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -100751,10 +100759,10 @@ namespace Model
private string _HazardValue;
private string _WorkPackageId;
private string _WorkPackageName;
private string _WorkPackageId;
private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@ -100855,10 +100863,10 @@ namespace Model
partial void OnRegisterTypes4IdChanged();
partial void OnHazardValueChanging(string value);
partial void OnHazardValueChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion
public HSSE_Hazard_HazardRegister()
@ -101796,26 +101804,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName
{
@ -101836,6 +101824,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@ -151245,7 +151253,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
public string AttentPerson
{
get
@ -182768,7 +182776,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@ -268078,6 +268086,465 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Hazard_HazardRegisterList")]
public partial class View_Hazard_HazardRegisterList
{
private string _ProjectId;
private string _HazardRegisterId;
private string _ResponsibleUnit;
private System.Nullable<System.DateTime> _CheckTime;
private string _ProblemTypes;
private string _CheckManName;
private string _RegisterTypesName;
private string _WorkAreaName;
private string _ResponsibilityUnitName;
private System.Nullable<System.DateTime> _RectificationTime;
private string _States;
private string _RegisterDef;
private string _HazardValue;
private string _RegisterTypes2Id;
private string _RegisterTypes2Name;
private string _RegisterTypes3Id;
private string _RegisterTypes3Name;
private string _RegisterTypes4Id;
private string _RegisterTypes4Name;
private string _ResponsibilityManName;
private string _SendUnitId;
private string _Rectification;
private System.Nullable<System.DateTime> _RectificationPeriod;
private System.Nullable<System.DateTime> _RegisterDate;
private string _StatesStr;
public View_Hazard_HazardRegisterList()
{
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this._ProjectId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardRegisterId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string HazardRegisterId
{
get
{
return this._HazardRegisterId;
}
set
{
if ((this._HazardRegisterId != value))
{
this._HazardRegisterId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
public string ResponsibleUnit
{
get
{
return this._ResponsibleUnit;
}
set
{
if ((this._ResponsibleUnit != value))
{
this._ResponsibleUnit = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckTime", DbType="DateTime")]
public System.Nullable<System.DateTime> CheckTime
{
get
{
return this._CheckTime;
}
set
{
if ((this._CheckTime != value))
{
this._CheckTime = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemTypes", DbType="Char(1)")]
public string ProblemTypes
{
get
{
return this._ProblemTypes;
}
set
{
if ((this._ProblemTypes != value))
{
this._ProblemTypes = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckManName", DbType="NVarChar(200)")]
public string CheckManName
{
get
{
return this._CheckManName;
}
set
{
if ((this._CheckManName != value))
{
this._CheckManName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypesName", DbType="NVarChar(200)")]
public string RegisterTypesName
{
get
{
return this._RegisterTypesName;
}
set
{
if ((this._RegisterTypesName != value))
{
this._RegisterTypesName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(30) NOT NULL", CanBeNull=false)]
public string WorkAreaName
{
get
{
return this._WorkAreaName;
}
set
{
if ((this._WorkAreaName != value))
{
this._WorkAreaName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityUnitName", DbType="NVarChar(200)")]
public string ResponsibilityUnitName
{
get
{
return this._ResponsibilityUnitName;
}
set
{
if ((this._ResponsibilityUnitName != value))
{
this._ResponsibilityUnitName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationTime", DbType="DateTime")]
public System.Nullable<System.DateTime> RectificationTime
{
get
{
return this._RectificationTime;
}
set
{
if ((this._RectificationTime != value))
{
this._RectificationTime = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="states", Storage="_States", DbType="Char(1)")]
public string States
{
get
{
return this._States;
}
set
{
if ((this._States != value))
{
this._States = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDef", DbType="NVarChar(500)")]
public string RegisterDef
{
get
{
return this._RegisterDef;
}
set
{
if ((this._RegisterDef != value))
{
this._RegisterDef = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardValue", DbType="NVarChar(50)")]
public string HazardValue
{
get
{
return this._HazardValue;
}
set
{
if ((this._HazardValue != value))
{
this._HazardValue = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes2Id", DbType="NVarChar(50)")]
public string RegisterTypes2Id
{
get
{
return this._RegisterTypes2Id;
}
set
{
if ((this._RegisterTypes2Id != value))
{
this._RegisterTypes2Id = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes2Name", DbType="NVarChar(200)")]
public string RegisterTypes2Name
{
get
{
return this._RegisterTypes2Name;
}
set
{
if ((this._RegisterTypes2Name != value))
{
this._RegisterTypes2Name = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes3Id", DbType="NVarChar(50)")]
public string RegisterTypes3Id
{
get
{
return this._RegisterTypes3Id;
}
set
{
if ((this._RegisterTypes3Id != value))
{
this._RegisterTypes3Id = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes3Name", DbType="NVarChar(200)")]
public string RegisterTypes3Name
{
get
{
return this._RegisterTypes3Name;
}
set
{
if ((this._RegisterTypes3Name != value))
{
this._RegisterTypes3Name = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes4Id", DbType="NVarChar(50)")]
public string RegisterTypes4Id
{
get
{
return this._RegisterTypes4Id;
}
set
{
if ((this._RegisterTypes4Id != value))
{
this._RegisterTypes4Id = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes4Name", DbType="NVarChar(200)")]
public string RegisterTypes4Name
{
get
{
return this._RegisterTypes4Name;
}
set
{
if ((this._RegisterTypes4Name != value))
{
this._RegisterTypes4Name = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityManName", DbType="NVarChar(200)")]
public string ResponsibilityManName
{
get
{
return this._ResponsibilityManName;
}
set
{
if ((this._ResponsibilityManName != value))
{
this._ResponsibilityManName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnitId", DbType="NVarChar(50)")]
public string SendUnitId
{
get
{
return this._SendUnitId;
}
set
{
if ((this._SendUnitId != value))
{
this._SendUnitId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
public string Rectification
{
get
{
return this._Rectification;
}
set
{
if ((this._Rectification != value))
{
this._Rectification = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationPeriod", DbType="DateTime")]
public System.Nullable<System.DateTime> RectificationPeriod
{
get
{
return this._RectificationPeriod;
}
set
{
if ((this._RectificationPeriod != value))
{
this._RectificationPeriod = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")]
public System.Nullable<System.DateTime> RegisterDate
{
get
{
return this._RegisterDate;
}
set
{
if ((this._RegisterDate != value))
{
this._RegisterDate = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StatesStr", DbType="VarChar(6) NOT NULL", CanBeNull=false)]
public string StatesStr
{
get
{
return this._StatesStr;
}
set
{
if ((this._StatesStr != value))
{
this._StatesStr = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_Batch_PointBatch")]
public partial class View_HJGL_Batch_PointBatch
{
@ -292526,6 +292993,24 @@ namespace Model
private string _WBSCode;
private System.Nullable<decimal> _JDWeights;
private string _Unit;
private System.Nullable<decimal> _PlanProjectQuantity;
private System.Nullable<decimal> _RealProjectQuantity;
private System.Nullable<System.DateTime> _RealStartDate;
private System.Nullable<bool> _IsMileStone;
private System.Nullable<decimal> _PlanCost;
private string _PreWorkCode;
private string _ShowId;
private string _ProjectId;
public View_WBS()
@ -292580,7 +293065,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
@ -292676,6 +293161,150 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JDWeights", DbType="Decimal(9,2)")]
public System.Nullable<decimal> JDWeights
{
get
{
return this._JDWeights;
}
set
{
if ((this._JDWeights != value))
{
this._JDWeights = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")]
public string Unit
{
get
{
return this._Unit;
}
set
{
if ((this._Unit != value))
{
this._Unit = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanProjectQuantity", DbType="Decimal(18,2)")]
public System.Nullable<decimal> PlanProjectQuantity
{
get
{
return this._PlanProjectQuantity;
}
set
{
if ((this._PlanProjectQuantity != value))
{
this._PlanProjectQuantity = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealProjectQuantity", DbType="Decimal(18,2)")]
public System.Nullable<decimal> RealProjectQuantity
{
get
{
return this._RealProjectQuantity;
}
set
{
if ((this._RealProjectQuantity != value))
{
this._RealProjectQuantity = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealStartDate", DbType="DateTime")]
public System.Nullable<System.DateTime> RealStartDate
{
get
{
return this._RealStartDate;
}
set
{
if ((this._RealStartDate != value))
{
this._RealStartDate = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMileStone", DbType="Bit")]
public System.Nullable<bool> IsMileStone
{
get
{
return this._IsMileStone;
}
set
{
if ((this._IsMileStone != value))
{
this._IsMileStone = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(18,2)")]
public System.Nullable<decimal> PlanCost
{
get
{
return this._PlanCost;
}
set
{
if ((this._PlanCost != value))
{
this._PlanCost = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PreWorkCode", DbType="NVarChar(50)")]
public string PreWorkCode
{
get
{
return this._PreWorkCode;
}
set
{
if ((this._PreWorkCode != value))
{
this._PreWorkCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShowId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string ShowId
{
get
{
return this._ShowId;
}
set
{
if ((this._ShowId != value))
{
this._ShowId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{