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

20240701 修改NCR

Browse Source
This commit is contained in:
毕文静
2024-07-01 14:09:40 +08:00
parent 4b4f52d903
commit 188c6bf3c3
14 changed files with 328 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+6 -3
View File
@@ -53,14 +53,14 @@
<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"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
<f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
<f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
HeaderTextAlign="Center" Width="280px">
</f:RenderField>
@@ -89,6 +89,9 @@
</f:RenderField>
<f:RenderField ColumnID="ResponsibleMan" DataField="ResponsibleMan" FieldType="String" HeaderText="责任人" TextAlign="Center"
HeaderTextAlign="Center" Width="110px">
</f:RenderField>
<f:RenderField ColumnID="SupervisorName" DataField="SupervisorName" FieldType="String" HeaderText="监督人" TextAlign="Center"
HeaderTextAlign="Center" Width="110px">
</f:RenderField>
<%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
+26 -16
View File
@@ -29,12 +29,13 @@ namespace FineUIPro.Web.Comprehensive
}
public void BindGrid()
{
string strSql = @"select NCRManagementId, ProjectId, SendUnit, NCRCode, Contents,Problem,Measure,IssuedDate, ReceiveUnit,Status,
ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState,
CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName,C.RemarkCode
string strSql = @"select C.NCRManagementId, C.ProjectId, C.SendUnit, C.NCRCode, C.Contents,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";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -417,11 +418,16 @@ namespace FineUIPro.Web.Comprehensive
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.Contents);//主要内容
string unitWorkName = string.Empty;
if (!string.IsNullOrEmpty(item.UnitWorkId))
{
unitWorkName = ConvertUnitWork(item.UnitWorkId);
}
cell.SetCellValue(unitWorkName);//单位工程
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
cell.SetCellValue(item.Contents);//主要内容
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
@@ -433,13 +439,8 @@ namespace FineUIPro.Web.Comprehensive
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
string unitWorkName = string.Empty;
if (!string.IsNullOrEmpty(item.UnitWorkId))
{
unitWorkName = ConvertUnitWork(item.UnitWorkId);
}
cell.SetCellValue(unitWorkName);//单位工程
cell.SetCellValue(item.IssuedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.IssuedDate) : "");//下发日期
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
string receiveUnitName = string.Empty;
@@ -460,18 +461,27 @@ namespace FineUIPro.Web.Comprehensive
cell = row.CreateCell(10);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ResponsibleMan);//责任人
cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
cell = row.CreateCell(11);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.ClosedDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.ClosedDate) : "");//要求封闭日期
cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
cell = row.CreateCell(12);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.CompleteDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CompleteDate) : "");//完成日期
cell.SetCellValue(item.ResponsibleMan);//责任人
cell = row.CreateCell(13);
cell.CellStyle = cellStyle;
string supervisorName = string.Empty;
if (!string.IsNullOrEmpty(item.Supervisor))
{
supervisorName = BLL.UserService.GetUserNameByUserId(item.Supervisor);
}
cell.SetCellValue(supervisorName);//监督人
cell = row.CreateCell(14);
cell.CellStyle = cellStyle;
cell.SetCellValue(item.RemarkCode.HasValue ? item.RemarkCode.ToString() : "");//标志编号
i++;
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
+72 -46
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 14);
AddDatasetToSQL(ds.Tables[0], 15);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -178,6 +178,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
&& x.SuperUnitWork == null
select x;
var users = from x in Funs.DB.Project_ProjectUser
join y in Funs.DB.Sys_User on x.UserId equals y.UserId
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitId == BLL.Const.UnitId_CWCEC
select y;
for (int i = 1; i < ir; i++)
{
string row0 = pds.Rows[i][0].ToString();
@@ -214,16 +220,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "NCR单号" + "," + "此项为必填项！" + "|";
}
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
string row3 = pds.Rows[i][3].ToString();
if (!string.IsNullOrEmpty(row3))
{
try
string[] reunit = row3.Split(',');
foreach (string unitWork in reunit)
{
DateTime date = Convert.ToDateTime(row4.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "下发日期" + "," + "[" + row4 + "]错误！" + "|";
var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
}
}
}
@@ -239,17 +246,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string row7 = pds.Rows[i][7].ToString();
if (!string.IsNullOrEmpty(row7))
{
string[] reunit = row7.Split(',');
foreach (string unitWork in reunit)
try
{
var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
}
DateTime date = Convert.ToDateTime(row7.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "下发日期" + "," + "[" + row7 + "]错误！" + "|";
}
}
string row8 = pds.Rows[i][8].ToString();
if (!string.IsNullOrEmpty(row8))
{
@@ -273,6 +280,19 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
string row10 = pds.Rows[i][10].ToString();
if (!string.IsNullOrEmpty(row10))
{
try
{
DateTime date = Convert.ToDateTime(row10.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row10 + "]错误！" + "|";
}
}
string row11 = pds.Rows[i][11].ToString();
if (!string.IsNullOrEmpty(row11))
{
@@ -282,25 +302,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row11 + "]错误！" + "|";
}
}
string row12 = pds.Rows[i][12].ToString();
if (!string.IsNullOrEmpty(row12))
{
try
{
DateTime date = Convert.ToDateTime(row12.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row12 + "]错误！" + "|";
result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row11 + "]错误！" + "|";
}
}
string row13 = pds.Rows[i][13].ToString();
if (string.IsNullOrEmpty(row13))
if (!string.IsNullOrEmpty(row13))
{
var u = users.Where(x => x.UserName == row13).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "监督人" + "," + "[" + row13 + "]不存在！" + "|";
}
}
string row14 = pds.Rows[i][14].ToString();
if (string.IsNullOrEmpty(row14))
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
}
@@ -308,11 +325,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
try
{
int t = Convert.ToInt32(row13);
int t = Convert.ToInt32(row14);
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row13 + "]错误！" + "|";
result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row14 + "]错误！" + "|";
}
}
}
@@ -420,7 +437,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 14);
AddDatasetToSQL2(ds.Tables[0], 15);
}
catch (Exception ex)
{
@@ -464,13 +481,19 @@ namespace FineUIPro.Web.CQMS.Comprehensive
&& x.SuperUnitWork == null
select x;
var users = from x in Funs.DB.Project_ProjectUser
join y in Funs.DB.Sys_User on x.UserId equals y.UserId
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitId == BLL.Const.UnitId_CWCEC
select y;
for (int i = 1; i < ir; i++)
{
Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement();
string row0 = pds.Rows[i][0].ToString().Trim();
string row1 = pds.Rows[i][1].ToString().Trim();
var cn = cns.Where(y => y.ProfessionalName == row1).FirstOrDefault();
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][13].ToString().Trim())
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][14].ToString().Trim())
).FirstOrDefault();
if (oldViewInfo == null)
{
@@ -480,33 +503,36 @@ namespace FineUIPro.Web.CQMS.Comprehensive
des.SendUnit = units.Where(x => x.UnitName == row0.Trim()).FirstOrDefault().UnitId;
des.CNProfessionalId = cn.CNProfessionalId;
des.NCRCode = pds.Rows[i][2].ToString().Trim();
des.Contents = pds.Rows[i][3].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
if (!string.IsNullOrEmpty(pds.Rows[i][3].ToString().Trim()))
{
des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim());
des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][3].ToString().Trim());
}
des.Contents = pds.Rows[i][4].ToString().Trim();
des.Problem = pds.Rows[i][5].ToString().Trim();
des.Measure = pds.Rows[i][6].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
{
des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim());
}
des.IssuedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
{
des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][8].ToString().Trim());
}
des.ImplementationFrontState = pds.Rows[i][9].ToString().Trim();
des.ResponsibleMan = pds.Rows[i][10].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
{
des.ClosedDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][11].ToString().Trim()))
{
des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
des.CompleteDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
des.ResponsibleMan = pds.Rows[i][12].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim()))
{
des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
des.Supervisor = users.FirstOrDefault(x => x.UserName == pds.Rows[i][13].ToString().Trim()).UserId;
}
des.RemarkCode = Funs.GetNewInt(pds.Rows[i][13].ToString().Trim());
des.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
des.Status = BLL.Const.Comprehensive_Compile;
des.CompileMan = this.CurrUser.UserId;
BLL.NCRManagementService.AddNCRManagement(des);
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
+1
View File
@@ -59,6 +59,7 @@
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnitIds" runat="server" Label="接收单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelWidth="130px" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
<f:DropDownList ID="drpSupervisor" runat="server" Label="监督人" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
+11 -2
View File
@@ -39,6 +39,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
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, true);//监督人
//LoadAuditSelect();
//this.agree.Hidden = true;
//this.options.Hidden = true;
@@ -89,6 +90,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtResponsibleMan.Text = nCRManagement.ResponsibleMan;
//this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState;
this.ddlImplementationFrontState.SelectedValue = nCRManagement.ImplementationFrontState;
if (!string.IsNullOrEmpty(nCRManagement.Supervisor))
{
this.drpSupervisor.SelectedValue = nCRManagement.Supervisor;
}
//var currApprove = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId);
//if (currApprove != null)
@@ -154,8 +160,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.ddlProblem.Readonly = true;
//this.btnAttach.Enabled = false;
this.txtRemarkCode.Readonly = true;
this.drpSupervisor.Readonly = true;
}
///// <summary>
@@ -273,6 +278,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
nCRManagement.ReceiveUnit = unitIds;
nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
if (this.drpSupervisor.SelectedValue!=BLL.Const._Null)
{
nCRManagement.Supervisor = this.drpSupervisor.SelectedValue;
}
if (string.IsNullOrEmpty(this.NCRManagementId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs
Generated
+9
View File
@@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitIds;
/// <summary>
/// drpSupervisor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSupervisor;
/// <summary>
/// ddlImplementationFrontState 控件。
/// </summary>