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

提交代码

Browse Source
This commit is contained in:
高飞
2023-11-25 16:03:59 +08:00
parent 3798809740
commit 206d2c5c43
11 changed files with 149 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx.cs
+30 -2
View File
@@ -967,6 +967,12 @@ namespace FineUIPro.Web.CQMS.Check
foreach (var item in list)
{
Model.WBS_ControlItemAndCycle c = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(item.ControlItemAndCycleId);
Model.WBS_ControlItemInit cInit = BLL.ControlItemInitService.GetControlItemInitByCode(c.InitControlItemCode);
bool isJDItem = false;
if (cInit != null && cInit.IsJDItem.HasValue)
{
isJDItem = cInit.IsJDItem.Value;
}
if (c != null)
{
if (!string.IsNullOrEmpty(c.HGForms) || !string.IsNullOrEmpty(c.SHForms))
@@ -980,7 +986,18 @@ namespace FineUIPro.Web.CQMS.Check
{
c.RealEndDate = DateTime.Now;
BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c);
BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
if (isJDItem) //进度完成项
{
BLL.WorkPackageService.UpdateWorkPackageRealEndDate2(c.WorkPackageId);
}
else //非进度完成项
{
Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(c.WorkPackageId);
if (workPackage.RealEndDate == null) //分部分项还未生成实际完成时间
{
BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
}
}
}
else //检查多次
{
@@ -989,7 +1006,18 @@ namespace FineUIPro.Web.CQMS.Check
{
c.RealEndDate = DateTime.Now;
BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c);
BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
if (isJDItem) //进度完成项
{
BLL.WorkPackageService.UpdateWorkPackageRealEndDate2(c.WorkPackageId);
}
else //非进度完成项
{
Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(c.WorkPackageId);
if (workPackage.RealEndDate == null) //分部分项还未生成实际完成时间
{
BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
}
}
}
}
}
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitEdit.aspx
+5
View File
@@ -77,6 +77,11 @@
<f:TextBox ID="txtClauseNo" runat="server" Label="条款号" LabelWidth="160px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="cbIsJDItem" Label="进度完成项" LabelWidth="160px"></f:CheckBox>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitEdit.aspx.cs
+5
View File
@@ -102,6 +102,10 @@ namespace FineUIPro.Web.CQMS.WBS
this.txtSHForms.Text = controlItem.SHForms;
this.txtStandard.Text = controlItem.Standard;
this.txtClauseNo.Text = controlItem.ClauseNo;
if (controlItem.IsJDItem == true)
{
this.cbIsJDItem.Checked = true;
}
}
}
}
@@ -130,6 +134,7 @@ namespace FineUIPro.Web.CQMS.WBS
newControlItem.SHForms = this.txtSHForms.Text.Trim();
newControlItem.Standard = this.txtStandard.Text.Trim();
newControlItem.ClauseNo = this.txtClauseNo.Text.Trim();
newControlItem.IsJDItem = this.cbIsJDItem.Checked;
if (Request.Params["type"] == "add")
{
BLL.ControlItemInitService.AddControlItemInit(newControlItem);
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitEdit.aspx.designer.cs
Generated
+9
View File
@@ -147,6 +147,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtClauseNo;
/// <summary>
/// cbIsJDItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsJDItem;
/// <summary>
/// Toolbar1 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitSet.aspx
+1
View File
@@ -88,6 +88,7 @@
<f:RenderField Width="100px" ColumnID="ClauseNo" DataField="ClauseNo" FieldType="String"
HeaderText="条款号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="100px" RenderAsStaticField="true" TextAlign="Center" DataField="IsJDItem" HeaderText="进度完成项" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitSet.aspx.cs
+1 -1
View File
@@ -455,7 +455,7 @@ namespace FineUIPro.Web.CQMS.WBS
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT ControlItemCode,WorkPackageCode,ControlItemContent,ControlPoint,ControlItemDef,Weights,HGForms,SHForms,Standard,ClauseNo"
string strSql = @"SELECT ControlItemCode,WorkPackageCode,ControlItemContent,ControlPoint,ControlItemDef,Weights,HGForms,SHForms,Standard,ClauseNo,IsJDItem"
+ @" FROM WBS_ControlItemInit ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " where WorkPackageCode = @WorkPackageCode";