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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
高飞
2024-04-19 15:48:44 +08:00
parent ae229cb24e 44580d9acb
commit 90a655dfa3
24 changed files with 1541 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
+93 -74
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 11);
AddDatasetToSQL(ds.Tables[0], 12);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var cns = from x in Funs.DB.Base_CNProfessional select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
select x;
for (int i = 0; i < ir; i++)
{
string row0 = pds.Rows[i][0].ToString();
@@ -196,35 +201,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
string row2 = pds.Rows[i][2].ToString();
if (string.IsNullOrEmpty(row2))
if (!string.IsNullOrEmpty(row2))
{
result += (i + 2).ToString() + "," + "图纸内容" + "," + "此项为必填项！" + "|";
}
string row4 = pds.Rows[i][4].ToString();
if (!string.IsNullOrEmpty(row4))
{
try
string[] reunit = row2.Split(',');
foreach (string unitWork in reunit)
{
Int32 date = Convert.ToInt32(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() + "]不存在！" + "|";
}
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
if (string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row5 + "]错误！" + "|";
}
result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|";
}
string row6 = pds.Rows[i][6].ToString();
@@ -232,38 +225,53 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
try
{
DateTime date = Convert.ToDateTime(row6.Trim());
Int32 date = Convert.ToInt32(row6.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row6 + "]错误！" + "|";
result += (i + 2).ToString() + "," + "页数" + "," + "[" + row6 + "]错误！" + "|";
}
}
string row7 = pds.Rows[i][7].ToString();
if (!string.IsNullOrEmpty(row7))
{
string[] reunit = row7.Split(',');
foreach (string unit in reunit)
try
{
var u = units.Where(x => x.UnitName == unit).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|";
}
DateTime date = Convert.ToDateTime(row7.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "接收日期" + "," + "[" + row7 + "]错误！" + "|";
}
}
string row10 = pds.Rows[i][10].ToString();
if (string.IsNullOrEmpty(row10))
string row8 = pds.Rows[i][8].ToString();
if (!string.IsNullOrEmpty(row8))
{
result += (i + 2).ToString() + "," + "标识编号" + "," + "此项为必填项！" + "|";
try
{
DateTime date = Convert.ToDateTime(row8.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "发送日期" + "," + "[" + row8 + "]错误！" + "|";
}
}
string row9 = pds.Rows[i][9].ToString();
if (!string.IsNullOrEmpty(row9))
{
string[] reunit = row9.Split(',');
foreach (string unit in reunit)
{
var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|";
}
}
}
//}
//else
//{
// result += (i + 2).ToString() + "," + "报验编号" + "," + "该单位报验编号已存在！" + "|";
//}
}
if (!string.IsNullOrEmpty(result))
{
@@ -369,7 +377,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 11);
AddDatasetToSQL2(ds.Tables[0], 12);
}
catch (Exception ex)
{
@@ -408,72 +416,84 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var cns = from x in Funs.DB.Base_CNProfessional select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
select x;
for (int i = 0; i < ir; i++)
{
Model.Comprehensive_DesignDrawings oldViewInfo = new Model.Comprehensive_DesignDrawings();
string row0 = pds.Rows[i][0].ToString().Trim();
var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault();
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][10].ToString().Trim()
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][5].ToString().Trim()
).FirstOrDefault();
if (oldViewInfo == null)
{
Model.Comprehensive_DesignDrawings des = new Model.Comprehensive_DesignDrawings();
des.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
des.ProjectId = this.CurrUser.LoginProjectId;
des.CNProfessionalId = cn.CNProfessionalId;
des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
des.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
des.Edition = pds.Rows[i][3].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
des.CNProfessionalId = cn.CNProfessionalId;//专业名称
des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号
if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程
{
des.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
{
des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim());
des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim());
}
des.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容
des.Edition = pds.Rows[i][4].ToString().Trim();//版次
des.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号
if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim()))
{
des.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());
des.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数
}
if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
{
des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][7].ToString().Trim());
des.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期
}
des.ReceiveMan = pds.Rows[i][8].ToString().Trim();
des.Remark = pds.Rows[i][9].ToString().Trim();
des.RemarkCode = pds.Rows[i][10].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
{
des.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期
}
if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
{
des.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位
}
des.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人
des.Remark = pds.Rows[i][11].ToString().Trim();//备注
BLL.DesignDrawingsService.AddDesignDrawings(des);
}
else
{
oldViewInfo.CNProfessionalId = cn.CNProfessionalId;
oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
oldViewInfo.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
oldViewInfo.Edition = pds.Rows[i][3].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
oldViewInfo.CNProfessionalId = cn.CNProfessionalId;//专业名称
oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();//图纸编号
if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))//单位工程
{
oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][4].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
{
oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim());
oldViewInfo.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][2].ToString().Trim());
}
oldViewInfo.DesignDrawingsContent = pds.Rows[i][3].ToString().Trim();//图纸内容
oldViewInfo.Edition = pds.Rows[i][4].ToString().Trim();//版次
oldViewInfo.RemarkCode = pds.Rows[i][5].ToString().Trim();//标志编号
if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim()))
{
oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());
oldViewInfo.PageNumber = Convert.ToInt32(pds.Rows[i][6].ToString().Trim());//页数
}
if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
{
oldViewInfo.ReceiveUnits = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == (pds.Rows[i][7].ToString().Trim())).UnitId;
oldViewInfo.ReceiveDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());//接收日期
}
oldViewInfo.ReceiveMan = pds.Rows[i][8].ToString().Trim();
oldViewInfo.Remark = pds.Rows[i][9].ToString().Trim();
oldViewInfo.RemarkCode = pds.Rows[i][10].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
{
oldViewInfo.SendDate = Convert.ToDateTime(pds.Rows[i][8].ToString().Trim());//发送日期
}
if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
{
oldViewInfo.ReceiveUnits = UnitService.GetUnitIds(pds.Rows[i][9].ToString().Trim());//接收单位
}
oldViewInfo.ReceiveMan = pds.Rows[i][10].ToString().Trim(); //接收人
oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();//备注
BLL.DesignDrawingsService.UpdateDesignDrawings(oldViewInfo);
}
}
}
else
{
@@ -484,7 +504,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
#endregion
#endregion
#region 下载模板
/// <summary>
/// 下载模板按钮
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
+74 -26
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 10);
AddDatasetToSQL(ds.Tables[0], 13);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -173,6 +173,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var cns = from x in Funs.DB.Base_CNProfessional select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
select x;
for (int i = 0; i < ir; i++)
{
string row0 = pds.Rows[i][0].ToString();
@@ -225,40 +230,72 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
string[] reunit = row5.Split(',');
foreach (string unit in reunit)
if (row5 != "过程监督不到位" && row5 != "质量缺陷" && row5 != "质量管理问题" && row5 != "不按设计要求施工" && row5 != "不按程序施工" && row5 != "成品保护不到位")
{
var u = units.Where(x => x.UnitName == unit).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit + "]不存在！" + "|";
}
result += (i + 2).ToString() + "," + "问题类别" + "," + "[" + row5 + "]错误！" + "|";
}
}
string row7 = pds.Rows[i][7].ToString();
if (!string.IsNullOrEmpty(row7))
{
try
string[] reunit = row7.Split(',');
foreach (string unitWork in reunit)
{
DateTime date = Convert.ToDateTime(row7.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "要求封闭日期" + "," + "[" + row7 + "]错误！" + "|";
var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "单位工程名称" + "," + "[" + unitWork.Trim() + "]不存在！" + "|";
}
}
}
string row8 = pds.Rows[i][8].ToString();
if (!string.IsNullOrEmpty(row8))
{
string[] reunit = row8.Split(',');
foreach (string unit in reunit)
{
var u = units.Where(x => x.UnitName == unit.Trim()).FirstOrDefault();
if (u == null)
{
result += (i + 2).ToString() + "," + "接收单位" + "," + "[" + unit.Trim() + "]不存在！" + "|";
}
}
}
string row9 = pds.Rows[i][9].ToString().Trim();
if (!string.IsNullOrEmpty(row9))
{
if (row9 != "整改中" && row9 != "已闭合")
{
result += (i + 2).ToString() + "," + "实施状态" + "," + "[" + row9 + "]错误！" + "|";
}
}
string row11 = pds.Rows[i][11].ToString();
if (!string.IsNullOrEmpty(row11))
{
try
{
DateTime date = Convert.ToDateTime(row8.Trim());
DateTime date = Convert.ToDateTime(row11.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "完成日期" + "," + "[" + row8 + "]错误！" + "|";
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 + "]错误！" + "|";
}
}
}
@@ -366,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 10);
AddDatasetToSQL2(ds.Tables[0], 13);
}
catch (Exception ex)
{
@@ -405,6 +442,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var cns = from x in Funs.DB.Base_CNProfessional select x;
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
select x;
for (int i = 0; i < ir; i++)
{
Model.Comprehensive_NCRManagement oldViewInfo = new Model.Comprehensive_NCRManagement();
@@ -426,20 +468,27 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
des.IssuedDate = Convert.ToDateTime(pds.Rows[i][4].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
{
des.ReceiveUnit = BLL.UnitService.GetUnitIds(pds.Rows[i][5].ToString().Trim());
}
des.ImplementationFrontState = pds.Rows[i][6].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.ClosedDate = Convert.ToDateTime(pds.Rows[i][7].ToString().Trim());
des.UnitWorkId = BLL.UnitWorkService.GetUnitWorkIdsByUnitWorkNames(this.CurrUser.LoginProjectId, pds.Rows[i][7].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][8].ToString().Trim()))
{
des.CompleteDate = Convert.ToDateTime(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][11].ToString().Trim()))
{
des.ClosedDate = Convert.ToDateTime(pds.Rows[i][11].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
{
des.CompleteDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
}
des.ResponsibleMan = pds.Rows[i][9].ToString().Trim();
BLL.NCRManagementService.AddNCRManagement(des);
}
}
@@ -454,7 +503,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
#endregion
#endregion
#region 下载模板
/// <summary>
/// 下载模板按钮
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx
+2 -2
View File
@@ -35,7 +35,7 @@
<f:FormRow>
<Items>
<f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" Required="true" LabelAlign="Right" LabelWidth="130px">
<f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" LabelAlign="Right" LabelWidth="130px">
<f:ListItem Value="" Text="-请选择-" Selected="true" />
<f:ListItem Value="过程监督不到位" Text="过程监督不到位" />
<f:ListItem Value="质量缺陷" Text="质量缺陷" />
@@ -88,7 +88,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" ShowRedStar="true" runat="server" Label="上传附件"
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="130px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs
+12 -12
View File
@@ -275,12 +275,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement));
this.hdAttachUrl.Text = nCRManagement.NCRManagementId;
}
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
nCRManagement.CompileMan = this.CurrUser.UserId;
nCRManagement.Status = BLL.Const.Comprehensive_Compile;
BLL.NCRManagementService.AddNCRManagement(nCRManagement);
@@ -288,12 +288,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
else
{
nCRManagement.NCRManagementId = this.NCRManagementId;
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
//var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId);
//if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
//{
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
//}
var model = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault();
if (model != null)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx
+3
View File
@@ -48,6 +48,9 @@
<f:RenderField ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName" FieldType="String" HeaderText="设备名称" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="PositionNum" DataField="PositionNum" FieldType="String" HeaderText="位号" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
<f:RenderField ColumnID="SunNumber" DataField="SunNumber" FieldType="String" HeaderText="总数量" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.Comprehensive
public void BindGrid()
{
string strSql = @"select C.SpecialEquipmentId, ProjectId,C.EquipmentId, SunNumber, Status,
InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName
InformNumber, SubmitDataNumber, MonitoringReportNumber, CompileMan,U.UnitName,eq.SpecialEquipmentName,PositionNum
from Comprehensive_SpecialEquipment C
left join Base_Unit U on C.UnitId=U.UnitId
left join Base_SpecialEquipment eq on eq.SpecialEquipmentId = C.EquipmentId
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx
+1
View File
@@ -33,6 +33,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtPositionNum" runat="server" Label="位号" LabelWidth="130px" LabelAlign="Right"></f:TextBox>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
+4
View File
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.drpEquipmentId.SelectedValue = specialEquipment.EquipmentId;
}
this.txtPositionNum.Text = specialEquipment.PositionNum;
this.txtInformNumber.Text = specialEquipment.InformNumber.HasValue ? specialEquipment.InformNumber.ToString() : "";
this.txtMonitoringReportNumber.Text = specialEquipment.MonitoringReportNumber.HasValue ? specialEquipment.MonitoringReportNumber.ToString() : "";
this.txtSubmitDataNumber.Text = specialEquipment.SubmitDataNumber.HasValue ? specialEquipment.SubmitDataNumber.ToString() : "";
@@ -121,6 +122,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtSunNumber.Readonly = true;
this.drpEquipmentId.Readonly = true;
this.drpUnit.Readonly = true;
this.txtPositionNum.Readonly = true;
this.drpAudit.Readonly = true;
@@ -199,6 +201,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text);
}
specialEquipment.PositionNum = this.txtPositionNum.Text.Trim();
if (string.IsNullOrEmpty(this.SpecialEquipmentId))
{
@@ -273,6 +276,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text);
}
specialEquipment.PositionNum = this.txtPositionNum.Text.Trim();
if (string.IsNullOrEmpty(this.SpecialEquipmentId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs
Generated
+36 -29
View File
@@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class SpecialEquipmentEdit
{
namespace FineUIPro.Web.CQMS.Comprehensive {
public partial class SpecialEquipmentEdit {
/// <summary>
/// form1 控件。
/// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpEquipmentId 控件。
/// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpEquipmentId;
/// <summary>
/// txtSunNumber 控件。
/// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSunNumber;
/// <summary>
/// txtInformNumber 控件。
/// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtInformNumber;
/// <summary>
/// txtSubmitDataNumber 控件。
/// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSubmitDataNumber;
/// <summary>
/// txtMonitoringReportNumber 控件。
/// </summary>
@@ -94,7 +92,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtMonitoringReportNumber;
/// <summary>
/// txtPositionNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPositionNum;
/// <summary>
/// Panel2 控件。
/// </summary>
@@ -103,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -112,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
@@ -121,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// drpAudit 控件。
/// </summary>
@@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpAudit;
/// <summary>
/// txtReportTime 控件。
/// </summary>
@@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtReportTime;
/// <summary>
/// agree 控件。
/// </summary>
@@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow agree;
/// <summary>
/// rblIsAgree 控件。
/// </summary>
@@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAgree;
/// <summary>
/// options 控件。
/// </summary>
@@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow options;
/// <summary>
/// txtidea 控件。
/// </summary>
@@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtidea;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
@@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// WindowAtt 控件。
/// </summary>