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

修改进度与合同

Browse Source
This commit is contained in:
高飞
2023-09-05 09:52:43 +08:00
parent b238b27726 720c747c78
commit 8535b39621
27 changed files with 1234 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin/v17/.wsuo
BIN
View File
Binary file not shown.
DataBase/版本日志/SGGLDB_V2023-09-04.sql
+60
View File
@@ -0,0 +1,60 @@
ALTER TABLE WBS_ControlItemAndCycle ADD WorkPackageIds NVARCHAR(2000) NULL
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'WBS所有父级节点字符串ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_ControlItemAndCycle', @level2type=N'COLUMN',@level2name=N'WorkPackageIds'
GO
ALTER VIEW [dbo].[View_WBS_WorkPackageDetail]
AS
/********控制项明细********/
SELECT detail.WorkPackageDetailId,
detail.WorkPackageId,
detail.Months,
c.InitWorkPackageCode,
c.WorkPackageCode,
c.PackageContent,
c.ProjectId,
c.Unit, --单位
c.PlanProjectQuantity, --概算工作量
c.RealProjectQuantity, --实际工程量
c.PlanCost, --节点计划总费用
CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from WBS_WorkPackageDetail
where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalPlanNum, --累计计划完成量
CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from WBS_WorkPackageDetail
where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalThisNum, --累计完成量
CONVERT(FLOAT,(select sum(ISNULL(PlanValue,0)) from WBS_WorkPackageDetail
where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalPlanValue, --累计概算费用
CONVERT(FLOAT,(select sum(ISNULL(ThisValue,0)) from WBS_WorkPackageDetail
where WorkPackageId=detail.WorkPackageId and Months<=detail.Months)) as TotalThisValue, --累计实际费用
CONVERT(FLOAT,ISNULL(detail.PlanNum,0)) as PlanNum, --本月计划完成量
CONVERT(FLOAT,ISNULL(detail.ThisNum,0)) as ThisNum, --本月完成量
CONVERT(FLOAT,ISNULL(detail.PlanValue,0)) as PlanValue, --本月概算费用
CONVERT(FLOAT,ISNULL(detail.ThisValue,0)) as ThisValue --本月实际费用
FROM dbo.WBS_WorkPackageDetail AS detail
LEFT JOIN WBS_WorkPackage AS c ON c.WorkPackageId=detail.WorkPackageId
GO
ALTER VIEW [dbo].[View_WBS_WorkPackageParentDetail]
AS
/********控制项父级明细********/
SELECT detail.WorkPackageParentDetailId,
detail.ParentId,
detail.ProjectId,
detail.Months,
c.InitWorkPackageCode,
c.PlanCost, --节点计划总费用
CONVERT(FLOAT,ISNULL(detail.PlanNum,0)) as PlanNum, --本月计划完成量
CONVERT(FLOAT,ISNULL(detail.ThisNum,0)) as ThisNum, --本月实际完成量
CONVERT(FLOAT,ISNULL(detail.PlanValue,0)) as PlanValue, --本月概算费用
CONVERT(FLOAT,ISNULL(detail.ThisValue,0)) as ThisValue, --本月实际费用
CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalPlanNum, --累计计划完成量
CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalThisNum, --累计完成量
CONVERT(FLOAT,(select sum(ISNULL(PlanValue,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalPlanValue, --累计概算费用
CONVERT(FLOAT,(select sum(ISNULL(ThisValue,0)) from WBS_WorkPackageParentDetail
where ParentId=detail.ParentId and Months<=detail.Months)) as TotalThisValue --累计实际费用
FROM dbo.WBS_WorkPackageParentDetail AS detail
LEFT JOIN WBS_WorkPackage AS c ON c.WorkPackageId=detail.ParentId
GO
SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs
+4 -4
View File
@@ -41,7 +41,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId;
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@@ -59,7 +59,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId;
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@@ -82,7 +82,7 @@ namespace BLL
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@@ -337,7 +337,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
if (!string.IsNullOrEmpty(SpotCheckDetail.ControlItemAndCycleId))
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(null, SpotCheckDetail.ControlItemAndCycleId);
if (SpotCheckDetail.IsOnesOK.HasValue)
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
if (SpotCheckDetail.IsOK.HasValue)
SGGL/BLL/CQMS/WBS/ControlItemAndCycleService.cs
+1
View File
@@ -49,6 +49,7 @@ namespace BLL
newControlItemAndCycle.ControlItemAndCycleId = ControlItemAndCycle.ControlItemAndCycleId;
newControlItemAndCycle.ControlItemAndCycleCode = ControlItemAndCycle.ControlItemAndCycleCode;
newControlItemAndCycle.WorkPackageId = ControlItemAndCycle.WorkPackageId;
newControlItemAndCycle.WorkPackageIds = WorkPackageService.getWorkPageIdsByControlItemAndCycle(ControlItemAndCycle.WorkPackageId, ControlItemAndCycle.ControlItemAndCycleId);
newControlItemAndCycle.ProjectId = ControlItemAndCycle.ProjectId;
newControlItemAndCycle.ControlItemContent = ControlItemAndCycle.ControlItemContent;
newControlItemAndCycle.ControlPoint = ControlItemAndCycle.ControlPoint;
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+16 -5
View File
@@ -689,17 +689,28 @@ namespace BLL
/// </summary>
/// <param name="controlItemAndCycleId"></param>
/// <returns></returns>
public static string getWorkPageIdsByControlItemAndCycle(string controlItemAndCycleId)
public static string getWorkPageIdsByControlItemAndCycle(string workPackageId, string controlItemAndCycleId)
{
string returnValues = string.Empty;
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
if (getControlItemAndCycle != null)
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getControlItemAndCycle.WorkPackageId);
if (getWorkPackage != null)
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
if (getControlItemAndCycle != null)
{
workPackageId = getControlItemAndCycle.WorkPackageId;
}
}
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPackageId);
if (getWorkPackage != null)
{
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.WorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]$" + controlItemAndCycleId);
}
else
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.WorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]");
}
}
return returnValues;
SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
+239 -1
View File
@@ -1,5 +1,13 @@
using System;
using Microsoft.SqlServer.Dts.Runtime;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Windows.Media.Animation;
using System.Windows;
using Model;
namespace BLL
{
@@ -84,6 +92,236 @@ namespace BLL
db.HJGL_Batch_PointBatch.DeleteOnSubmit(batch);
db.SubmitChanges();
}
/// <summary>
/// 根据焊口id删除批信息
/// </summary>
/// <param name="weldJointId"></param>
public static void DeleteBatchByWeldJointId(string weldJointId)
{
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
if (newWeldJoint != null )
{
var isTrust = from x in Funs.DB.HJGL_Batch_BatchTrustItem
where x.WeldJointId == weldJointId
select x; ;
if (!isTrust.Any())
{
var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x;
string pointBatchId = pointBatchItems.FirstOrDefault()?.PointBatchId;
// 删除焊口所在批明细信息
BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId);
// 删除批信息
var batch = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.PointBatchId == pointBatchId select x;
if (!string .IsNullOrEmpty(pointBatchId) && !batch.Any())
{
DeleteBatch(pointBatchId);
}
//BLL.Batch_NDEItemService.DeleteAllNDEInfoToWeldJoint(item.WeldJointId);
}
else
{
// errlog += "焊口【" + newWeldJoint.WeldJointCode + "】已进委托单了，不能删除。";
}
}
}
/// <summary>
/// 根据焊口id组批
/// </summary>
public static string AddBatchByWeldJointId(string weldJointId, DateTime? weldingDate, string batchCondition)
{
string errlog = string.Empty;
string[] condition = batchCondition.Split('|');
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId);
var project = BLL.ProjectService.GetProjectByProjectId(pipeline.ProjectId);
var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId);
var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId);
var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(pipeline.DetectionType);
var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId);
if (newWeldJoint != null)
{
bool isPass = true;
foreach (string c in condition)
{
if (c == "1")
{
if (string.IsNullOrEmpty(pipeline.UnitWorkId))
{
isPass = false;
break;
}
}
if (c == "2")
{
if (string.IsNullOrEmpty(pipeline.UnitId))
{
isPass = false;
break;
}
}
if (c == "3")
{
if (string.IsNullOrEmpty(newWeldJoint.DetectionTypeId))
{
isPass = false;
break;
}
}
if (c == "4")
{
if (string.IsNullOrEmpty(pipeline.DetectionRateId))
{
isPass = false;
break;
}
}
if (c == "5")
{
if (string.IsNullOrEmpty(pipeline.PipingClassId))
{
isPass = false;
break;
}
}
// 6是管线，7是焊工都不可能为空，这里就不判断了
}
if (isPass)
{
string strSql = @"SELECT PointBatchId FROM dbo.HJGL_Batch_PointBatch
WHERE (EndDate IS NULL OR EndDate ='')
AND ProjectId = @ProjectId
AND UnitWorkId = @UnitWorkId AND UnitId =@UnitId
AND DetectionTypeId =@DetectionTypeId
AND DetectionRateId =@DetectionRateId";
List<SqlParameter> listStr = new List<SqlParameter>
{
new SqlParameter("@ProjectId", project.ProjectId),
new SqlParameter("@UnitWorkId", pipeline.UnitWorkId),
new SqlParameter("@UnitId", pipeline.UnitId),
new SqlParameter("@DetectionTypeId", pipeline.DetectionType),
new SqlParameter("@DetectionRateId", pipeline.DetectionRateId)
};
// 5,6,7项为可选项
if (condition.Contains("5"))
{
strSql += " AND PipingClassId =@PipingClassId";
listStr.Add(new SqlParameter("@PipingClassId", pipeline.PipingClassId));
}
if (condition.Contains("6"))
{
strSql += " AND PipelineId =@PipelineId";
listStr.Add(new SqlParameter("@PipelineId", newWeldJoint.PipelineId));
}
if (condition.Contains("7"))
{
strSql += " AND WelderId =@WelderId";
listStr.Add(new SqlParameter("@WelderId", newWeldJoint.CoverWelderId));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable batchInfo = SQLHelper.GetDataTableRunText(strSql, parameter);
string batchId = string.Empty;
if (batchInfo.Rows.Count == 0)
{
Model.HJGL_Batch_PointBatch batch = new Model.HJGL_Batch_PointBatch();
batch.PointBatchId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_PointBatch));
batchId = batch.PointBatchId;
string perfix = project.ProjectCode + "-" + unitWork.UnitWorkCode + "-GD-DK-" + ndt.DetectionTypeCode + "-" + ndtr.DetectionRateValue.ToString() + "%-";
batch.PointBatchCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_Batch_PointBatch", "PointBatchCode", project.ProjectId, perfix);
batch.ProjectId = project.ProjectId;
batch.UnitWorkId = pipeline.UnitWorkId;
batch.BatchCondition = batchCondition;
batch.UnitId = pipeline.UnitId;
batch.DetectionTypeId = pipeline.DetectionType;
batch.DetectionRateId = pipeline.DetectionRateId;
if (condition.Contains("5"))
{
batch.PipingClassId = pipeline.PipingClassId;
}
if (condition.Contains("6"))
{
batch.PipelineId = newWeldJoint.PipelineId;
if (pipeline.PipeArea == PipelineService.PipeArea_FIELD)
{
perfix += "XC-";
batch.PointBatchCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_Batch_PointBatch", "PointBatchCode", project.ProjectId, perfix);
}
else if (pipeline.PipeArea == PipelineService.PipeArea_SHOP)
{
perfix += "GC-";
batch.PointBatchCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode4ByProjectId", "dbo.HJGL_Batch_PointBatch", "PointBatchCode", project.ProjectId, perfix);
}
}
if (condition.Contains("7"))
{
batch.WelderId = newWeldJoint.CoverWelderId;
}
batch.StartDate = DateTime.Now;
BLL.PointBatchService.AddPointBatch(batch);
}
else
{
batchId = batchInfo.Rows[0][0].ToString();
}
var b = BLL.PointBatchDetailService.GetBatchDetailByJotId(weldJointId);
if (b == null)
{
try
{
Model.HJGL_Batch_PointBatchItem batchDetail = new Model.HJGL_Batch_PointBatchItem();
string pointBatchItemId = SQLHelper.GetNewID(typeof(Model.HJGL_Batch_PointBatchItem));
batchDetail.PointBatchItemId = pointBatchItemId;
batchDetail.PointBatchId = batchId;
batchDetail.WeldJointId = weldJointId;
batchDetail.WeldingDate = weldingDate;
batchDetail.CreatDate = DateTime.Now;
BLL.Funs.DB.HJGL_Batch_PointBatchItem.InsertOnSubmit(batchDetail);
BLL.Funs.DB.SubmitChanges();
/*// 焊工首道口RT必点
var joints = from x in Funs.DB.HJGL_Batch_PointBatchItem
join y in Funs.DB.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId
join z in Funs.DB.Base_DetectionType on y.DetectionTypeId equals z.DetectionTypeId
join j in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals j.WeldJointId
where z.DetectionTypeCode == "RT"
&& j.CoverWelderId == newWeldJoint.CoverWelderId
select x;
if (joints.Count() <= 1)
{
BLL.PointBatchDetailService.UpdatePointBatchDetail(pointBatchItemId, "1", System.DateTime.Now);
BLL.PointBatchDetailService.UpdateWelderFirst(pointBatchItemId, true);
}*/
}
catch
{
}
}
}
else
{
errlog += "焊口【" + newWeldJoint.WeldJointCode + "】组批条件不能为空。";
}
}
return errlog;
}
}
}
SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
+5 -1
View File
@@ -44,7 +44,9 @@ namespace BLL
CompileMan = accidentPersonRecord.CompileMan,
CompileDate = accidentPersonRecord.CompileDate,
IsAttempt = accidentPersonRecord.IsAttempt,
States = accidentPersonRecord.States
States = accidentPersonRecord.States,
WorkPackageName = accidentPersonRecord.WorkPackageName,
WorkPackageId = accidentPersonRecord.WorkPackageId,
};
db.Accident_AccidentPersonRecord.InsertOnSubmit(newAccidentPersonRecord);
db.SubmitChanges();
@@ -76,6 +78,8 @@ namespace BLL
newAccidentPersonRecord.CompileDate = accidentPersonRecord.CompileDate;
newAccidentPersonRecord.IsAttempt = accidentPersonRecord.IsAttempt;
newAccidentPersonRecord.States = accidentPersonRecord.States;
newAccidentPersonRecord.WorkPackageName = accidentPersonRecord.WorkPackageName;
newAccidentPersonRecord.WorkPackageId = accidentPersonRecord.WorkPackageId;
db.SubmitChanges();
}
}
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx
+65 -12
View File
@@ -38,8 +38,8 @@
<f:CheckItem Value="LW" Text="劳务数据" />
</f:CheckBoxList>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server">
</f:Button>
<%-- <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server">
</f:Button>--%>
</Items>
</f:Toolbar>
</Toolbars>
@@ -53,15 +53,19 @@
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbExpertArgument" runat="server" Label="危大工程数量">
</f:Label>
<f:Label ID="lbAccident" runat="server" Label="安全事故数量">
</f:Label>
<f:Label ID="Label3" runat="server" Label="安全巡检问题总数">
</f:Label>
</Items>
</f:FormRow>
</Rows>
@@ -69,19 +73,33 @@
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="150px" AutoScroll="true">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbSpotCheck1" runat="server" Label="实体验收共检项数">
<%-- <f:Label ID="lbSpotCheck1" runat="server" Label="实体验收共检项数">
</f:Label>
<f:Label ID="lbSpotCheck2" runat="server" Label="实体验收共检一次合格数">
</f:Label>--%>
<f:Label ID="lbSpotCheckRate" runat="server" Label="实体验收一次合格率">
</f:Label>
<f:Label ID="lbSpotCheck" runat="server" Label="实体验收一次合格率">
<f:Label ID="lbSpotCheckDataRate" runat="server" Label="施工资料同步率">
</f:Label>
<f:Label ID="Label2" runat="server" Label="质量问题数">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lbSpotCheckOkRate" runat="server" Label="质量验收问题整改率" Hidden="true">
</f:Label>
<f:Label ID="lbControlItemRate" runat="server" Label="控制点完成率" Hidden="true">
</f:Label>
<f:Label ID="Label1" runat="server" Label="质量检查问题整改率" Hidden="true">
</f:Label>
</Items>
</f:FormRow>
</Rows>
@@ -89,18 +107,53 @@
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbJDRate" runat="server" Label="项目进度完成百分比" Hidden="true">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHTGL" Title="合同数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="Form4" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="Label4" runat="server" Label="合同签约价" Hidden="true">
</f:Label>
<f:Label ID="Label6" runat="server" Label="工程量清单库" Hidden="true">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpLW" Title="劳务数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="Form5" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="Label5" runat="server" Label="" LabelWidth="180px">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
</Items>
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs
+94 -10
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DigData
////权限按钮方法
// this.ucTree.WorkPackageCode = this.WorkPackageCode;
this.ucTree.ProjectId = this.ProjectId;
this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBSPackage.aspx") + "return false;";
//this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBSPackage.aspx") + "return false;";
}
}
@@ -105,29 +105,113 @@ namespace FineUIPro.Web.DigData
this.gpHSSE.Hidden = false;
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
this.lbAccident.Text = (from x in Funs.DB.Accident_AccidentPersonRecord
where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& x.States == Const.State_2
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
var getDetail = from x in Funs.DB.Check_SpotCheckDetail
//// 实体验收 资料验收
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
&& y.State == "8"
select x;
int all = getDetail.Count();
this.lbSpotCheck1.Text = all.ToString();
int all = getSpotCheckDetail.Count();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格
// this.lbSpotCheck2.Text= okCount.ToString();
int okCount = getDetail.Where(x => x.IsOK == true).Count();
this.lbSpotCheck2.Text= okCount.ToString();
this.lbSpotCheckRate.Text= all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString()+"%" : "0%";
this.lbSpotCheck.Text= all > 0 ? Math.Round(okCount * 1.0 / (all * 1.0)).ToString() : "0";
/// 资料验收合格项目
var getOKSpotCheckDetail = getSpotCheckDetail.Where(x => x.IsOK == true);
int okYSCount = getOKSpotCheckDetail.Count(); //验收合格
int okDateCount = getSpotCheckDetail.Where(x => x.IsDataOK == "1").Count(); //资料合格
this.lbSpotCheckDataRate.Text = okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
///实体质量问题整改率
//int allNoOk = all - onesOKCount; ///问题数
//int oKCount = getSpotCheckDetail.Where(x => x.IsOK == true).Count(); //合格数
//int zgCount = oKCount - onesOKCount; ///整改数
//this.lbSpotCheckOkRate.Text = allNoOk > 0 ? Math.Round(zgCount * 100.0 / (allNoOk * 1.0)).ToString() + "%" : "0%";
////控制点
//var getControlItemAndCycle=from x in Funs.DB.WBS_ControlItemAndCycle
// where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
// && (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
// && x.ControlPoint.Contains("A") && x.CheckNum >0
// select x;
/////A级控制点总量
//int allControlItemCount = getControlItemAndCycle.Count();
/////已完成A级控制点数
//var getOKSpotCheckDetailCheckNum = from x in getOKSpotCheckDetail
// group x by x.ControlItemAndCycleId
// into g select new { g.First().ControlItemAndCycleId, num = g.Count() };
//var getOKControlItemAndCycle = from x in getControlItemAndCycle
// join y in getOKSpotCheckDetailCheckNum on x.ControlItemAndCycleId equals y.ControlItemAndCycleId
// where x.CheckNum == y.num
// select x;
//int okControlItemCount= getOKControlItemAndCycle.Count();
//this.lbControlItemRate.Text = allControlItemCount > 0 ? Math.Round(okControlItemCount * 100.0 / (allControlItemCount * 1.0)).ToString() + "%" : "0%";
}
if (item == "JDGL")
{
this.gpJDGL.Hidden = false;
//double totalSJCost = 0; ////累计实际费用
//decimal totalPlanCost = 0; ////计划费用
//var getWorkPackageDetail = Funs.DB.WBS_WorkPackageDetail.FirstOrDefault(x => x.WorkPackageId == workPackageId);
//if (getWorkPackageDetail != null)
//{
// ///末级节点
// var getMaxSJCost = Funs.DB.View_WBS_WorkPackageDetail.Where(x => x.WorkPackageId == workPackageId).OrderByDescending(x => x.Months).FirstOrDefault();
// if (getMaxSJCost != null)
// {
// totalSJCost = getMaxSJCost.TotalThisValue ?? 0;
// totalPlanCost = getMaxSJCost.PlanCost ?? 0;
// }
//}
//else
//{
// ///非末级节点
// var getMaxSJCost = Funs.DB.View_WBS_WorkPackageParentDetail.Where(x =>x.ProjectId == this.ProjectId
// && x.ParentId == workPackageId).OrderByDescending(x => x.Months).FirstOrDefault();
// if (getMaxSJCost != null)
// {
// totalSJCost = getMaxSJCost.TotalThisValue ?? 0;
// totalPlanCost = getMaxSJCost.PlanCost ?? 0;
// }
//}
////// 根 节点 建筑工程 安装工程
//if (workPackageId == "1" || workPackageId == "2")
//{
// var getUnitWorkByType = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.ProjectId && x.ProjectType == workPackageId select x;
// if (getUnitWorkByType.Count() > 0)
// {
// totalPlanCost = getUnitWorkByType.Sum(x => x.PlanCost ?? 0);
// }
//}
//var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.UnitWorkId == workPackageId);
//if (getUnitWork != null)
//{
// totalPlanCost= getUnitWork.PlanCost ?? 0;
//}
/////项目进度完成百分比
//decimal s = Convert.ToDecimal(totalSJCost);
//this.lbJDRate.Text = totalPlanCost > 0 ? Math.Round(s / totalPlanCost).ToString() + "%" : "0%";
}
if (item == "HTGL")
{
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs
Generated
+114 -15
View File
@@ -104,15 +104,6 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// Panel_CurrentApproval 控件。
/// </summary>
@@ -158,6 +149,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.Label lbExpertArgument;
/// <summary>
/// lbAccident 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbAccident;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// gpCQMS 控件。
/// </summary>
@@ -177,31 +186,58 @@ namespace FineUIPro.Web.DigData
protected global::FineUIPro.Form Form2;
/// <summary>
/// lbSpotCheck1 控件。
/// lbSpotCheckRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck1;
protected global::FineUIPro.Label lbSpotCheckRate;
/// <summary>
/// lbSpotCheck2 控件。
/// lbSpotCheckDataRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck2;
protected global::FineUIPro.Label lbSpotCheckDataRate;
/// <summary>
/// lbSpotCheck 控件。
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck;
protected global::FineUIPro.Label Label2;
/// <summary>
/// lbSpotCheckOkRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheckOkRate;
/// <summary>
/// lbControlItemRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbControlItemRate;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// gpJDGL 控件。
@@ -212,6 +248,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpJDGL;
/// <summary>
/// Form3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// lbJDRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbJDRate;
/// <summary>
/// gpHTGL 控件。
/// </summary>
@@ -221,6 +275,33 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpHTGL;
/// <summary>
/// Form4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form4;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// Label6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
/// <summary>
/// gpLW 控件。
/// </summary>
@@ -230,6 +311,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpLW;
/// <summary>
/// Form5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form5;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
/// <summary>
/// Window1 控件。
/// </summary>
SGGL/FineUIPro.Web/DigData/WBSDW.aspx
+65 -12
View File
@@ -50,16 +50,20 @@
</f:RadioButtonList>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
<f:GroupPanel runat="server" ID="gpHSSE" Title="安全数据" Layout="VBox" Hidden="true"
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbExpertArgument" runat="server" Label="危大工程数量">
</f:Label>
<f:Label ID="lbAccident" runat="server" Label="安全事故数量">
</f:Label>
<f:Label ID="Label3" runat="server" Label="安全巡检问题总数">
</f:Label>
</Items>
</f:FormRow>
</Rows>
@@ -67,18 +71,32 @@
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpCQMS" Title="质量数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="150px" AutoScroll="true">
<Items>
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" EnableTableStyle="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="120px">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbSpotCheck1" runat="server" Label="实体验收共检项数">
<%-- <f:Label ID="lbSpotCheck1" runat="server" Label="实体验收共检项数">
</f:Label>
<f:Label ID="lbSpotCheck2" runat="server" Label="实体验收共检一次合格数">
</f:Label>--%>
<f:Label ID="lbSpotCheckRate" runat="server" Label="实体验收一次合格率">
</f:Label>
<f:Label ID="lbSpotCheck" runat="server" Label="实体验收一次合格率">
<f:Label ID="lbSpotCheckDataRate" runat="server" Label="施工资料同步率">
</f:Label>
<f:Label ID="Label2" runat="server" Label="质量问题数">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lbControlItemRate" runat="server" Label="控制点完成率">
</f:Label>
<f:Label ID="Label1" runat="server" Label="质量检查问题整改率">
</f:Label>
<f:Label ID="lbSpotCheckOkRate" runat="server" Label="质量验收问题整改率">
</f:Label>
</Items>
</f:FormRow>
@@ -87,18 +105,53 @@
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpJDGL" Title="进度数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbJDRate" runat="server" Label="项目进度完成百分比" Hidden="true">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpHTGL" Title="合同数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="Form4" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="Label4" runat="server" Label="合同签约价" Hidden="true">
</f:Label>
<f:Label ID="Label6" runat="server" Label="工程量清单库" Hidden="true">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
<f:GroupPanel runat="server" ID="gpLW" Title="劳务数据" Layout="VBox" Hidden="true"
Height="300px" AutoScroll="true">
Height="100px" AutoScroll="true">
<Items>
<f:Form ID="Form5" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="180px">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="Label5" runat="server" Label="" LabelWidth="180px">
</f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:GroupPanel>
</Items>
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.cs
+82 -8
View File
@@ -87,28 +87,102 @@ namespace FineUIPro.Web.DigData
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
this.lbAccident.Text = (from x in Funs.DB.Accident_AccidentPersonRecord
where x.WorkPackageId.Contains(workPackageId)
&& x.States == Const.State_2
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
}
if (item == "CQMS")
{
this.gpCQMS.Hidden = false;
var getDetail = from x in Funs.DB.Check_SpotCheckDetail
//// 实体验收 资料验收
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1
where x.WorkPackageId.Contains(workPackageId) && y.State == "8"
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x;
int all = getDetail.Count();
this.lbSpotCheck1.Text = all.ToString();
int all = getSpotCheckDetail.Count();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count();
/// this.lbSpotCheck2.Text = okCount.ToString();
this.lbSpotCheckRate.Text = all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString() + "%" : "0%";
int okCount = getDetail.Where(x => x.IsOK == true).Count();
this.lbSpotCheck2.Text = okCount.ToString();
/// 资料验收合格项目
var getOKSpotCheckDetail = getSpotCheckDetail.Where(x => x.IsOK == true);
int okYSCount = getOKSpotCheckDetail.Count(); //验收合格
int okDateCount = getSpotCheckDetail.Where(x => x.IsDataOK == "1").Count(); //资料合格
this.lbSpotCheckDataRate.Text = okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
this.lbSpotCheck.Text = all > 0 ? Math.Round(okCount * 1.0 / (all * 1.0)).ToString() : "0";
/////实体质量问题整改率
//int allNoOk = all - onesOKCount; ///问题数
//int oKCount = getSpotCheckDetail.Where(x => x.IsOK == true).Count(); //合格数
//int zgCount = oKCount - onesOKCount; ///整改数
//this.lbSpotCheckOkRate.Text = allNoOk > 0 ? Math.Round(zgCount * 100.0 / (allNoOk * 1.0)).ToString() + "%" : "0%";
//////控制点
//var getControlItemAndCycle = from x in Funs.DB.WBS_ControlItemAndCycle
// where x.WorkPackageId.Contains(workPackageId)
// && (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
// && x.ControlPoint.Contains("A") && x.CheckNum > 0
// select x;
/////A级控制点总量
//int allControlItemCount = getControlItemAndCycle.Count();
/////已完成A级控制点数
//var getOKSpotCheckDetailCheckNum = from x in getOKSpotCheckDetail
// group x by x.ControlItemAndCycleId
// into g
// select new { g.First().ControlItemAndCycleId, num = g.Count() };
//var getOKControlItemAndCycle = from x in getControlItemAndCycle
// join y in getOKSpotCheckDetailCheckNum on x.ControlItemAndCycleId equals y.ControlItemAndCycleId
// where x.CheckNum == y.num
// select x;
//int okControlItemCount = getOKControlItemAndCycle.Count();
//this.lbControlItemRate.Text = allControlItemCount > 0 ? Math.Round(okControlItemCount * 100.0 / (allControlItemCount * 1.0)).ToString() + "%" : "0%";
}
if (item == "JDGL")
{
this.gpJDGL.Hidden = false;
//double totalSJCost = 0; ////累计实际费用
//decimal totalPlanCost = 0; ////计划费用
//var getWorkPackageDetail = Funs.DB.View_WBS_WorkPackageDetail.FirstOrDefault(x => x.InitWorkPackageCode == workPackageId);
//if (getWorkPackageDetail != null)
//{
// ///末级节点
// var getMaxSJCost = Funs.DB.View_WBS_WorkPackageDetail.Where(x => x.InitWorkPackageCode == workPackageId).OrderByDescending(x => x.Months).FirstOrDefault();
// if (getMaxSJCost != null)
// {
// totalSJCost = getMaxSJCost.TotalThisValue ?? 0;
// totalPlanCost = getMaxSJCost.PlanCost ?? 0;
// }
//}
//else
//{
// ///非末级节点
// var getMaxSJCost = Funs.DB.View_WBS_WorkPackageParentDetail.Where(x => x.InitWorkPackageCode == workPackageId).OrderByDescending(x => x.Months).FirstOrDefault();
// if (getMaxSJCost != null)
// {
// totalSJCost = getMaxSJCost.TotalThisValue ?? 0;
// totalPlanCost = getMaxSJCost.PlanCost ?? 0;
// }
//}
////// 根 节点 建筑工程 安装工程
//if (workPackageId == "1" || workPackageId == "2")
//{
// var getUnitWorkByType = from x in Funs.DB.WBS_UnitWork where x.ProjectType == workPackageId select x;
// if (getUnitWorkByType.Count() > 0)
// {
// totalPlanCost = getUnitWorkByType.Sum(x => x.PlanCost ?? 0);
// }
//}
/////项目进度完成百分比
//decimal s = Convert.ToDecimal(totalSJCost);
//this.lbJDRate.Text = totalPlanCost > 0 ? Math.Round(s / totalPlanCost).ToString() + "%" : "0%";
}
if (item == "HTGL")
{
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs
Generated
+114 -6
View File
@@ -149,6 +149,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.Label lbExpertArgument;
/// <summary>
/// lbAccident 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbAccident;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// gpCQMS 控件。
/// </summary>
@@ -168,31 +186,58 @@ namespace FineUIPro.Web.DigData
protected global::FineUIPro.Form Form2;
/// <summary>
/// lbSpotCheck1 控件。
/// lbSpotCheckRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck1;
protected global::FineUIPro.Label lbSpotCheckRate;
/// <summary>
/// lbSpotCheck2 控件。
/// lbSpotCheckDataRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck2;
protected global::FineUIPro.Label lbSpotCheckDataRate;
/// <summary>
/// lbSpotCheck 控件。
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheck;
protected global::FineUIPro.Label Label2;
/// <summary>
/// lbControlItemRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbControlItemRate;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// lbSpotCheckOkRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbSpotCheckOkRate;
/// <summary>
/// gpJDGL 控件。
@@ -203,6 +248,24 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpJDGL;
/// <summary>
/// Form3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// lbJDRate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbJDRate;
/// <summary>
/// gpHTGL 控件。
/// </summary>
@@ -212,6 +275,33 @@ namespace FineUIPro.Web.DigData
/// </remarks>
protected global::FineUIPro.GroupPanel gpHTGL;
/// <summary>
/// Form4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form4;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// Label6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label6;
/// <summary>
/// gpLW 控件。
/// </summary>
@@ -220,5 +310,23 @@ namespace FineUIPro.Web.DigData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupPanel gpLW;
/// <summary>
/// Form5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form5;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
}
}
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs
+26 -25
View File
@@ -447,37 +447,38 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
protected void btnPrint_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_RepairTrustMenuId, Const.BtnPrint))
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
string varValue = string.Empty;
string trustBatchId = this.tvControlItem.SelectedNodeID;
Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(trustBatchId);
if (trust != null)
{
string varValue = string.Empty;
string trustBatchId = this.tvControlItem.SelectedNodeID;
Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(trustBatchId);
if (trust != null)
varValue = trust.TrustBatchCode + "|" + trust.TrustDate.Value.Date + "|";
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (project != null)
{
varValue = trust.TrustBatchCode + "|" + trust.TrustDate.Value.Date + "|";
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (project != null)
{
varValue = varValue + project.ProjectName + "|" + project.ProjectCode + "|";
}
//varValue = varValue + trust.InstallationName + "|" + trust.InstallationCode;
if (!string.IsNullOrEmpty(varValue))
{
varValue = HttpUtility.UrlEncodeUnicode(varValue);
}
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.CheckTrustReport, trustBatchId, varValue)));
varValue = varValue + project.ProjectName + "|" + project.ProjectCode + "|";
}
//varValue = varValue + trust.InstallationName + "|" + trust.InstallationCode;
if (!string.IsNullOrEmpty(varValue))
{
varValue = HttpUtility.UrlEncodeUnicode(varValue);
}
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.CheckTrustReport, trustBatchId, varValue)));
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
//if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_RepairTrustMenuId, Const.BtnPrint))
//{
//}
//else
//{
// ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
// return;
//}
}
#region 判断是否可删除
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
+2
View File
@@ -568,6 +568,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// `
/// `
protected void drpWeldingRod_SelectedIndexChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(txtWpqId.Text))
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+19 -22
View File
@@ -526,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
var t = BLL.WeldTaskService.GetWeldTaskById(row);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false);
}
}
else
@@ -536,12 +536,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID))
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, false);
}
else
{
var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
errlog += DeleteWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId, t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
errlog += DeleteWeldingDailyItem(t.WeldJointId);
}
}
}
@@ -827,22 +827,21 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
if (!string.IsNullOrEmpty(coverWelderId) && !string.IsNullOrEmpty(backingWelderId))
{
newWeldJoint.WeldingDailyId = this.WeldingDailyId;
newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId;
//if (item.WeldingLocationId != Const._Null)
//{
// newWeldJoint.WeldingLocationId = item.WeldingLocationId;
//}
newWeldJoint.JointAttribute = jointAttribute;
BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
// 更新焊口号 修改固定焊口号后 +G
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
if (isSave)
{
newWeldJoint.WeldingDailyId = this.WeldingDailyId;
newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId;
//if (item.WeldingLocationId != Const._Null)
//{
// newWeldJoint.WeldingLocationId = item.WeldingLocationId;
//}
newWeldJoint.JointAttribute = jointAttribute;
BLL.WeldJointService.UpdateWeldJoint(newWeldJoint);
// 更新焊口号 修改固定焊口号后 +G
BLL.WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
// 进批
//BLL.Batch_PointBatchItemService.InsertPointBatch(this.ProjectId, this.drpUnit.SelectedValue, this.drpUnitWork.SelectedValue, item.CoverWelderId, item.WeldJointId, weldingDate);
bool isPass = true;
@@ -1035,7 +1034,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// <param name="item"></param>
/// <param name="weldingDailyId"></param>
/// <returns></returns>
private string DeleteWeldingDailyItem(string weldJointId, string coverWelderId, string backingWelderId, string jointAttribute, DateTime? weldingDate, string batchCondition, bool isSave)
private string DeleteWeldingDailyItem(string weldJointId)
{
string errlog = string.Empty;
var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId);
@@ -1063,7 +1062,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x;
string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId;
// 删除焊口所在批明细信息
/*// 删除焊口所在批明细信息
BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId);
// 删除批信息
@@ -1071,10 +1070,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (pointBatchId != null && batch.Count() == 0)
{
BLL.PointBatchService.DeleteBatch(pointBatchId);
}
//BLL.Batch_NDEItemService.DeleteAllNDEInfoToWeldJoint(item.WeldJointId);
}*/
}
//BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnDelete, weldingDailyId);
}
else
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+10
View File
@@ -422,6 +422,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
jot.JointAttribute = item.JointAttribute;
}
BLL.WeldJointService.UpdateWeldJoint(jot);
// 获取组批条件
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", CurrUser.LoginProjectId);
if (batchC != null)
{
string batchCondition = batchC.SetValue;
BLL.PointBatchService.AddBatchByWeldJointId(item.WeldJointId,null, batchCondition);
}
}
}
}
@@ -910,6 +919,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (task != null)
{
BLL.WeldTaskService.DeleteWeldingTask(task.WeldTaskId);
PointBatchService.DeleteBatchByWeldJointId(task.WeldJointId);
}
}
ShowNotify("删除成功！", MessageBoxIcon.Success);
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecord.aspx
+3 -3
View File
@@ -47,7 +47,7 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="120px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
<f:RenderField Width="110px" ColumnID="AccidentTypeName" DataField="AccidentTypeName"
SortField="AccidentTypeName" FieldType="String" HeaderText="事故类型" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@@ -61,7 +61,7 @@
<f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
FieldType="String" HeaderText="人员" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CardNo" DataField="CardNo" SortField="CardNo"
<f:RenderField Width="110px" ColumnID="CardNo" DataField="CardNo" SortField="CardNo"
FieldType="String" HeaderText="卡号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:RenderField Width="160px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
@@ -113,7 +113,7 @@
</f:Panel>
<f:Window ID="Window1" Title="HSE事故(对人员)记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
Height="600px">
Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx
+114 -102
View File
@@ -12,108 +12,120 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="HSE事故(对人员)记录"
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Label="项目" LabelAlign="Right" MaxLength="50" LabelWidth="110px"
Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="单位工程" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DropDownList>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DatePicker>
<f:DropDownList ID="drpAccidentTypeId" runat="server" Label="事故类别" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DropDownList>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂"> </f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPersonId" runat="server" Label="人员姓名" LabelAlign="Right" EnableEdit="true"
Required="true" ShowRedStar="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList ID="drpInjury" runat="server" Label="伤害情况" LabelAlign="Right" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:TextBox ID="txtInjuryPart" runat="server" Label="受伤部位" LabelAlign="Right" MaxLength="50" LabelWidth="110px">
</f:TextBox>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" MaxLength="50" LabelWidth="110px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
MaxLength="500" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtPreventiveAction" runat="server" Label="预防事故重复发生的措施" LabelAlign="Right"
MaxLength="500" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtHandleOpinion" runat="server" Label="处理意见" LabelAlign="Right"
MaxLength="500" Height="50px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="事故报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="200" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp">
</f:Label>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="HSE事故(对人员)记录"
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right" LabelWidth="110px" EnableTableStyle="true">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Label="项目" LabelAlign="Right" MaxLength="50"
Readonly="true" Hidden="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="单位工程" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DropDownList>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DatePicker>
<f:DropDownList ID="drpAccidentTypeId" runat="server" Label="事故类别" LabelAlign="Right"
EnableEdit="true" Required="true" ShowRedStar="true" >
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPersonId" runat="server" Label="人员姓名" LabelAlign="Right" EnableEdit="true"
Required="true" ShowRedStar="true" >
</f:DropDownList>
<f:DropDownList ID="drpInjury" runat="server" Label="伤害情况" LabelAlign="Right" EnableEdit="true" >
</f:DropDownList>
<f:TextBox ID="txtInjuryPart" runat="server" Label="受伤部位" LabelAlign="Right" MaxLength="50" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 50% 5% 10%">
<Items>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" MaxLength="50" >
</f:TextBox>
<f:Label runat="server" ID="txtWorkPackageName" Label="分部分项工程" ShowRedStar="true" LabelWidth="120px"></f:Label>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂"></f:CheckBox>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
MaxLength="500" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtPreventiveAction" runat="server" Label="预防事故重复发生的措施" LabelAlign="Right"
MaxLength="500" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtHandleOpinion" runat="server" Label="处理意见" LabelAlign="Right"
MaxLength="500" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="事故报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="160" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Label runat="server" ID="lbTemp">
</f:Label>
<f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="650px">
</f:Window>
</form>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx.cs
+22 -1
View File
@@ -102,6 +102,9 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.ckIsAttempt.Checked = true;
}
this.hdWorkPackageId.Text = accidentPersonRecord.WorkPackageId;
this.txtWorkPackageName.Text= accidentPersonRecord.WorkPackageName;
}
}
else
@@ -239,6 +242,8 @@ namespace FineUIPro.Web.HSSE.Accident
accidentPersonRecord.CompileMan = this.CurrUser.PersonId;
accidentPersonRecord.CompileDate = DateTime.Now;
accidentPersonRecord.States = BLL.Const.State_0;
accidentPersonRecord.WorkPackageName = this.txtWorkPackageName.Text;
accidentPersonRecord.WorkPackageId = this.hdWorkPackageId.Text;
if (type == BLL.Const.BtnSubmit)
{
var flowOperate = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == this.AccidentPersonRecordId && x.State == BLL.Const.State_2 && x.IsClosed == true);
@@ -259,7 +264,7 @@ namespace FineUIPro.Web.HSSE.Accident
}
else
{
this.AccidentPersonRecordId = SQLHelper.GetNewID(typeof(Model.Accident_AccidentPersonRecord));
this.AccidentPersonRecordId = SQLHelper.GetNewID();
accidentPersonRecord.AccidentPersonRecordId = this.AccidentPersonRecordId;
BLL.AccidentPersonRecordService.AddAccidentPersonRecord(accidentPersonRecord);
BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, this.AccidentPersonRecordId, BLL.Const.ProjectAccidentPersonRecordMenuId, Const.BtnAdd);
@@ -299,5 +304,21 @@ namespace FineUIPro.Web.HSSE.Accident
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/AccidentPersonRecordAttachUrl&menuId={1}", this.AccidentPersonRecordId, BLL.Const.ProjectAccidentPersonRecordMenuId)));
}
#endregion
protected void btSearch_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
+ Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
}
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text, '&');
if (getReturnValues.Count() > 1)
{
this.hdWorkPackageId.Text = getReturnValues[0].ToString();
this.txtWorkPackageName.Text = getReturnValues[1].ToString();
}
}
}
}
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordEdit.aspx.designer.cs
Generated
+45 -9
View File
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.DropDownList drpAccidentTypeId;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// drpPersonId 控件。
/// </summary>
@@ -122,6 +113,42 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.TextBox txtHssePersons;
/// <summary>
/// txtWorkPackageName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageName;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// txtInjuryResult 控件。
/// </summary>
@@ -247,5 +274,14 @@ namespace FineUIPro.Web.HSSE.Accident
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx
+14 -8
View File
@@ -31,8 +31,7 @@
Readonly="true">
</f:TextBox>
<f:TextBox ID="txtAccidentDate" runat="server" Label="发生时间" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂" Readonly="true"> </f:CheckBox>
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -42,36 +41,43 @@
<f:TextBox ID="txtInjury" runat="server" Label="伤害情况" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:TextBox ID="txtInjuryPart" runat="server" Label="受伤部位" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:TextBox ID="txtHssePersons" runat="server" Label="责任区安全员" LabelAlign="Right" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:TextBox runat="server" ID="txtWorkPackageName" Label="分部分项工程" Readonly="true" LabelWidth="120px"></f:TextBox>
<f:CheckBox runat="server" ID="ckIsAttempt" Label="未遂" Readonly="true"> </f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtInjuryResult" runat="server" Label="事故经过及原因" LabelAlign="Right"
Readonly="true" Height="50px">
Readonly="true" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtPreventiveAction" runat="server" Label="预防事故重复发生的措施" LabelAlign="Right"
Readonly="true" Height="50px">
Readonly="true" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtHandleOpinion" runat="server" Label="处理意见" LabelAlign="Right"
Readonly="true" Height="50px">
Readonly="true" Height="40px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:HtmlEditor runat="server" Label="事故报告" ID="txtFileContents" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="200" LabelAlign="Right">
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="160" LabelAlign="Right">
</f:HtmlEditor>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx.cs
+1
View File
@@ -97,6 +97,7 @@ namespace FineUIPro.Web.HSSE.Accident
this.txtPreventiveAction.Text = accidentPersonRecord.PreventiveAction;
this.txtHandleOpinion.Text = accidentPersonRecord.HandleOpinion;
this.txtFileContents.Text = HttpUtility.HtmlDecode(accidentPersonRecord.FileContent);
this.txtWorkPackageName.Text = accidentPersonRecord.WorkPackageName;
}
}
///初始化审核菜单
SGGL/FineUIPro.Web/HSSE/Accident/AccidentPersonRecordView.aspx.designer.cs
Generated
+18 -9
View File
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.TextBox txtAccidentDate;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// txtPersonName 控件。
/// </summary>
@@ -122,6 +113,24 @@ namespace FineUIPro.Web.HSSE.Accident
/// </remarks>
protected global::FineUIPro.TextBox txtHssePersons;
/// <summary>
/// txtWorkPackageName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackageName;
/// <summary>
/// ckIsAttempt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAttempt;
/// <summary>
/// txtInjuryResult 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs
+16 -17
View File
@@ -90,24 +90,23 @@ namespace FineUIPro.Web.PHTGL.Filing
}
var RoleIds = this.CurrUser.RoleIds;
_BidDocumentsStandingBook.UnitId = "normal";
if (!string.IsNullOrEmpty(RoleIds))
{
if (RoleIds.Contains(Const.SedinHTGLManager))
{
//model.UnitId=this.CurrUser.UnitId;
}
else if (RoleIds.Contains(Const.OtherHTGLManager))
{
_BidDocumentsStandingBook.UnitId = this.CurrUser.UnitId;
}
else if (RoleIds.Contains(Const.SedinHTGLDepartManager))
{
_BidDocumentsStandingBook.UnitId = this.CurrUser.UnitId;
_BidDocumentsStandingBook.DepartId = this.CurrUser.DepartId;
if (RoleIds.Contains(Const.SedinHTGLManager))
{
//model.UnitId=this.CurrUser.UnitId;
}
else if (RoleIds.Contains(Const.OtherHTGLManager))
{
_BidDocumentsStandingBook.UnitId = this.CurrUser.UnitId;
}
else if (RoleIds.Contains(Const.SedinHTGLDepartManager))
{
_BidDocumentsStandingBook.UnitId = this.CurrUser.UnitId;
_BidDocumentsStandingBook.DepartId = this.CurrUser.DepartId;
}
else
{
_BidDocumentsStandingBook.UnitId = "normal";
}
}
if (dropState.SelectedValue!=Const._Null)
{
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<TreeNode id="1011063B-FEAC-4B89-A9D9-0F9F6BB3328E" Text="施工技术交底管理" NavigateUrl=""><TreeNode id="F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F" Text="施工技术交底" NavigateUrl="CQMS/Technical/TechnicalDisclose.aspx"></TreeNode>
</TreeNode>
<TreeNode id="B8500D87-407E-458C-9915-FD54F0E81F36" Text="质量验收" NavigateUrl=""><TreeNode id="CC43E208-335D-4AE3-A1CE-B2D8510AE854" Text="实体验收" NavigateUrl="CQMS/Check/SpotCheck.aspx"></TreeNode>
<TreeNode id="0B17549C-2749-4255-BFF4-574902E878FA" Text="资料验收" NavigateUrl="CQMS/Check/MaterialAcceptance.aspx"></TreeNode>
<TreeNode id="8317C0F7-3A69-48AB-87E5-03E96C543B1C" Text="资料验收" NavigateUrl="CQMS/Check/SpotDataCheck.aspx"></TreeNode>
<TreeNode id="1433BE70-13C0-4AC7-BC3D-34C9471CE2A8" Text="质量验收统计" NavigateUrl="CQMS/Check/SpotCheckStatistics.aspx"></TreeNode>
</TreeNode>
<TreeNode id="A54EC449-5F77-4068-83B9-AA305B721A0B" Text="质量检查" NavigateUrl=""><TreeNode id="B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306" Text="质量巡检" NavigateUrl="CQMS/Check/CheckList.aspx"></TreeNode>
SGGL/Model/Model.cs
+84 -12
View File
@@ -290949,7 +290949,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(101)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")]
public string Name
{
get
@@ -291441,6 +291441,8 @@ namespace Model
private System.Nullable<System.DateTime> _Months;
private string _InitWorkPackageCode;
private string _WorkPackageCode;
private string _PackageContent;
@@ -291453,6 +291455,8 @@ namespace Model
private System.Nullable<decimal> _RealProjectQuantity;
private System.Nullable<decimal> _PlanCost;
private System.Nullable<double> _TotalPlanNum;
private System.Nullable<double> _TotalThisNum;
@@ -291521,6 +291525,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InitWorkPackageCode", DbType="NVarChar(50)")]
public string InitWorkPackageCode
{
get
{
return this._InitWorkPackageCode;
}
set
{
if ((this._InitWorkPackageCode != value))
{
this._InitWorkPackageCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageCode", DbType="NVarChar(30)")]
public string WorkPackageCode
{
@@ -291617,6 +291637,22 @@ namespace Model
}
}
[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="_TotalPlanNum", DbType="Float")]
public System.Nullable<double> TotalPlanNum
{
@@ -291758,6 +291794,10 @@ namespace Model
private System.Nullable<System.DateTime> _Months;
private string _InitWorkPackageCode;
private System.Nullable<decimal> _PlanCost;
private System.Nullable<double> _PlanNum;
private System.Nullable<double> _ThisNum;
@@ -291842,6 +291882,38 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InitWorkPackageCode", DbType="NVarChar(50)")]
public string InitWorkPackageCode
{
get
{
return this._InitWorkPackageCode;
}
set
{
if ((this._InitWorkPackageCode != value))
{
this._InitWorkPackageCode = 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="_PlanNum", DbType="Float")]
public System.Nullable<double> PlanNum
{
@@ -293605,7 +293677,7 @@ namespace Model
private string _WBSCode;
private System.Nullable<decimal> _PlanCost;
private string _WorkPackageIds;
private EntityRef<WBS_WorkPackage> _WBS_WorkPackage;
@@ -293657,8 +293729,8 @@ namespace Model
partial void OnRealEndDateChanged();
partial void OnWBSCodeChanging(string value);
partial void OnWBSCodeChanged();
partial void OnPlanCostChanging(System.Nullable<decimal> value);
partial void OnPlanCostChanged();
partial void OnWorkPackageIdsChanging(string value);
partial void OnWorkPackageIdsChanged();
#endregion
public WBS_ControlItemAndCycle()
@@ -294111,22 +294183,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(9,2)")]
public System.Nullable<decimal> PlanCost
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageIds", DbType="NVarChar(2000)")]
public string WorkPackageIds
{
get
{
return this._PlanCost;
return this._WorkPackageIds;
}
set
{
if ((this._PlanCost != value))
if ((this._WorkPackageIds != value))
{
this.OnPlanCostChanging(value);
this.OnWorkPackageIdsChanging(value);
this.SendPropertyChanging();
this._PlanCost = value;
this.SendPropertyChanged("PlanCost");
this.OnPlanCostChanged();
this._WorkPackageIds = value;
this.SendPropertyChanged("WorkPackageIds");
this.OnWorkPackageIdsChanged();
}
}
}