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

20250227

This commit is contained in:
毕文静 2025-02-27 16:05:25 +08:00
parent bb2207dbc8
commit eaf3a114a8
5 changed files with 780 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs
View File

@ -345,12 +345,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string errInfo = string.Empty;
Model.Comprehensive_InspectionPerson Ins = new Model.Comprehensive_InspectionPerson();
if (!string.IsNullOrEmpty(tempData.Value1))
if (!string.IsNullOrEmpty(tempData.Value1.Trim()))
{
var unit = units.FirstOrDefault(x => x.UnitName == tempData.Value1);
var unit = units.FirstOrDefault(x => x.UnitName == tempData.Value1.Trim());
if (unit == null)
{
errInfo += "报验单位[" + tempData.Value1 + "]不存在；";
errInfo += "报验单位[" + tempData.Value1.Trim() + "]不存在；";
}
else
{
@ -361,38 +361,38 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
errInfo += "报验单位为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value2))
if (!string.IsNullOrEmpty(tempData.Value2.Trim()))
{
Ins.InspectionPersonCode = tempData.Value2;
Ins.InspectionPersonCode = tempData.Value2.Trim();
}
else
{
errInfo += "报验编号为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value3))
if (!string.IsNullOrEmpty(tempData.Value3.Trim()))
{
Ins.PersonName = tempData.Value3;
Ins.PersonName = tempData.Value3.Trim();
}
else
{
errInfo += "姓名为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value4))
if (!string.IsNullOrEmpty(tempData.Value4.Trim()))
{
var cn = cns.Where(x => x.ProfessionalName == tempData.Value4).FirstOrDefault();
var cn = cns.Where(x => x.ProfessionalName == tempData.Value4.Trim()).FirstOrDefault();
if (cn == null)
{
errInfo += "专业名称[" + tempData.Value4 + "]不存在；";
errInfo += "专业名称[" + tempData.Value4.Trim() + "]不存在；";
}
else
{
Ins.CNProfessionalId = cn.CNProfessionalId;
}
}
if (!string.IsNullOrEmpty(tempData.Value5))
if (!string.IsNullOrEmpty(tempData.Value5.Trim()))
{
string unitIds = string.Empty;
string[] reunit = tempData.Value5.Split(',');
string[] reunit = tempData.Value5.Trim().Split(',');
foreach (string unitWork in reunit)
{
var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
@ -415,14 +415,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
{
var post = Funs.DB.Base_Post.First(e => e.PostName == tempData.Value6.Trim());
var post = posts.FirstOrDefault(e => e.PostName == tempData.Value6.Trim());
if (post != null)
{
Ins.PostId = post.PostId;
}
else
{
errInfo += "工种[" + tempData.Value6 + "]不存在；";
errInfo += "工种[" + tempData.Value6.Trim() + "]不存在；";
}
}
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))
@ -463,15 +463,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
errInfo += "批准时间[" + tempData.Value10.Trim() + "]错误；";
}
}
if (!string.IsNullOrEmpty(tempData.Value11))
if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
{
if (tempData.Value11 != "是" && tempData.Value11 != "否")
if (tempData.Value11.Trim() != "是" && tempData.Value11.Trim() != "否")
{
errInfo += "是否在场[" + tempData.Value11 + "]错误；";
errInfo += "是否在场[" + tempData.Value11.Trim() + "]错误；";
}
else
{
Ins.IsOnSite = tempData.Value11 == "是" ? true : false;
Ins.IsOnSite = tempData.Value11.Trim() == "是" ? true : false;
}
}
if (!string.IsNullOrEmpty(tempData.Value12.Trim()))
@ -504,15 +504,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Ins.Remark = tempData.Value14.Trim();
}
if (!string.IsNullOrEmpty(tempData.Value15))
if (!string.IsNullOrEmpty(tempData.Value15.Trim()))
{
try
{
Ins.RemarkCode = Convert.ToInt32(tempData.Value15);
Ins.RemarkCode = Convert.ToInt32(tempData.Value15.Trim());
}
catch (Exception)
{
errInfo += "标志编号[" + tempData.Value15 + "]格式错误；";
errInfo += "标志编号[" + tempData.Value15.Trim() + "]格式错误；";
}
}
else
@ -526,7 +526,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Ins.ProjectId = LoginProjectId;
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.UnitId == Ins.UnitId
&& x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
&& x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15.Trim()));
if (isExitISOValue != null) ///已存在
{
Ins.InspectionPersonId = isExitISOValue.InspectionPersonId;

421
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -2866,169 +2866,169 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
ShowNotify("保存成功！", MessageBoxIcon.Success);
//PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
if (weekAndMonthReport != null)
{
if (weekAndMonthReport.SortId != null)
{
this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
}
if (weekAndMonthReport.StartDate != null)
{
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
}
if (weekAndMonthReport.EndDate != null)
{
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
}
}
AddOrUpdate = "update";
//Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
//if (weekAndMonthReport != null)
//{
// if (weekAndMonthReport.SortId != null)
// {
// this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
// }
// if (weekAndMonthReport.StartDate != null)
// {
// this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
// }
// if (weekAndMonthReport.EndDate != null)
// {
// this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
// }
//}
//AddOrUpdate = "update";
#region 加载本月质量目标管理情况
detailsGrid1.Clear();
detailsGrid1 = (from x in db.Report_CqmsTarget
where x.ReportId == this.ReportId
orderby x.SortId
select x).ToList();
if (detailsGrid1.Count > 0)
{
Grid1.Hidden = false;
Grid1.DataSource = detailsGrid1;
Grid1.DataBind();
}
//#region 加载本月质量目标管理情况
//detailsGrid1.Clear();
//detailsGrid1 = (from x in db.Report_CqmsTarget
// where x.ReportId == this.ReportId
// orderby x.SortId
// select x).ToList();
//if (detailsGrid1.Count > 0)
//{
// Grid1.Hidden = false;
// Grid1.DataSource = detailsGrid1;
// Grid1.DataBind();
//}
#endregion
//#endregion
#region 加载7.2 PQR/WPS报验情况
var detailsGrid9 = (from x in db.Report_Construction_Plan
where x.ReportId == ReportId && x.ReType == "5"
select x).ToList();
if (detailsGrid9.Count > 0)
{
Grid9.Hidden = false;
Grid9.DataSource = detailsGrid9;
Grid9.DataBind();
}
if (!string.IsNullOrEmpty(Request.Params["view"]))
{
//查看页面
Button4.Hidden = true;
Button3.Hidden = true;
//合计
OutPutSummaryGrid9();
Grid1.FindColumn("Delete1").Hidden = true;
Grid9.FindColumn("Delete9").Hidden = true;
}
#endregion
//#region 加载7.2 PQR/WPS报验情况
//var detailsGrid9 = (from x in db.Report_Construction_Plan
// where x.ReportId == ReportId && x.ReType == "5"
// select x).ToList();
//if (detailsGrid9.Count > 0)
//{
// Grid9.Hidden = false;
// Grid9.DataSource = detailsGrid9;
// Grid9.DataBind();
//}
//if (!string.IsNullOrEmpty(Request.Params["view"]))
//{
// //查看页面
// Button4.Hidden = true;
// Button3.Hidden = true;
// //合计
// OutPutSummaryGrid9();
// Grid1.FindColumn("Delete1").Hidden = true;
// Grid9.FindColumn("Delete9").Hidden = true;
//}
//#endregion
#region 加载18.本月质量问题处理情况
//(1)原材料问题
rowMaterialProblemLists.Clear();
rowMaterialProblemLists = (from x in db.Report_RowMaterialProblem
where x.ReportId == this.ReportId
select x).ToList();
if (rowMaterialProblemLists.Count > 0)
{
gvRowMaterialProblem.Hidden = false;
gvRowMaterialProblem.DataSource = rowMaterialProblemLists;
gvRowMaterialProblem.DataBind();
}
//(2)施工过程问题
constructionProblemsLists.Clear();
constructionProblemsLists = (from x in db.Report_ConstructionProblems
where x.ReportId == this.ReportId
select x).ToList();
if (constructionProblemsLists.Count > 0)
{
gvConstructionProblems.Hidden = false;
gvConstructionProblems.DataSource = constructionProblemsLists;
gvConstructionProblems.DataBind();
}
#endregion
//#region 加载18.本月质量问题处理情况
////(1)原材料问题
//rowMaterialProblemLists.Clear();
//rowMaterialProblemLists = (from x in db.Report_RowMaterialProblem
// where x.ReportId == this.ReportId
// select x).ToList();
//if (rowMaterialProblemLists.Count > 0)
//{
// gvRowMaterialProblem.Hidden = false;
// gvRowMaterialProblem.DataSource = rowMaterialProblemLists;
// gvRowMaterialProblem.DataBind();
//}
////(2)施工过程问题
//constructionProblemsLists.Clear();
//constructionProblemsLists = (from x in db.Report_ConstructionProblems
// where x.ReportId == this.ReportId
// select x).ToList();
//if (constructionProblemsLists.Count > 0)
//{
// gvConstructionProblems.Hidden = false;
// gvConstructionProblems.DataSource = constructionProblemsLists;
// gvConstructionProblems.DataBind();
//}
//#endregion
#region 加载19.下月质量控制重点
nextQualityControlLists.Clear();
nextQualityControlLists = (from x in db.Report_NextQualityControl
where x.ReportId == this.ReportId
select x).ToList();
if (nextQualityControlLists.Count > 0)
{
gvNextQualityControl.Hidden = false;
gvNextQualityControl.DataSource = nextQualityControlLists;
gvNextQualityControl.DataBind();
}
#endregion
//#region 加载19.下月质量控制重点
//nextQualityControlLists.Clear();
//nextQualityControlLists = (from x in db.Report_NextQualityControl
// where x.ReportId == this.ReportId
// select x).ToList();
//if (nextQualityControlLists.Count > 0)
//{
// gvNextQualityControl.Hidden = false;
// gvNextQualityControl.DataSource = nextQualityControlLists;
// gvNextQualityControl.DataBind();
//}
//#endregion
#region 加载文本框内容
var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
if (txtReportList.Count > 0)
{
if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
{
txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
{
txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
{
txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
{
txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
{
txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
{
txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
{
txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
{
imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
{
imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
{
imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
{
imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
{
imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
}
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
{
imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
}
}
#endregion
//#region 加载文本框内容
//var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
//if (txtReportList.Count > 0)
//{
// if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
// {
// txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
// {
// txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
// {
// txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
// {
// txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
// {
// txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
// {
// txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
// {
// txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
// {
// imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
// txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
// {
// imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
// txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
// {
// imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
// txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
// {
// imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
// txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
// {
// imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
// txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
// }
// if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
// {
// imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
// txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
// }
//}
//#endregion
//加载所有grid
lodAllGrid("1");
////加载所有grid
//lodAllGrid("1");
}
private void SaveMethod()
@ -3167,6 +3167,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
{
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ProStage = values.Value<string>("ProStage"),
ProDescribe = values.Value<string>("ProDescribe"),
@ -3175,10 +3176,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Remarks = values.Value<string>("Remarks"),
SortId = rowIndex + 1
};
if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
}
//if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
//{
// newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
//}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@ -3208,7 +3209,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "5",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3252,7 +3254,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "0",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3294,7 +3297,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "1",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3337,7 +3341,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "2",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3381,7 +3386,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "3",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3425,7 +3431,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "4",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3469,7 +3476,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "6",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3509,42 +3517,42 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
var txtContentList = new List<Model.Report_TextBoxContent>();
#region 给实体赋值
var model0 = new Model.Report_TextBoxContent();
model0.Id = Guid.NewGuid().ToString();
model0.Id = SQLHelper.GetNewID();
model0.ReportId = ReportId;
model0.ContentType = "0";
model0.ContentText = txtAre0.Text;
txtContentList.Add(model0);
var model1 = new Model.Report_TextBoxContent();
model1.Id = Guid.NewGuid().ToString();
model1.Id = SQLHelper.GetNewID();
model1.ReportId = ReportId;
model1.ContentType = "1";
model1.ContentText = txtAre1.Text;
txtContentList.Add(model1);
var model2 = new Model.Report_TextBoxContent();
model2.Id = Guid.NewGuid().ToString();
model2.Id = SQLHelper.GetNewID();
model2.ReportId = ReportId;
model2.ContentType = "2";
model2.ContentText = txtAre2.Text;
txtContentList.Add(model2);
var model20 = new Model.Report_TextBoxContent();
model20.Id = Guid.NewGuid().ToString();
model20.Id = SQLHelper.GetNewID();
model20.ReportId = ReportId;
model20.ContentType = "20";
model20.ContentText = txtAre20.Text;
txtContentList.Add(model20);
var model21 = new Model.Report_TextBoxContent();
model21.Id = Guid.NewGuid().ToString();
model21.Id = SQLHelper.GetNewID();
model21.ReportId = ReportId;
model21.ContentType = "21";
model21.ContentText = txtAre21.Text;
txtContentList.Add(model21);
var model22 = new Model.Report_TextBoxContent();
model22.Id = Guid.NewGuid().ToString();
model22.Id = SQLHelper.GetNewID();
model22.ReportId = ReportId;
model22.ContentType = "22";
model22.ContentText = txtAre22.Text;
@ -3552,7 +3560,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//如果8设备材料报验管理情况点击了增加按钮，则添加文本框内容
var model8 = new Model.Report_TextBoxContent();
model8.Id = Guid.NewGuid().ToString();
model8.Id = SQLHelper.GetNewID();
model8.ReportId = ReportId;
model8.ContentType = "8";
model8.ContentText = txtAre8.Text;
@ -3582,7 +3590,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id= SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "9",
ContentName = values.Value<string>("ContentName"),
@ -3624,7 +3633,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-1",
ContentName = values.Value<string>("WorkName"),
@ -3665,7 +3675,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-2",
ContentName = values.Value<string>("WorkName"),
@ -3706,7 +3717,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-3",
ContentName = values.Value<string>("WorkName"),
@ -3748,7 +3760,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-4",
ContentName = values.Value<string>("WorkName"),
@ -3791,7 +3804,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-5",
ContentName = values.Value<string>("WorkName"),
@ -3834,7 +3848,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-6",
ContentName = values.Value<string>("WorkName"),
@ -3877,7 +3892,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10-7",
ContentName = values.Value<string>("WorkName"),
@ -3920,7 +3936,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "10",
ContentName = values.Value<string>("WorkName"),
@ -3968,7 +3985,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "11",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -4011,7 +4029,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "12",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -4055,7 +4074,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "13",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -4098,7 +4118,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "14",
ContentName = values.Value<string>("WorkName"),
@ -4143,7 +4164,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "1",
ContentName = values.Value<string>("ContentName"),
@ -4188,7 +4210,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "2",
ContentName = values.Value<string>("ContentName"),
@ -4232,7 +4255,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = values.Value<string>("Id"),
//Id = values.Value<string>("Id"),
Id = SQLHelper.GetNewID(),
ReportId = ReportId,
ReType = "3",
ContentName = values.Value<string>("ContentName"),
@ -4277,7 +4301,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{
RowMaterialProblemId = values.Value<string>("RowMaterialProblemId"),
//RowMaterialProblemId = values.Value<string>("RowMaterialProblemId"),
RowMaterialProblemId = SQLHelper.GetNewID(),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -4320,7 +4345,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{
ConstructionProblemsId = values.Value<string>("ConstructionProblemsId"),
//ConstructionProblemsId = values.Value<string>("ConstructionProblemsId"),
ConstructionProblemsId= SQLHelper.GetNewID(),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -4365,7 +4391,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
NextQualityControlId = values.Value<string>("NextQualityControlId"),
//NextQualityControlId = values.Value<string>("NextQualityControlId"),
NextQualityControlId= SQLHelper.GetNewID(),
ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
};
@ -4396,7 +4423,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
var ImageLists = new List<Model.Report_TextBoxContent>();
var imgage1 = new Model.Report_TextBoxContent();
imgage1.Id = Guid.NewGuid().ToString();
imgage1.Id = SQLHelper.GetNewID();
imgage1.ReportId = ReportId;
imgage1.ContentType = "23-1";
imgage1.ContentText = txtPhotoContent1.Text;
@ -4404,7 +4431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ImageLists.Add(imgage1);
var imgage2 = new Model.Report_TextBoxContent();
imgage2.Id = Guid.NewGuid().ToString();
imgage2.Id = SQLHelper.GetNewID();
imgage2.ReportId = ReportId;
imgage2.ContentType = "23-2";
imgage2.ContentText = txtPhotoContent2.Text;
@ -4412,7 +4439,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ImageLists.Add(imgage2);
var imgage3 = new Model.Report_TextBoxContent();
imgage3.Id = Guid.NewGuid().ToString();
imgage3.Id = SQLHelper.GetNewID();
imgage3.ReportId = ReportId;
imgage3.ContentType = "23-3";
imgage3.ContentText = txtPhotoContent3.Text;
@ -4420,7 +4447,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ImageLists.Add(imgage3);
var imgage4 = new Model.Report_TextBoxContent();
imgage4.Id = Guid.NewGuid().ToString();
imgage4.Id = SQLHelper.GetNewID();
imgage4.ReportId = ReportId;
imgage4.ContentType = "23-4";
imgage4.ContentText = txtPhotoContent4.Text;
@ -4428,7 +4455,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ImageLists.Add(imgage4);
var imgage5 = new Model.Report_TextBoxContent();
imgage5.Id = Guid.NewGuid().ToString();
imgage5.Id = SQLHelper.GetNewID();
imgage5.ReportId = ReportId;
imgage5.ContentType = "23-5";
imgage5.ContentText = txtPhotoContent5.Text;
@ -4436,7 +4463,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ImageLists.Add(imgage5);
var imgage6 = new Model.Report_TextBoxContent();
imgage6.Id = Guid.NewGuid().ToString();
imgage6.Id = SQLHelper.GetNewID();
imgage6.ReportId = ReportId;
imgage6.ContentType = "23-6";
imgage6.ContentText = txtPhotoContent6.Text;

2
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
View File

@ -78,7 +78,7 @@
bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
<tr>
<td align="center" style="width: 24%;" rowspan="2">
<img alt="" src="../../Images/Logo.jpg" />
<img alt="" src="../../Images/NewLogo.jpg" width="380" height="120" />
</td>
<td align="center" style="width: 46%; height: 30px; vertical-align: middle; font-size: 12pt;">
<asp:Label ID="lblProjectName" runat="server"></asp:Label>

676
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

File diff suppressed because it is too large Load Diff

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19423,7 +19423,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">