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

1、logo调整 

2、质量管理NCR管理补充字段问题原因分析
This commit is contained in:
夏菊 2025-10-22 16:38:02 +08:00
parent 39a3acd0d2
commit 46f56a27cb
27 changed files with 287 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DataBase/版本日志/SUBQHSE_V2025-10-22-xiaj.sql Normal file
View File

@ -0,0 +1,10 @@
--质量管理NCR管理补充字段问题原因分析
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Comprehensive_NCRManagement' AND COLUMN_NAME = 'ReasonAnalysis')
BEGIN
ALTER TABLE Comprehensive_NCRManagement ADD ReasonAnalysis nvarchar(1000);
END
GO

3
SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
View File

@ -60,6 +60,7 @@ namespace BLL
ProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalId select y.ProfessionalName).FirstOrDefault(),
x.NCRCode,
x.Contents,
x.ReasonAnalysis,
x.IssuedDate,
ReceiveUnit = x.ReceiveUnit!= null ? BLL.UnitService.getUnitNamesUnitIds(x.ReceiveUnit) : null,
UnitWorkName = x.UnitWorkId != null ? BLL.UnitWorkService.GetUnitWorkName(x.UnitWorkId) : null,
@ -106,6 +107,7 @@ namespace BLL
newNCRManagement.CNProfessionalId = nCRManagement.CNProfessionalId;
newNCRManagement.NCRCode = nCRManagement.NCRCode;
newNCRManagement.Contents = nCRManagement.Contents;
newNCRManagement.ReasonAnalysis = nCRManagement.ReasonAnalysis;
newNCRManagement.IssuedDate = nCRManagement.IssuedDate;
newNCRManagement.ReceiveUnit = nCRManagement.ReceiveUnit;
newNCRManagement.ClosedDate = nCRManagement.ClosedDate;
@ -139,6 +141,7 @@ namespace BLL
newNCRManagement.CNProfessionalId = nCRManagement.CNProfessionalId;
newNCRManagement.NCRCode = nCRManagement.NCRCode;
newNCRManagement.Contents = nCRManagement.Contents;
newNCRManagement.ReasonAnalysis = nCRManagement.ReasonAnalysis;
newNCRManagement.IssuedDate = nCRManagement.IssuedDate;
newNCRManagement.ReceiveUnit = nCRManagement.ReceiveUnit;
newNCRManagement.ClosedDate = nCRManagement.ClosedDate;

3
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
View File

@ -67,6 +67,9 @@
<f:RenderField ColumnID="Problem" DataField="Problem" FieldType="String" HeaderText="问题类别" TextAlign="Left"
HeaderTextAlign="Center" Width="280px">
</f:RenderField>
<f:RenderField ColumnID="ReasonAnalysis" DataField="ReasonAnalysis" FieldType="String" HeaderText="原因分析" TextAlign="Left"
HeaderTextAlign="Center" Width="280px">
</f:RenderField>
<f:RenderField ColumnID="Measure" DataField="Measure" FieldType="String" HeaderText="改进措施" TextAlign="Left"
HeaderTextAlign="Center" Width="280px">
</f:RenderField>

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
View File

@ -29,14 +29,14 @@ namespace FineUIPro.Web.Comprehensive
}
public void BindGrid()
{
string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,C.Problem,C.Measure,C.IssuedDate, C.ReceiveUnit,C.Status,
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.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
left join Base_Unit u on u.UnitId = C.SendUnit
left join Sys_User su on su.UserId = C.Supervisor
where C.ProjectId = @ProjectId";
where C.ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (sdrpUnitId.SelectedValue != BLL.Const._Null)
@ -469,14 +469,18 @@ namespace FineUIPro.Web.Comprehensive
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Measure);//改进措施
cell.SetCellValue(item.ReasonAnalysis);//问题原因分析
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
cell.SetCellValue(item.Measure);//改进措施
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
cell = row.CreateCell(9);
cell.CellStyle = cellStyle;
string receiveUnitName = string.Empty;
if (!string.IsNullOrEmpty(item.ReceiveUnit))
{
@ -484,7 +488,7 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(receiveUnitName);//接收单位
cell = row.CreateCell(9);
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
string state = string.Empty;
if (!string.IsNullOrEmpty(item.ImplementationFrontState))
@ -493,19 +497,19 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(state);//实施状态
cell = row.CreateCell(10);
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
cell = row.CreateCell(11);
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
cell = row.CreateCell(12);
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ResponsibleMan);//责任人
cell = row.CreateCell(13);
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
string supervisorName = string.Empty;
if (!string.IsNullOrEmpty(item.Supervisor))
@ -514,7 +518,7 @@ namespace FineUIPro.Web.Comprehensive
}
cell.SetCellValue(supervisorName);//监督人
cell = row.CreateCell(14);
cell = row.CreateCell(15);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号

21
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
View File

@ -97,31 +97,34 @@
<f:RenderField Width="90px" HeaderText="问题类别" ColumnID="Value6" DataField="Value6" SortField="Value6"
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="Value7" DataField="Value7" SortField="Value7"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="下发日期" ColumnID="Value8" DataField="Value8" SortField="Value8"
<f:RenderField Width="120px" HeaderText="改进措施" ColumnID="Value8" DataField="Value8" SortField="Value8"
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="Value9" DataField="Value9" SortField="Value9"
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="Value10" DataField="Value10" SortField="Value10"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value11" DataField="Value11" SortField="Value11"
<f:RenderField Width="100px" HeaderText="实施状态" ColumnID="Value11" DataField="Value11" SortField="Value11"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="要求关闭日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value12" DataField="Value12" SortField="Value12"
<f:RenderField Width="110px" HeaderText="完成日期" ColumnID="Value13" DataField="Value13" SortField="Value13"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value13" DataField="Value13" SortField="Value13"
<f:RenderField Width="100px" HeaderText="责任人" ColumnID="Value14" DataField="Value14" SortField="Value14"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value14" DataField="Value14" SortField="Value14"
<f:RenderField Width="80px" HeaderText="监督人" ColumnID="Value15" DataField="Value15" SortField="Value15"
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="Value16" DataField="Value16" SortField="Value16"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>

83
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
View File

@ -248,6 +248,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString();
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();
BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
}
@ -432,29 +433,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Ins.Problem = tempData.Value6.Trim();
}
}
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//改进措施
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//问题原因分析
{
Ins.Measure = tempData.Value7.Trim();
Ins.ReasonAnalysis = tempData.Value7.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//改进措施
{
Ins.Measure = tempData.Value8.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
{
try
{
Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value8.Trim());
Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value9.Trim());
if (Ins.IssuedDate == null)
{
errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
{
string unitIds = string.Empty;
string[] reunit = tempData.Value9.Split(',');
string[] reunit = tempData.Value10.Split(',');
foreach (string unitName in reunit)
{
var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault();
@ -473,54 +478,54 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
Ins.ReceiveUnit = unitIds;
}
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
{
if (tempData.Value10.Trim() != "整改中" && tempData.Value10.Trim() != "已闭合")
if (tempData.Value11.Trim() != "整改中" && tempData.Value11.Trim() != "已闭合")
{
errInfo += "实时状态[" + tempData.Value10.Trim() + "]错误；";
errInfo += "实时状态[" + tempData.Value11.Trim() + "]错误；";
}
else
{
Ins.ImplementationFrontState = tempData.Value10.Trim();
}
}
if (!string.IsNullOrEmpty(tempData.Value11))
{
try
{
Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value11);
if (Ins.ClosedDate == null)
{
errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
Ins.ImplementationFrontState = tempData.Value11.Trim();
}
}
if (!string.IsNullOrEmpty(tempData.Value12))
{
try
{
Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value12);
if (Ins.CompleteDate == null)
Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value12);
if (Ins.ClosedDate == null)
{
errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value13.Trim()))//责任人
if (!string.IsNullOrEmpty(tempData.Value13))
{
Ins.ResponsibleMan = tempData.Value13.Trim();
try
{
Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value13);
if (Ins.CompleteDate == null)
{
errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；";
}
}
catch (Exception)
{
errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//监督人
if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//责任人
{
string[] strs = tempData.Value14.Trim().Split(',');
Ins.ResponsibleMan = tempData.Value14.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value15.Trim()))//监督人
{
string[] strs = tempData.Value15.Trim().Split(',');
bool b = true;
string supervisor = string.Empty;
foreach (var item in strs)
@ -544,15 +549,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
}
if (!string.IsNullOrEmpty(tempData.Value15))
if (!string.IsNullOrEmpty(tempData.Value16))
{
try
{
Ins.RemarkCode = Convert.ToInt32(tempData.Value15);
Ins.RemarkCode = Convert.ToInt32(tempData.Value16);
}
catch (Exception)
{
errInfo += "标志编号[" + tempData.Value15 + "]格式错误；";
errInfo += "标志编号[" + tempData.Value16 + "]格式错误；";
}
}
else
@ -564,7 +569,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.Value15));
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value16));
if (isExitISOValue != null) ///已存在
{
Ins.NCRManagementId = isExitISOValue.NCRManagementId;

25
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
View File

@ -33,7 +33,6 @@
</f:TextBox>
<f:TextBox ID="txtValue4" Label="单位工程名称" runat="server" LabelWidth="120px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@ -42,32 +41,38 @@
</f:TextBox>
<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" Required="true" ShowRedStar="true">
<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>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox ID="ckAll" runat="server" Checked="true" Text="是否批量修改"></f:CheckBox>
</Items>
</f:FormRow>

14
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
View File

@ -57,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtValue13.Text = dataInTemp.Value13;
this.txtValue14.Text = dataInTemp.Value14;
this.txtValue15.Text = dataInTemp.Value15;
this.txtValue16.Text = dataInTemp.Value16;
this.lbErrCout.Text = dataInTemp.ToopValue;
}
@ -244,6 +245,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
}
if (dataInTemp.Value16 != this.txtValue16.Text.Trim())
{
var tempValue16 = allDataInTemp.Where(x => x.Value16 == dataInTemp.Value16 || (x.Value16 == null && dataInTemp.Value16 == null));
if (tempValue16 != null)
{
foreach (var item in tempValue16)
{
item.Value16 = this.txtValue16.Text.Trim();
Funs.DB.SubmitChanges();
}
}
}
var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
if (toopValue != null)
{
@ -276,6 +289,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newDataInTemp.Value13 = this.txtValue13.Text.Trim();
newDataInTemp.Value14 = this.txtValue14.Text.Trim();
newDataInTemp.Value15 = this.txtValue15.Text.Trim();
newDataInTemp.Value16 = this.txtValue16.Text.Trim();
if (!string.IsNullOrEmpty(this.TempId))
{
newDataInTemp.TempId = this.TempId;

15
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive {
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class NCRManagementDataInNewEdit {
public partial class NCRManagementDataInNewEdit
{
/// <summary>
/// form1 控件。
@ -201,6 +203,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.TextBox txtValue15;
/// <summary>
/// txtValue16 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtValue16;
/// <summary>
/// ckAll 控件。
/// </summary>

32
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
View File

@ -29,15 +29,15 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="130px" EnableMultiSelect="true" EnableCheckBoxSelect="true">
<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: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: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>
@ -45,7 +45,12 @@
<f:TextArea ID="txtContents" runat="server" Label="主要内容" MaxLength="500" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtReasonAnalysis" runat="server" Label="问题原因分析" MaxLength="500" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtMeasure" runat="server" Label="改进措施" MaxLength="1000" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
</Items>
@ -63,10 +68,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlImplementationFrontState" runat="server" Label="实施状态" Required="true" LabelAlign="Right" LabelWidth="130px">
<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:ListItem Value="已闭合" Text="已闭合" />
</f:DropDownList>
<f:TextBox ID="txtResponsibleMan" runat="server" Label="责任人" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
</Items>
@ -94,7 +99,7 @@
</f:Panel>
</Items>
</f:FormRow>
<%-- <f:FormRow MarginTop="10px">
<%-- <f:FormRow MarginTop="10px">
<Items>
<f:DropDownList runat="server" Width="300px" Label="专业工程师确认" LabelWidth="130px" ID="drpAudit" ShowRedStar="true" Required="true" EmptyText="--请选择--">
</f:DropDownList>
@ -120,17 +125,16 @@
</Items>
</f:FormRow>--%>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
</f:Button>
<%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
<%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
</f:Button>--%>
</Items>
</f:Toolbar>

11
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
View File

@ -40,9 +40,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.UnitService.InitAllUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, true);
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpSupervisor, this.CurrUser.LoginProjectId, BLL.Const.UnitId_CWCEC, false);//监督人
//LoadAuditSelect();
//this.agree.Hidden = true;
//this.options.Hidden = true;
this.NCRManagementId = Request.Params["NCRManagementId"];
Model.Comprehensive_NCRManagement nCRManagement = BLL.NCRManagementService.GetNCRManagementById(this.NCRManagementId);
@ -60,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtNCRCode.Text = nCRManagement.NCRCode;
this.txtContents.Text = nCRManagement.Contents;
this.txtReasonAnalysis.Text = nCRManagement.ReasonAnalysis;
if (nCRManagement.IssuedDate != null)
{
this.txtIssuedDate.Text = string.Format("{0:yyyy-MM-dd}", nCRManagement.IssuedDate);
@ -164,6 +162,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtCompleteDate.Readonly = true;
this.drpCNProfessionalId.Readonly = true;
this.txtContents.Readonly = true;
this.txtReasonAnalysis.Readonly = true;
this.ddlImplementationFrontState.Readonly = true;
this.txtIssuedDate.Readonly = true;
this.txtNCRCode.Readonly = true;
@ -215,6 +214,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Alert.ShowInTop("请选择发出单位！", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(this.txtReasonAnalysis.Text.Trim()))
{
Alert.ShowInTop("请填写问题原因分析！", MessageBoxIcon.Warning);
return;
}
if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
@ -243,6 +247,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
nCRManagement.NCRCode = this.txtNCRCode.Text.Trim();
nCRManagement.Contents = this.txtContents.Text.Trim();
nCRManagement.ReasonAnalysis = this.txtReasonAnalysis.Text.Trim();
#region 新增2024-03-29
string problem = string.Empty;

15
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive {
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class NCRManagementEdit {
public partial class NCRManagementEdit
{
/// <summary>
/// form1 控件。
@ -102,6 +104,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.TextArea txtContents;
/// <summary>
/// txtReasonAnalysis 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtReasonAnalysis;
/// <summary>
/// txtMeasure 控件。
/// </summary>

10
SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementDataIn.aspx.cs
View File

@ -179,7 +179,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl
if (string.IsNullOrEmpty(code))
{
errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试压包编号", Reason = "此项为必填项！" });
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试压包编号", Reason = "此项为必填项！" });
}
else
{
var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementCode == code);
if (q != null)
{
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "试压包编号", Reason = $"试压包编号（{code}）已存在！" });
}
}
if (!string.IsNullOrEmpty(unitWorkName))
{

21
SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagementEdit.aspx.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
namespace FineUIPro.Web.CQMS.ProcessControl
{
public partial class TestPackageManagementEdit :PageBase
public partial class TestPackageManagementEdit : PageBase
{
#region 定义变量
/// <summary>
@ -72,14 +72,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpUnitWork.SelectedValue==BLL.Const._Null)
if (this.drpUnitWork.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择单位工程名称！", MessageBoxIcon.Warning);
return;
}
string code = this.txtTestPackageManagementCode.Text.Trim();
if (string.IsNullOrWhiteSpace(code))
{
Alert.ShowInTop("请填写试压包编号！", MessageBoxIcon.Warning);
return;
}
else
{
var q = Funs.DB.ProcessControl_TestPackageManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TestPackageManagementCode == code);
if (q != null)
{
Alert.ShowInTop("试压包编号已存在！", MessageBoxIcon.Warning);
return;
}
}
Model.ProcessControl_TestPackageManagement testPackageManagement = new Model.ProcessControl_TestPackageManagement();
testPackageManagement.ProjectId = this.CurrUser.LoginProjectId;
testPackageManagement.TestPackageManagementCode = this.txtTestPackageManagementCode.Text.Trim();
testPackageManagement.TestPackageManagementCode = code;
if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
{
testPackageManagement.UnitWorkId = this.drpUnitWork.SelectedValue;

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/NCR管理导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/管道试压包管理导入模板.xls
View File

Binary file not shown.

8
SGGL/FineUIPro.Web/Login.aspx
View File

@ -14,20 +14,20 @@
src="./images/login.png"
style="height: 100%; left: 0px; top: 0px; bottom: 0px; position: absolute; display: none;" />--%>
<img alt=""
src="res/index/images/iconlogo.png"
src="res/index/images/iconlogo.png?v2"
style="height: auto;width:300px; left: 100px; top: 60px; position: absolute;" />
<div class="bi-flex-center-adapt-layout login-area"
style="width: 23%; right: 10%; top: 0px; bottom: 0px; position: absolute;">
<!-- <div class="bi-absolute-layout edit-area" height: 440px;-->
<div class="bi-absolute-layout "
style="width: 100%; height: 420px; position: relative; flex-shrink: 0; margin: 0px;">
style="width: 100%; height: 430px; position: relative; flex-shrink: 0; margin: 0px;">
<div class="bi-horizon-auto-layout"
style="height: 100px; left: 0px; right: 0px; top: 30px; position: absolute;">
<div class="bi-flex-center-adapt-layout" style="position: relative; margin: 0px auto;">
<img
class="bi-single bi-img display-block"
src="res/index/images/logo.png"
style="width: auto; height: 50px; position: relative; flex-shrink: 0; margin: 0px 10px;">
src="res/index/images/logo.png?v=2025"
style="width: 90%; height: 60px; position: relative; flex-shrink: 0; margin: 0px 10px;">
</div>
<!-- <div class="bi-single bi-label dec-login-visual-title bi-text"
style="height: 24px; line-height: 24px; text-align: center; white-space: nowrap; text-overflow: ellipsis; position: relative; margin: 5px auto 0px;">

2
SGGL/FineUIPro.Web/WorkBench.aspx
View File

@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>工作台</title>
<link href="res/largescreen/css/reset1.css" rel="stylesheet" />
<link href="res/largescreen/css/userPage.css" rel="stylesheet" />
<link href="res/largescreen/css/userPage.css?v=2025" rel="stylesheet" />
<script src="res/largescreen/libs/flex.js"></script>
<script src="res/largescreen/libs/jquery.js"></script>
<link href="res/css/company.css" rel="stylesheet" />

4
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -108,7 +108,7 @@
</div>
<span></span>
<div class="inner-box">
<div style="font-size: .14rem;color: #DADADA;width:40px">
<div style="font-size: .14rem;color: #DADADA;width:50px">
<asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompletedUnderConstruction %>" />
</div>
<div style="font-size: .25rem;color: #FEB185;"><%=CompletedNum %></div>
@ -149,7 +149,7 @@
</div>
<span></span>
<div class="inner-box">
<div style="font-size: .14rem;color: #DADADA; width:40px">
<div style="font-size: .14rem;color: #DADADA; width:50px">
<asp:Literal runat="server" Text="<%$ Resources:Lan,ApprovalCompletedUnderConstruction %>" />
</div>
<div style="font-size: .25rem;color: #FEB185;"><%=SuperCompletedNum %></div>

BIN
SGGL/FineUIPro.Web/res/index/images/iconlogo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 61 KiB

BIN
SGGL/FineUIPro.Web/res/index/images/iconlogo1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 67 KiB

BIN
SGGL/FineUIPro.Web/res/index/images/logo - 副本.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
SGGL/FineUIPro.Web/res/index/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 10 KiB

6
SGGL/FineUIPro.Web/res/largescreen/css/userPage.css
View File

@ -17,11 +17,11 @@
.z-head>.z-logo {
height: 100%;
padding-left: 2.1625rem;
background-image: url(../images/logo.png);
padding-left: 3.3rem;
background-image: url(../images/logo.png?v=2025);
background-repeat: no-repeat;
background-position: left center;
background-size: 2.1125rem .65rem;
background-size: 3.2rem .65rem;
}
.z-head>.z-logo>.z-tit {

BIN
SGGL/FineUIPro.Web/res/largescreen/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 61 KiB

BIN
SGGL/FineUIPro.Web/res/largescreen/images/logo1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

28
SGGL/Model/Model.cs
View File

@ -100366,6 +100366,8 @@ namespace Model
private string _Supervisor;
private string _ReasonAnalysis;
private EntityRef<Sys_User> _Sys_User;
private EntityRef<Base_CNProfessional> _Base_CNProfessional;
@ -100420,6 +100422,8 @@ namespace Model
partial void OnRemarkCodeChanged();
partial void OnSupervisorChanging(string value);
partial void OnSupervisorChanged();
partial void OnReasonAnalysisChanging(string value);
partial void OnReasonAnalysisChanged();
#endregion
public Comprehensive_NCRManagement()
@ -100867,6 +100871,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReasonAnalysis", DbType="NVarChar(1000)")]
public string ReasonAnalysis
{
get
{
return this._ReasonAnalysis;
}
set
{
if ((this._ReasonAnalysis != value))
{
this.OnReasonAnalysisChanging(value);
this.SendPropertyChanging();
this._ReasonAnalysis = value;
this.SendPropertyChanged("ReasonAnalysis");
this.OnReasonAnalysisChanged();
}
}
}
[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
{
@ -134179,7 +134203,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(500)")]
public string Description
{
get
@ -429911,7 +429935,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(500)")]
public string Description
{
get