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

现场质量问题台账

Browse Source
This commit is contained in:
夏菊
2026-01-19 15:31:10 +08:00
parent feb9e58357
commit d4f5233fe5
32 changed files with 520 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SUBQHSE_V2026-01-16-xiaj(现场质量问题台账).sql
+44
View File
@@ -0,0 +1,44 @@
--现场质量问题台账
/*******************************************************************************
现场质量问题台账修改项：
1、菜单名称调整：NCR管理 =》 现场质量问题台账
2、问题类别调整；同步修正处理历史数据
3、补充字段：现场质量问题来源、目前实施进展状况
*******************************************************************************/
update Sys_Menu set MenuName='现场质量问题台账' where MenuName='NCR管理'
go
update Sys_Menu set MenuName='现场质量问题台账统计' where MenuName='NCR统计'
go
--历史数据处理：原来问题状态前面补充：施工管理问题-
update Comprehensive_NCRManagement
set Problem=REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(Problem, '成品保护不到位', '施工管理问题-成品保护不到位'), '不按程序施工', '施工管理问题-不按程序施工'), '不按设计要求施工', '施工管理问题-不按设计要求施工'), '质量管理问题', '施工管理问题-质量管理问题'), '质量缺陷', '施工管理问题-质量缺陷'), '过程监督不到位', '施工管理问题-过程监督不到位')
where Problem is not null and Problem not like '%施工管理问题-%'
go
--补充字段：现场质量问题来源、目前实施进展状况
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Comprehensive_NCRManagement' AND COLUMN_NAME = 'Source')
BEGIN
ALTER TABLE Comprehensive_NCRManagement ADD Source nvarchar(100);
ALTER TABLE Comprehensive_NCRManagement ADD ProgressStatus nvarchar(100);
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'现场质量问题来源' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_NCRManagement', @level2type=N'COLUMN',@level2name=N'Source'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'目前实施进展状况' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_NCRManagement', @level2type=N'COLUMN',@level2name=N'ProgressStatus'
END
GO
SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
+9 -5
View File
@@ -7,7 +7,7 @@ using System.Collections;
namespace BLL
{
/// <summary>
/// NCR管理
/// 现场质量问题台账
/// </summary>
public static class NCRManagementService
{
@@ -84,7 +84,7 @@ namespace BLL
}
/// <summary>
/// 根据主键获取NCR管理
/// 根据主键获取现场质量问题台账
/// </summary>
/// <param name="nCRManagementId"></param>
/// <returns></returns>
@@ -94,7 +94,7 @@ namespace BLL
}
/// <summary>
/// 添加NCR管理
/// 添加现场质量问题台账
/// </summary>
/// <param name="nCRManagement"></param>
public static void AddNCRManagement(Model.Comprehensive_NCRManagement nCRManagement)
@@ -120,6 +120,8 @@ namespace BLL
newNCRManagement.Status = nCRManagement.Status;
newNCRManagement.Problem = nCRManagement.Problem;
newNCRManagement.Measure = nCRManagement.Measure;
newNCRManagement.Source = nCRManagement.Source;
newNCRManagement.ProgressStatus = nCRManagement.ProgressStatus;
newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
newNCRManagement.Supervisor = nCRManagement.Supervisor;
db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
@@ -127,7 +129,7 @@ namespace BLL
}
/// <summary>
/// 修改NCR管理
/// 修改现场质量问题台账
/// </summary>
/// <param name="nCRManagement"></param>
public static void UpdateNCRManagement(Model.Comprehensive_NCRManagement nCRManagement)
@@ -153,6 +155,8 @@ namespace BLL
newNCRManagement.Status = nCRManagement.Status;
newNCRManagement.Problem = nCRManagement.Problem;
newNCRManagement.Measure = nCRManagement.Measure;
newNCRManagement.Source = nCRManagement.Source;
newNCRManagement.ProgressStatus = nCRManagement.ProgressStatus;
newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
newNCRManagement.Supervisor = nCRManagement.Supervisor;
db.SubmitChanges();
@@ -160,7 +164,7 @@ namespace BLL
}
/// <summary>
/// 根据主键删除NCR管理
/// 根据主键删除现场质量问题台账
/// </summary>
/// <param name="nCRManagementId"></param>
public static void DeleteNCRManagement(string nCRManagementId)
SGGL/BLL/Common/Const.cs
+3 -2
View File
@@ -3290,9 +3290,10 @@ namespace BLL
/// </summary>
public const string TechnologyUrl = "File\\Excel\\TestRun\\设备一览表.xlsx";
/// <summary>
/// NCR管理导入模版文件原始的虚拟路径
/// 现场质量问题台账导入模版文件原始的虚拟路径
/// </summary>
public const string NCRManagementDataInUrl = "File\\Excel\\DataIn\\NCR管理导入模板.xls";
public const string NCRManagementDataInUrlOld = "File\\Excel\\DataIn\\现场质量问题台账导入模板.xls";
/// <summary>
/// WBS导入模版文件原始的虚拟路径
/// </summary>
@@ -4224,7 +4225,7 @@ namespace BLL
public const string Inspection_Test_PlanMenuId = "A70EA41D-0B45-4753-AC77-BF28DA066402";
/// <summary>
/// NCR管理
/// 现场质量问题台账
/// </summary>
public const string NCRManagementMenuId = "7e628f48-385f-4d52-8063-d0f812514316";
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+34 -13
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>NCR管理</title>
<title>现场质量问题台账</title>
</head>
<body>
<form id="form1" runat="server">
@@ -13,7 +13,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="NCR管理" EnableCollapse="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场质量问题台账" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="NCRManagementId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="NCRManagementId" AllowSorting="true" SortField="RemarkCode"
SortDirection="ASC" OnSort="Grid1_Sort"
@@ -25,7 +25,22 @@
<f:DropDownList ID="sdrpUnitId" runat="server" Label="接收单位" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
<f:TextBox runat="server" ID="txtNCRCode" Label="NCR单号" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtNCRCode" Label="文件编号" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddlSource" Label="问题来源" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="-请选择-" />
<f:ListItem Value="NCR-业主下发" Text="NCR-业主下发" />
<f:ListItem Value="NCR-监理下发" Text="NCR-监理下发" />
<f:ListItem Value="NCR-五环发布" Text="NCR-五环发布" />
<f:ListItem Value="监理通知单" Text="监理通知单" />
<f:ListItem Value="信函" Text="信函" />
<f:ListItem Value="施工联系单" Text="施工联系单" />
<f:ListItem Value="施工签证" Text="施工签证" />
<f:ListItem Value="关键事项" Text="关键事项" />
<f:ListItem Value="设计变更单" Text="设计变更单" />
<f:ListItem Value="技术核定单" Text="技术核定单" />
<f:ListItem Value="开箱检验问题清单" Text="开箱检验问题清单" />
<f:ListItem Value="其它" Text="其它" />
</f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch"
EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
</f:Button>
@@ -50,10 +65,13 @@
<f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="发出单位" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="Source" DataField="Source" FieldType="String" HeaderText="问题来源" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center" Width="110px">
</f:RenderField>
<f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
<f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
<f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
@@ -81,6 +99,9 @@
<asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnit")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="ProgressStatus" DataField="ProgressStatus" FieldType="String" HeaderText="目前实施进展状况" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
<f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="实施状态" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
@@ -98,17 +119,17 @@
<asp:Label ID="Label1" runat="server" Text='<%# ConvertSupervisorName(Eval("Supervisor")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
<%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
<%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt"
Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="NCRManagementId" DataIFrameUrlFormatString="./NCRManagementApprove.aspx?Id={0}"/>--%>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
<%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt"
Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="NCRManagementId" DataIFrameUrlFormatString="./NCRManagementApprove.aspx?Id={0}"/>--%>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("NCRManagementId")) %>' ToolTip="附件查看"></asp:LinkButton>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("NCRManagementId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</Columns>
@@ -129,15 +150,15 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="NCR管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="现场质量问题台账" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="530px">
Width="1200px" Height="780px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="600px">
</f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
<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>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
+30 -16
View File
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.Comprehensive
public void BindGrid()
{
string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,C.ReasonAnalysis,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
C.ClosedDate, C.CompleteDate, C.ResponsibleMan, C.AttachUrl, C.ImplementationFrontState,C.Supervisor,
C.ClosedDate, C.CompleteDate, C.ResponsibleMan, C.AttachUrl, C.ImplementationFrontState,C.Supervisor,C.Source,C.ProgressStatus,
C.CompileMan, C.UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode,su.UserName as SupervisorName
from Comprehensive_NCRManagement C
left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
@@ -49,6 +49,11 @@ namespace FineUIPro.Web.Comprehensive
strSql += " AND C.CNProfessionalId =@CNProfessionalId";
listStr.Add(new SqlParameter("@CNProfessionalId", drpProfessionalId.SelectedValue));
}
if (!string.IsNullOrWhiteSpace(this.ddlSource.SelectedValue))
{
strSql += " AND C.Source =@Source";
listStr.Add(new SqlParameter("@Source", this.ddlSource.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtNCRCode.Text.Trim()))
{
strSql += " AND C.NCRCode LIKE @NCRCode";
@@ -62,6 +67,7 @@ namespace FineUIPro.Web.Comprehensive
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 分页、排序
@@ -392,7 +398,7 @@ namespace FineUIPro.Web.Comprehensive
if (lists != null)
{
string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
newUrl = uploadfilepath.Replace("NCR管理导入模板", "NCR管理（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
newUrl = uploadfilepath.Replace("现场质量问题台账导入模板", "现场质量问题台账（" + projectName.Replace("/", "") + DateTime.Now.ToString("yyyyMMdd") + ")");
if (File.Exists(newUrl))
{
File.Delete(newUrl);
@@ -438,6 +444,10 @@ namespace FineUIPro.Web.Comprehensive
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Source);//现场质量问题来源
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
string proName = string.Empty;
var cnp = BLL.CNProfessionalService.GetCNProfessional(item.CNProfessionalId);
if (cnp != null)
@@ -446,11 +456,11 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(proName);//专业
cell = row.CreateCell(2);
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.NCRCode);//NCR单号
cell = row.CreateCell(3);
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
string unitWorkName = string.Empty;
if (!string.IsNullOrEmpty(item.UnitWorkId))
@@ -459,27 +469,27 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(unitWorkName);//单位工程
cell = row.CreateCell(4);
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Contents);//主要内容
cell = row.CreateCell(5);
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Problem);//问题类别
cell = row.CreateCell(6);
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ReasonAnalysis);//问题原因分析
cell = row.CreateCell(7);
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Measure);//改进措施
cell = row.CreateCell(8);
cell = row.CreateCell(9);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
cell = row.CreateCell(9);
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
string receiveUnitName = string.Empty;
if (!string.IsNullOrEmpty(item.ReceiveUnit))
@@ -488,7 +498,11 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(receiveUnitName);//接收单位
cell = row.CreateCell(10);
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ProgressStatus);//目前实施进展状况
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
string state = string.Empty;
if (!string.IsNullOrEmpty(item.ImplementationFrontState))
@@ -497,19 +511,19 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(state);//实施状态
cell = row.CreateCell(11);
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
cell = row.CreateCell(12);
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
cell = row.CreateCell(13);
cell = row.CreateCell(15);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ResponsibleMan);//责任人
cell = row.CreateCell(14);
cell = row.CreateCell(16);
cell.CellStyle = cellStyle;
string supervisorName = string.Empty;
if (!string.IsNullOrEmpty(item.Supervisor))
@@ -518,7 +532,7 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(supervisorName);//监督人
cell = row.CreateCell(15);
cell = row.CreateCell(17);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.designer.cs
Generated
+40 -29
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Comprehensive {
public partial class NCRManagement {
namespace FineUIPro.Web.Comprehensive
{
public partial class NCRManagement
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// sdrpUnitId 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList sdrpUnitId;
/// <summary>
/// drpProfessionalId 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProfessionalId;
/// <summary>
/// txtNCRCode 控件。
/// </summary>
@@ -83,7 +85,16 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtNCRCode;
/// <summary>
/// ddlSource 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSource;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
+23 -17
View File
@@ -81,50 +81,56 @@
<f:RenderField Width="220px" HeaderText="发出单位" ColumnID="Value1" DataField="Value1" SortField="Value1"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="专业名称" ColumnID="Value2" DataField="Value2" SortField="Value2"
<f:RenderField Width="160px" HeaderText="问题来源" ColumnID="Value2" DataField="Value2" SortField="Value2"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:WindowField ColumnID="Value3" HeaderTextAlign="Center" TextAlign="Left" Width="220px" WindowID="Window1" HeaderText="NCR单号"
DataTextField="Value3" DataIFrameUrlFields="TempId" DataIFrameUrlFormatString="NCRManagementDataInNewEdit.aspx?TempId={0}"
Title="NCR单号" DataToolTipField="ToopValue" SortField="Value3">
<f:RenderField Width="80px" HeaderText="专业名称" ColumnID="Value3" DataField="Value3" SortField="Value3"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:WindowField ColumnID="Value4" HeaderTextAlign="Center" TextAlign="Left" Width="220px" WindowID="Window1" HeaderText="NCR单号"
DataTextField="Value4" DataIFrameUrlFields="TempId" DataIFrameUrlFormatString="NCRManagementDataInNewEdit.aspx?TempId={0}"
Title="文件编号" DataToolTipField="ToopValue" SortField="Value4">
</f:WindowField>
<f:RenderField Width="100px" HeaderText="单位工程名称" ColumnID="Value4" DataField="Value4" SortField="Value4"
<f:RenderField Width="100px" HeaderText="单位工程名称" ColumnID="Value5" DataField="Value5" SortField="Value5"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" HeaderText="主要内容" ColumnID="Value5" DataField="Value5" SortField="Value5"
<f:RenderField Width="120px" HeaderText="主要内容" ColumnID="Value6" DataField="Value6" SortField="Value6"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" HeaderText="问题类别" ColumnID="Value6" DataField="Value6" SortField="Value6"
<f:RenderField Width="90px" HeaderText="问题类别" ColumnID="Value7" DataField="Value7" SortField="Value7"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" HeaderText="原因分析" ColumnID="Value7" DataField="Value7" SortField="Value7"
<f:RenderField Width="120px" HeaderText="原因分析" ColumnID="Value8" DataField="Value8" SortField="Value8"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" HeaderText="改进措施" ColumnID="Value8" DataField="Value8" SortField="Value8"
<f:RenderField Width="120px" HeaderText="改进措施" ColumnID="Value9" DataField="Value9" SortField="Value9"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="下发日期" ColumnID="Value9" DataField="Value9" SortField="Value9"
<f:RenderField Width="100px" HeaderText="下发日期" ColumnID="Value10" DataField="Value10" SortField="Value10"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="接收单位" ColumnID="Value10" DataField="Value10" SortField="Value10"
<f:RenderField Width="100px" HeaderText="接收单位" ColumnID="Value11" DataField="Value11" SortField="Value11"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="实施状态" ColumnID="Value11" DataField="Value11" SortField="Value11"
<f:RenderField Width="100px" HeaderText="目前实施进展状况" ColumnID="Value12" DataField="Value12" SortField="Value12"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
<f:RenderField Width="100px" HeaderText="实施状态" ColumnID="Value13" DataField="Value13" SortField="Value13"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value14" DataField="Value14" SortField="Value14"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value13" DataField="Value13" SortField="Value13"
<f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value15" DataField="Value15" SortField="Value15"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value14" DataField="Value14" SortField="Value14"
<f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value16" DataField="Value16" SortField="Value16"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value15" DataField="Value15" SortField="Value15"
<f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value17" DataField="Value17" SortField="Value17"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="标志编号" ColumnID="Value16" DataField="Value16" SortField="Value16"
<f:RenderField Width="80px" HeaderText="标志编号" ColumnID="Value18" DataField="Value18" SortField="Value18"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
+95 -44
View File
@@ -249,6 +249,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString();
newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString();
newDataInTemp.Value16 = ds.Tables[0].Rows[i][15].ToString();
newDataInTemp.Value17 = ds.Tables[0].Rows[i][16].ToString();
newDataInTemp.Value18 = ds.Tables[0].Rows[i][17].ToString();
BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
}
@@ -277,7 +279,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("NCR管理" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("现场质量问题台账" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1));
@@ -340,6 +342,31 @@ namespace FineUIPro.Web.CQMS.Comprehensive
int i = 0;
int ir = dataInTemp.Count();
string erreMessage = "";
//问题来源
List<string> lstSource = new List<string>();
lstSource.Add("NCR-业主下发");
lstSource.Add("NCR-监理下发");
lstSource.Add("NCR-五环发布");
lstSource.Add("监理通知单");
lstSource.Add("信函");
lstSource.Add("施工联系单");
lstSource.Add("施工签证");
lstSource.Add("关键事项");
lstSource.Add("设计变更单");
lstSource.Add("技术核定单");
lstSource.Add("开箱检验问题清单");
lstSource.Add("其它");
//问题类别
List<string> lstProblem = new List<string>();
lstProblem.Add("设计问题");
lstProblem.Add("采购问题");
lstProblem.Add("施工管理问题-过程监督不到位");
lstProblem.Add("施工管理问题-质量缺陷");
lstProblem.Add("施工管理问题-质量管理问题");
lstProblem.Add("施工管理问题-不按设计要求施工");
lstProblem.Add("施工管理问题-不按程序施工");
lstProblem.Add("施工管理问题-成品保护不到位");
lstProblem.Add("其它");
foreach (var tempData in dataInTemp)
{
if (tempData != null)
@@ -367,10 +394,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
if (!string.IsNullOrEmpty(tempData.Value2))
{
var cn = cns.Where(x => x.ProfessionalName == tempData.Value2).FirstOrDefault();
if (!lstSource.Contains(tempData.Value2))
{
errInfo += "问题来源[" + tempData.Value2 + "]错误；";
}
else
{
Ins.Source = tempData.Value2;
}
}
else
{
errInfo += "问题来源为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value3))
{
var cn = cns.Where(x => x.ProfessionalName == tempData.Value3).FirstOrDefault();
if (cn == null)
{
errInfo += "专业名称[" + tempData.Value2 + "]不存在；";
errInfo += "专业名称[" + tempData.Value3 + "]不存在；";
}
else
{
@@ -381,18 +423,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
errInfo += "专业名称为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value3))
if (!string.IsNullOrEmpty(tempData.Value4))
{
Ins.NCRCode = tempData.Value3;
Ins.NCRCode = tempData.Value4;
}
else
{
errInfo += "NCR单号为必填项；";
errInfo += "文件编号为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value4))
if (!string.IsNullOrEmpty(tempData.Value5))
{
string unitIds = string.Empty;
string[] reunit = tempData.Value4.Split(',');
string[] reunit = tempData.Value5.Split(',');
foreach (string unitWork in reunit)
{
var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
@@ -412,17 +454,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
Ins.UnitWorkId = unitIds;
}
if (!string.IsNullOrEmpty(tempData.Value5))//主要内容
if (!string.IsNullOrEmpty(tempData.Value6))//主要内容
{
Ins.Contents = tempData.Value5;
Ins.Contents = tempData.Value6;
}
if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))
{
string[] strs = tempData.Value6.Trim().Split(',');
string[] strs = tempData.Value7.Trim().Split(',');
bool b = true;
foreach (var item in strs)
{
if (item != "过程监督不到位" && item != "质量缺陷" && item != "质量管理问题" && item != "不按设计要求施工" && item != "不按程序施工" && item != "成品保护不到位")
//if (item != "施工管理问题-过程监督不到位" && item != "施工管理问题-质量缺陷" && item != "施工管理问题-质量管理问题" && item != "施工管理问题-不按设计要求施工" && item != "施工管理问题-不按程序施工" && item != "施工管理问题-成品保护不到位")
//{
// errInfo += "问题类别[" + item + "]错误；";
// b = false;
//}
if (!lstProblem.Contains(item))
{
errInfo += "问题类别[" + item + "]错误；";
b = false;
@@ -430,36 +477,36 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
if (b)
{
Ins.Problem = tempData.Value6.Trim();
Ins.Problem = tempData.Value7.Trim();
}
}
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//问题原因分析
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//问题原因分析
{
Ins.ReasonAnalysis = tempData.Value7.Trim();
Ins.ReasonAnalysis = tempData.Value8.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//改进措施
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))//改进措施
{
Ins.Measure = tempData.Value8.Trim();
Ins.Measure = tempData.Value9.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
{
try
{
Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value9.Trim());
Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value10.Trim());
if (Ins.IssuedDate == null)
{
errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；";
errInfo += "下发日期[" + tempData.Value10.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；";
errInfo += "下发日期[" + tempData.Value10.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
{
string unitIds = string.Empty;
string[] reunit = tempData.Value10.Split(',');
string[] reunit = tempData.Value11.Split(',');
foreach (string unitName in reunit)
{
var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault();
@@ -478,54 +525,58 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
Ins.ReceiveUnit = unitIds;
}
if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
if (!string.IsNullOrEmpty(tempData.Value12.Trim()))//目前实施进展状况
{
if (tempData.Value11.Trim() != "整改中" && tempData.Value11.Trim() != "已闭合")
Ins.ProgressStatus = tempData.Value12.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value13.Trim()))
{
if (tempData.Value13.Trim() != "整改中" && tempData.Value13.Trim() != "已闭合")
{
errInfo += "实时状态[" + tempData.Value11.Trim() + "]错误；";
errInfo += "实时状态[" + tempData.Value13.Trim() + "]错误；";
}
else
{
Ins.ImplementationFrontState = tempData.Value11.Trim();
Ins.ImplementationFrontState = tempData.Value13.Trim();
}
}
if (!string.IsNullOrEmpty(tempData.Value12))
if (!string.IsNullOrEmpty(tempData.Value14))
{
try
{
Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value12);
Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value14);
if (Ins.ClosedDate == null)
{
errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；";
errInfo += "要求关闭日期[" + tempData.Value14.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；";
errInfo += "要求关闭日期[" + tempData.Value14.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value13))
if (!string.IsNullOrEmpty(tempData.Value15))
{
try
{
Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value13);
Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value15);
if (Ins.CompleteDate == null)
{
errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；";
errInfo += "完成日期[" + tempData.Value15.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；";
errInfo += "完成日期[" + tempData.Value15.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//责任人
if (!string.IsNullOrEmpty(tempData.Value16.Trim()))//责任人
{
Ins.ResponsibleMan = tempData.Value14.Trim();
Ins.ResponsibleMan = tempData.Value16.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value15.Trim()))//监督人
if (!string.IsNullOrEmpty(tempData.Value17.Trim()))//监督人
{
string[] strs = tempData.Value15.Trim().Split(',');
string[] strs = tempData.Value17.Trim().Split(',');
bool b = true;
string supervisor = string.Empty;
foreach (var item in strs)
@@ -549,15 +600,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
}
if (!string.IsNullOrEmpty(tempData.Value16))
if (!string.IsNullOrEmpty(tempData.Value18))
{
try
{
Ins.RemarkCode = Convert.ToInt32(tempData.Value16);
Ins.RemarkCode = Convert.ToInt32(tempData.Value18);
}
catch (Exception)
{
errInfo += "标志编号[" + tempData.Value16 + "]格式错误；";
errInfo += "标志编号[" + tempData.Value18 + "]格式错误；";
}
}
else
@@ -569,7 +620,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Ins.ProjectId = LoginProjectId;
Ins.Status = BLL.Const.Comprehensive_Compile;
Ins.CompileMan = this.CurrUser.UserId;
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value16));
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value18));
if (isExitISOValue != null) ///已存在
{
Ins.NCRManagementId = isExitISOValue.NCRManagementId;
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
+23 -15
View File
@@ -27,47 +27,55 @@
<Items>
<f:TextBox ID="txtValue1" Label="发出单位" ShowRedStar="true" Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue2" Label="专业名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue2" Label="问题来源" ShowRedStar="true" Required="true" runat="server" FocusOnPageLoad="true" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue3" Label="NCR单号" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue3" Label="专业名称" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue4" Label="单位工程名称" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue4" Label="NCR单号" ShowRedStar="true" Required="true" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue5" Label="主要内容" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue5" Label="单位工程名称" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue6" Label="问题类别" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue6" Label="主要内容" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue7" Label="原因分析" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue7" Label="问题类别" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue8" Label="改进措施" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue8" Label="原因分析" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue9" Label="下发日期" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue9" Label="改进措施" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue10" Label="接收单位" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue10" Label="下发日期" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue11" Label="实施状态" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue11" Label="接收单位" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue12" Label="要求关闭日期" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue12" Label="目前实施进展状况" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue13" Label="完成日期" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue13" Label="实施状态" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue14" Label="责任人" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue14" Label="要求关闭日期" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue15" Label="监督人" runat="server" LabelWidth="120px">
<f:TextBox ID="txtValue15" Label="完成日期" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue16" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
<f:TextBox ID="txtValue16" Label="责任人" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtValue17" Label="监督人" runat="server" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtValue18" Label="标志编号" runat="server" LabelWidth="120px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
+28
View File
@@ -58,6 +58,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtValue14.Text = dataInTemp.Value14;
this.txtValue15.Text = dataInTemp.Value15;
this.txtValue16.Text = dataInTemp.Value16;
this.txtValue17.Text = dataInTemp.Value17;
this.txtValue18.Text = dataInTemp.Value18;
this.lbErrCout.Text = dataInTemp.ToopValue;
}
@@ -257,6 +259,30 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
}
if (dataInTemp.Value17 != this.txtValue17.Text.Trim())
{
var tempValue17 = allDataInTemp.Where(x => x.Value17 == dataInTemp.Value17 || (x.Value17 == null && dataInTemp.Value17 == null));
if (tempValue17 != null)
{
foreach (var item in tempValue17)
{
item.Value17 = this.txtValue17.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
if (dataInTemp.Value18 != this.txtValue18.Text.Trim())
{
var tempValue18 = allDataInTemp.Where(x => x.Value18 == dataInTemp.Value18 || (x.Value18 == null && dataInTemp.Value18 == null));
if (tempValue18 != null)
{
foreach (var item in tempValue18)
{
item.Value18 = this.txtValue18.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
if (toopValue != null)
{
@@ -290,6 +316,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newDataInTemp.Value14 = this.txtValue14.Text.Trim();
newDataInTemp.Value15 = this.txtValue15.Text.Trim();
newDataInTemp.Value16 = this.txtValue16.Text.Trim();
newDataInTemp.Value17 = this.txtValue17.Text.Trim();
newDataInTemp.Value18 = this.txtValue18.Text.Trim();
if (!string.IsNullOrEmpty(this.TempId))
{
newDataInTemp.TempId = this.TempId;
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs
Generated
+18
View File
@@ -212,6 +212,24 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.TextBox txtValue16;
/// <summary>
/// txtValue17 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue17;
/// <summary>
/// txtValue18 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue18;
/// <summary>
/// ckAll 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
+43 -17
View File
@@ -21,23 +21,52 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtNCRCode" runat="server" Label="NCR单号" MaxLength="50" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="下发日期" ID="txtIssuedDate"
LabelAlign="Right" LabelWidth="130px">
</f:DatePicker>
<f:TextBox ID="txtNCRCode" runat="server" Label="文件编号" MaxLength="50" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
<f:NumberBox ID="txtRemarkCode" runat="server" Label="标志编号" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="130px" EnableMultiSelect="true" EnableCheckBoxSelect="true">
<f:ListItem Value="过程监督不到位" Text="过程监督不到位" />
<f:ListItem Value="质量缺陷" Text="质量缺陷" />
<f:ListItem Value="质量管理问题" Text="质量管理问题" />
<f:ListItem Value="不按设计要求施工" Text="不按设计要求施工" />
<f:ListItem Value="不按程序施工" Text="不按程序施工" />
<f:ListItem Value="成品保护不到位" Text="成品保护不到位" />
<f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" AutoSelectFirstItem="false" EmptyText="-请选择-" LabelAlign="Right" LabelWidth="130px" EnableMultiSelect="true" EnableCheckBoxSelect="true">
<f:ListItem Value="设计问题" Text="设计问题" />
<f:ListItem Value="采购问题" Text="采购问题" />
<f:ListItem Value="施工管理问题-过程监督不到位" Text="施工管理问题-过程监督不到位" />
<f:ListItem Value="施工管理问题-质量缺陷" Text="施工管理问题-质量缺陷" />
<f:ListItem Value="施工管理问题-质量管理问题" Text="施工管理问题-质量管理问题" />
<f:ListItem Value="施工管理问题-不按设计要求施工" Text="施工管理问题-不按设计要求施工" />
<f:ListItem Value="施工管理问题-不按程序施工" Text="施工管理问题-不按程序施工" />
<f:ListItem Value="施工管理问题-成品保护不到位" Text="施工管理问题-成品保护不到位" />
<f:ListItem Value="其它" Text="其它" />
</f:DropDownList>
<f:NumberBox ID="txtRemarkCode" runat="server" Label="标志编号" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
<f:DropDownList ID="ddlImplementationFrontState" runat="server" Label="实施状态" Required="true" LabelAlign="Right" LabelWidth="130px">
<f:ListItem Value="" Text="-请选择-" Selected="true" />
<f:ListItem Value="整改中" Text="整改中" />
<f:ListItem Value="已闭合" Text="已闭合" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlSource" runat="server" Label="问题来源" AutoSelectFirstItem="false" EmptyText="-请选择-" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true">
<f:ListItem Value="NCR-业主下发" Text="NCR-业主下发" />
<f:ListItem Value="NCR-监理下发" Text="NCR-监理下发" />
<f:ListItem Value="NCR-五环发布" Text="NCR-五环发布" />
<f:ListItem Value="监理通知单" Text="监理通知单" />
<f:ListItem Value="信函" Text="信函" />
<f:ListItem Value="施工联系单" Text="施工联系单" />
<f:ListItem Value="施工签证" Text="施工签证" />
<f:ListItem Value="关键事项" Text="关键事项" />
<f:ListItem Value="设计变更单" Text="设计变更单" />
<f:ListItem Value="技术核定单" Text="技术核定单" />
<f:ListItem Value="开箱检验问题清单" Text="开箱检验问题清单" />
<f:ListItem Value="其它" Text="其它" />
</f:DropDownList>
<%--<f:DropDownList ID="ddlProgressStatus" runat="server" Label="目前实施进展状况" Required="true" LabelAlign="Right" LabelWidth="130px">
<f:ListItem Value="" Text="-请选择-" Selected="true" />
<f:ListItem Value="整改中" Text="整改中" />
<f:ListItem Value="已闭合" Text="已闭合" />
</f:DropDownList>--%>
<f:TextBox ID="txtProgressStatus" runat="server" Label="实施进展状况" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -68,11 +97,8 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlImplementationFrontState" runat="server" Label="实施状态" Required="true" LabelAlign="Right" LabelWidth="130px">
<f:ListItem Value="" Text="-请选择-" Selected="true" />
<f:ListItem Value="整改中" Text="整改中" />
<f:ListItem Value="已闭合" Text="已闭合" />
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="下发日期" ID="txtIssuedDate" LabelAlign="Right" LabelWidth="130px">
</f:DatePicker>
<f:TextBox ID="txtResponsibleMan" runat="server" Label="责任人" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
+10
View File
@@ -83,6 +83,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string[] strs = nCRManagement.Problem.Split(',');
this.ddlProblem.SelectedValueArray = strs;
}
if (nCRManagement.Source != null)
{
this.ddlSource.SelectedValue = nCRManagement.Source;
}
this.txtProgressStatus.Text = nCRManagement.ProgressStatus;
this.txtMeasure.Text = nCRManagement.Measure;
this.txtRemarkCode.Text = nCRManagement.RemarkCode.HasValue ? nCRManagement.RemarkCode.ToString() : "";
@@ -172,7 +177,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.drpUnitWorkIds.Readonly = true;
//this.drpAudit.Readonly = true;
this.ddlProblem.Readonly = true;
this.ddlSource.Readonly = true;
this.txtProgressStatus.Readonly = true;
//this.btnAttach.Enabled = false;
this.txtMeasure.Readonly = true;
this.txtRemarkCode.Readonly = true;
this.drpSupervisor.Readonly = true;
}
@@ -263,6 +271,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
nCRManagement.Measure = this.txtMeasure.Text.Trim();
#endregion
nCRManagement.Source = this.ddlSource.SelectedValue;
nCRManagement.ProgressStatus = this.txtProgressStatus.Text.Trim();
if (!string.IsNullOrEmpty(this.txtIssuedDate.Text))
{
nCRManagement.IssuedDate = Convert.ToDateTime(this.txtIssuedDate.Text);
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs
Generated
+24 -6
View File
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.TextBox txtNCRCode;
/// <summary>
/// txtIssuedDate 控件。
/// txtRemarkCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtIssuedDate;
protected global::FineUIPro.NumberBox txtRemarkCode;
/// <summary>
/// ddlProblem 控件。
@@ -87,13 +87,31 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.DropDownList ddlProblem;
/// <summary>
/// txtRemarkCode 控件。
/// ddlImplementationFrontState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtRemarkCode;
protected global::FineUIPro.DropDownList ddlImplementationFrontState;
/// <summary>
/// ddlSource 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSource;
/// <summary>
/// txtProgressStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProgressStatus;
/// <summary>
/// txtContents 控件。
@@ -150,13 +168,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.DropDownList drpSupervisor;
/// <summary>
/// ddlImplementationFrontState 控件。
/// txtIssuedDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlImplementationFrontState;
protected global::FineUIPro.DatePicker txtIssuedDate;
/// <summary>
/// txtResponsibleMan 控件。
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+1 -1
View File
@@ -2649,7 +2649,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
*/
#endregion
#region 14.NCR管理情况
#region 14.现场质量问题台账情况
var NcrManagementInspection = reportItem.Where(x => x.ReType == "14").ToList();
if (NcrManagementInspection.Count > 0)
{
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+2 -2
View File
@@ -1540,8 +1540,8 @@
</f:Form>
</Items>
</f:Panel>--%>
<%--14.NCR管理情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="12.NCR管理情况" runat="server" EnableCollapse="false"
<%--14.现场质量问题台账情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="12.现场质量问题台账情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form31" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+5 -5
View File
@@ -2747,7 +2747,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//loadPipingInspection(objType);
//加载13.特种设备监检情况
//loadSpecialInspection(objType);
////加载14.NCR管理情况
////加载14.现场质量问题台账情况
//loadNcrManagementInspection(objType);
//加载15.质量巡检情况
@@ -4799,9 +4799,9 @@ from View_MonthReport_InspectionManagement a with(nolock)
*/
#endregion
#region 14.NCR管理情况 gvNcrManagementInspection方法
#region 14.现场质量问题台账情况 gvNcrManagementInspection方法
/// <summary>
/// NCR管理情况
/// 现场质量问题台账情况
/// </summary>
void loadNcrManagementInspection(string objType)
{
@@ -5809,7 +5809,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
savePipingInspection();
////保存13.特种设备监检情况
//saveSpecialInspection();
//保存14.NCR管理情况
//保存14.现场质量问题台账情况
saveNcrManagementInspection();
//保存15.质量巡检情况
@@ -6805,7 +6805,7 @@ from View_MonthReport_InspectionManagement a with(nolock)
*/
#endregion
#region 14.NCR管理情况
#region 14.现场质量问题台账情况
void saveNcrManagementInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx
+2 -2
View File
@@ -797,8 +797,8 @@
</f:Form>
</Items>
</f:Panel>
<%--14.NCR管理情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.NCR管理情况" runat="server" EnableCollapse="false"
<%--14.现场质量问题台账情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.现场质量问题台账情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form21" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
+5 -5
View File
@@ -325,7 +325,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
savePipingInspection();
//保存13.特种设备监检情况
saveSpecialInspection();
//保存14.NCR管理情况
//保存14.现场质量问题台账情况
saveNcrManagementInspection();
//保存15.质量巡检情况
@@ -456,7 +456,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
loadPipingInspection(objType);
//加载13.特种设备监检情况
loadSpecialInspection(objType);
////加载14.NCR管理情况
////加载14.现场质量问题台账情况
loadNcrManagementInspection(objType);
//加载15.质量巡检情况
@@ -1086,9 +1086,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况 gvNcrManagementInspection方法
#region 14.现场质量问题台账情况 gvNcrManagementInspection方法
/// <summary>
/// NCR管理情况
/// 现场质量问题台账情况
/// </summary>
void loadNcrManagementInspection(string objType)
{
@@ -1984,7 +1984,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况
#region 14.现场质量问题台账情况
void saveNcrManagementInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx
+2 -2
View File
@@ -1355,8 +1355,8 @@
</f:Form>
</Items>
</f:Panel>
<%--14.NCR管理情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.NCR管理情况" runat="server" EnableCollapse="false"
<%--14.现场质量问题台账情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.现场质量问题台账情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form31" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
+5 -5
View File
@@ -263,7 +263,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
loadPipingInspection(objType);
//加载13.特种设备监检情况
loadSpecialInspection(objType);
////加载14.NCR管理情况
////加载14.现场质量问题台账情况
loadNcrManagementInspection();
//加载15.质量巡检情况
@@ -1998,9 +1998,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况 gvNcrManagementInspection方法
#region 14.现场质量问题台账情况 gvNcrManagementInspection方法
/// <summary>
/// NCR管理情况
/// 现场质量问题台账情况
/// </summary>
void loadNcrManagementInspection()
{
@@ -2584,7 +2584,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
savePipingInspection();
//保存13.特种设备监检情况
saveSpecialInspection();
//保存14.NCR管理情况
//保存14.现场质量问题台账情况
saveNcrManagementInspection();
//保存15.质量巡检情况
@@ -3124,7 +3124,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况
#region 14.现场质量问题台账情况
void saveNcrManagementInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs
+1 -1
View File
@@ -2613,7 +2613,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况
#region 14.现场质量问题台账情况
var NcrManagementInspection = reportItem.Where(x => x.ReType == "14").ToList();
if (NcrManagementInspection.Count > 0)
{
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+2 -2
View File
@@ -1524,8 +1524,8 @@
</f:Form>
</Items>
</f:Panel>
<%--14.NCR管理情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.NCR管理情况" runat="server" EnableCollapse="false"
<%--14.现场质量问题台账情况--%>
<f:Panel ID="Pnl14" IsFluid="true" Title="14.现场质量问题台账情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form31" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+5 -5
View File
@@ -2717,7 +2717,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// loadPipingInspection(objType);
//加载13.特种设备监检情况
// loadSpecialInspection(objType);
////加载14.NCR管理情况
////加载14.现场质量问题台账情况
// loadNcrManagementInspection(objType);
//加载15.质量巡检情况
@@ -4752,9 +4752,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况 gvNcrManagementInspection方法
#region 14.现场质量问题台账情况 gvNcrManagementInspection方法
/// <summary>
/// NCR管理情况
/// 现场质量问题台账情况
/// </summary>
void loadNcrManagementInspection(string objType)
{
@@ -5741,7 +5741,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
savePipingInspection();
//保存13.特种设备监检情况
saveSpecialInspection();
//保存14.NCR管理情况
//保存14.现场质量问题台账情况
saveNcrManagementInspection();
//保存15.质量巡检情况
@@ -6733,7 +6733,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 14.NCR管理情况
#region 14.现场质量问题台账情况
void saveNcrManagementInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
SGGL/FineUIPro.Web/File/Excel/DataIn/现场质量问题台账导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSCheckData.aspx
+1 -1
View File
@@ -101,7 +101,7 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:GroupField HeaderText="NCR管理" TextAlign="Center">
<f:GroupField HeaderText="现场质量问题台账" TextAlign="Center">
<Columns>
<f:RenderField Width="100px" ColumnID="Value11" DataField="Value11"
FieldType="String" HeaderText="本月" TextAlign="Center" HeaderTextAlign="Center">
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+2 -2
View File
@@ -27,7 +27,7 @@
<TreeNode id="aa55fad1-6c51-43f5-8c99-3c6aaae79118" Text="施工机具/计量器具报验管理" NavigateUrl="CQMS/Comprehensive/InspectionMachine.aspx"></TreeNode>
<TreeNode id="9ac06df6-b91a-42bb-9a51-5cd59d8733a9" Text="特种设备管理" NavigateUrl="CQMS/Comprehensive/SpecialEquipment.aspx"></TreeNode>
<TreeNode id="49b87812-c07d-4b0e-9909-960e5cd822c7" Text="压力管道管理" NavigateUrl="CQMS/Comprehensive/PressurePipe.aspx"></TreeNode>
<TreeNode id="7e628f48-385f-4d52-8063-d0f812514316" Text="NCR管理" NavigateUrl="CQMS/Comprehensive/NCRManagement.aspx"></TreeNode>
<TreeNode id="7e628f48-385f-4d52-8063-d0f812514316" Text="现场质量问题台账" NavigateUrl="CQMS/Comprehensive/NCRManagement.aspx"></TreeNode>
<TreeNode id="E7C8C938-661C-438F-852F-F0A4C285306B" Text="资料收发文登记记录" NavigateUrl="CQMS/Comprehensive/DataReceivingDoc.aspx"></TreeNode>
<TreeNode id="d8de4143-b680-44cf-9a78-acd3d49a8d00" Text="图纸收发记录" NavigateUrl="CQMS/Comprehensive/DesignDrawings.aspx"></TreeNode>
<TreeNode id="CFD19410-DF80-494A-A2DD-D23A03438742" Text="培训记录" NavigateUrl="CQMS/Comprehensive/TrainingRecords.aspx"></TreeNode>
@@ -46,7 +46,7 @@
</TreeNode>
<TreeNode id="7ecf0229-8a0b-40ce-8b04-e556f7bd3394" Text="质量报表管理" NavigateUrl=""><TreeNode id="69327975-cd18-4443-8d2c-c8b6e31be5ef" Text="现场检查情况" NavigateUrl="CQMS/ManageReport/CheckStatisc.aspx"></TreeNode>
<TreeNode id="e58366b4-70a5-41d1-a26f-0ab4a234004c" Text="现场焊接无损检测情况" NavigateUrl="CQMS/ManageReport/HJGLStatisc.aspx"></TreeNode>
<TreeNode id="0c65cad2-2279-48fc-b78c-82bfbe01f037" Text="NCR统计" NavigateUrl="CQMS/ManageReport/NCRStatisc.aspx"></TreeNode>
<TreeNode id="0c65cad2-2279-48fc-b78c-82bfbe01f037" Text="现场质量问题台账统计" NavigateUrl="CQMS/ManageReport/NCRStatisc.aspx"></TreeNode>
<TreeNode id="227d640a-9494-41ce-95bf-748dd59e986f" Text="设计变更单统计" NavigateUrl="CQMS/ManageReport/DesignChangeStatisc.aspx"></TreeNode>
<TreeNode id="51ee983f-085e-4f02-b819-cab049d9cc26" Text="项目质量周报" NavigateUrl="CQMS/ManageReport/WeekReport.aspx"></TreeNode>
<TreeNode id="51ee983f-085e-4f02-b819-cab049d9cc27" Text="项目质量周报（新）" NavigateUrl="CQMS/ManageReportNew/WeekReport.aspx"></TreeNode>
SGGL/Model/Model.cs
+48
View File
@@ -100851,6 +100851,10 @@ namespace Model
private string _ReasonAnalysis;
private string _Source;
private string _ProgressStatus;
private EntityRef<Sys_User> _Sys_User;
private EntityRef<Base_CNProfessional> _Base_CNProfessional;
@@ -100907,6 +100911,10 @@ namespace Model
partial void OnSupervisorChanged();
partial void OnReasonAnalysisChanging(string value);
partial void OnReasonAnalysisChanged();
partial void OnSourceChanging(string value);
partial void OnSourceChanged();
partial void OnProgressStatusChanging(string value);
partial void OnProgressStatusChanged();
#endregion
public Comprehensive_NCRManagement()
@@ -101374,6 +101382,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Source", DbType="NVarChar(100)")]
public string Source
{
get
{
return this._Source;
}
set
{
if ((this._Source != value))
{
this.OnSourceChanging(value);
this.SendPropertyChanging();
this._Source = value;
this.SendPropertyChanged("Source");
this.OnSourceChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProgressStatus", DbType="NVarChar(100)")]
public string ProgressStatus
{
get
{
return this._ProgressStatus;
}
set
{
if ((this._ProgressStatus != value))
{
this.OnProgressStatusChanging(value);
this.SendPropertyChanging();
this._ProgressStatus = value;
this.SendPropertyChanged("ProgressStatus");
this.OnProgressStatusChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
public Sys_User Sys_User
{
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+14 -14
View File
@@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-12-24T11:02:35.3684081Z||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;</History>
<History>True|2026-01-19T06:30:45.4370000Z||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>01/07/2026 10:21:13</publishTime>
<publishTime>01/19/2026 14:30:43</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>01/07/2026 10:21:13</publishTime>
<publishTime>01/19/2026 14:30:43</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>01/07/2026 10:20:54</publishTime>
<publishTime>01/19/2026 14:30:21</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>01/07/2026 10:20:54</publishTime>
<publishTime>01/19/2026 14:30:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,13 +128,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>01/07/2026 10:20:48</publishTime>
<publishTime>01/19/2026 14:30:13</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>01/07/2026 10:20:48</publishTime>
<publishTime>01/19/2026 14:30:13</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>12/09/2025 18:19:15</publishTime>
<publishTime>01/14/2026 20:19:17</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/18/2021 04:03:36</publishTime>
@@ -332,7 +332,7 @@
<publishTime>04/15/2020 06:49:20</publishTime>
</File>
<File Include="bin/System.IO.Compression.dll">
<publishTime>12/09/2025 18:19:15</publishTime>
<publishTime>01/14/2026 20:19:17</publishTime>
</File>
<File Include="bin/System.Memory.dll">
<publishTime>02/19/2020 18:05:18</publishTime>
@@ -347,7 +347,7 @@
<publishTime>02/19/2020 18:05:16</publishTime>
</File>
<File Include="bin/System.ValueTuple.dll">
<publishTime>12/09/2025 18:19:15</publishTime>
<publishTime>01/14/2026 20:19:17</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
<publishTime>11/28/2018 20:58:44</publishTime>
@@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>01/07/2026 10:20:55</publishTime>
<publishTime>01/19/2026 14:30:22</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>01/07/2026 10:20:55</publishTime>
<publishTime>01/19/2026 14:30:22</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>01/07/2026 10:20:55</publishTime>
<publishTime>01/19/2026 14:30:22</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>01/07/2026 10:20:56</publishTime>
<publishTime>01/19/2026 14:30:23</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>
SGGL/WebAPI/WebAPI.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />