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

20240407 质量月报17、23

Browse Source
This commit is contained in:
毕文静
2024-04-07 10:44:22 +08:00
parent 9544361049
commit 00a325ba3a
50 changed files with 6951 additions and 1253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+360 -148
View File
@@ -187,13 +187,25 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
imgPhoto.ImageUrl = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
imgPhoto2.ImageUrl = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
imgPhoto3.ImageUrl = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
imgPhoto4.ImageUrl = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
imgPhoto5.ImageUrl = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
imgPhoto6.ImageUrl = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
#endregion
//加载所有grid
lodAllGrid("1");
}
else
{
@@ -1124,123 +1136,123 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
c.MonthRate,
c.TotalRate
};
if (query.ToList().Count > 0) {
if (query.ToList().Count > 0) {
//加载工艺管道
var gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "工艺管道");
var model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "工艺管道";
var model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "工艺管道";
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
//小计
num0 += gygdModel.MonthQuantity;
num1 += gygdModel.TotalQuantity;
//合计
totalNum0 += gygdModel.MonthQuantity;
totalNum1 += gygdModel.TotalQuantity;
#endregion
list.Add(model);
}
else
{
model.MonthQuantity = 0;
model.TotalQuantity = 0;
model.MonthRate = "0%";
model.TotalRate = "0%";
list.Add(model);
}
//地管
gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "地管");
model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "地管";
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
//小计
num0 += gygdModel.MonthQuantity;
num1 += gygdModel.TotalQuantity;
//合计
totalNum0 += gygdModel.MonthQuantity;
totalNum1 += gygdModel.TotalQuantity;
#endregion
list.Add(model);
}
else
{
model.MonthQuantity = 0;
model.TotalQuantity = 0;
model.MonthRate = "0%";
model.TotalRate = "0%";
list.Add(model);
}
//非标
gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "非标");
model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "非标";
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
//小计
num0 += gygdModel.MonthQuantity;
num1 += gygdModel.TotalQuantity;
//合计
totalNum0 += gygdModel.MonthQuantity;
totalNum1 += gygdModel.TotalQuantity;
#endregion
list.Add(model);
}
else
{
model.MonthQuantity = 0;
model.TotalQuantity = 0;
model.MonthRate = "0%";
model.TotalRate = "0%";
list.Add(model);
}
//小计
num0 += gygdModel.MonthQuantity;
num1 += gygdModel.TotalQuantity;
//合计
totalNum0 += gygdModel.MonthQuantity;
totalNum1 += gygdModel.TotalQuantity;
#endregion
model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "小计";
model.MonthQuantity = num0;
model.TotalQuantity = num1;
model.MonthRate = "";
model.TotalRate = "";
list.Add(model);
}
else
{
model.MonthQuantity = 0;
model.TotalQuantity = 0;
model.MonthRate = "0%";
model.TotalRate = "0%";
list.Add(model);
}
//地管
gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "地管");
model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "地管";
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
//小计
num0 += gygdModel.MonthQuantity;
num1 += gygdModel.TotalQuantity;
//合计
totalNum0 += gygdModel.MonthQuantity;
totalNum1 += gygdModel.TotalQuantity;
#endregion
list.Add(model);
}
else
{
model.MonthQuantity = 0;
model.TotalQuantity = 0;
model.MonthRate = "0%";
model.TotalRate = "0%";
list.Add(model);
}
//非标
gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "非标");
model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "非标";
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
//小计
num0 += gygdModel.MonthQuantity;
num1 += gygdModel.TotalQuantity;
//合计
totalNum0 += gygdModel.MonthQuantity;
totalNum1 += gygdModel.TotalQuantity;
#endregion
list.Add(model);
}
else
{
model.MonthQuantity = 0;
model.TotalQuantity = 0;
model.MonthRate = "0%";
model.TotalRate = "0%";
list.Add(model);
}
//小计
model = new Model.ProcessControl_NondestructiveTest_New();
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "小计";
model.MonthQuantity = num0;
model.TotalQuantity = num1;
model.MonthRate = "";
model.TotalRate = "";
list.Add(model);
}
}
Grid10.DataSource = list;
@@ -2263,29 +2275,32 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
select new { x.UnitId, y.UnitName };
foreach (var item in units)
{
//var query = from c in db.Check_CheckControl
// join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
// from u in unitJoin.DefaultIfEmpty()
// where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
// select new
// {
// c.CheckDate,
// c.ProjectId,
// u.UnitId,
// u.UnitName
// };
//var AllList = query.ToList();//项目数
var query = from c in db.Comprehensive_DataReceivingDoc
join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.SendUnit == item.UnitId
select new
{
c.ReceiveDate,
c.ProjectId,
c.IsReply,
c.RetrunWuhuangCopies,
u.UnitId,
u.UnitName
};
var AllList = query.ToList();//项目数
//本月数
//var monethCount = query.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
//var yzCount = 0;//本月业主/ 监理返回数量
//var NoBackCount = 0;//累计未返回数量
var monethCount = query.Where(x => (x.ReceiveDate >= Convert.ToDateTime(startDate) && x.ReceiveDate <= Convert.ToDateTime(endDate)));
var yzCount = query.Where(x => x.IsReply == true && x.RetrunWuhuangCopies != null && (x.ReceiveDate >= Convert.ToDateTime(startDate) && x.ReceiveDate <= Convert.ToDateTime(endDate)));//本月业主/ 监理返回数量
int totalReturnCount = query.Where(x => x.IsReply == true && x.RetrunWuhuangCopies != null).Count();//总的已返回数量
var NoBackCount = AllList.Count() - totalReturnCount;//累计未返回数量
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName;
//model.MonthsCount = monethCount.Count();
//model.ProjectCount = AllList.Count();
//model.MonthsBackCount =;
//model.TotalNoBackCount =;
model.MonthsCount = monethCount.Count();
model.ProjectCount = AllList.Count();
model.MonthsBackCount = yzCount.Count();
model.TotalNoBackCount = NoBackCount;
model.ReportId = ReportId;
//如果是修改，查询表中数据
if (objType == "1")
@@ -2298,10 +2313,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
list.Add(model);
//Quantity1Sum += monethCount.Count();
//Quantity2Sum += AllList.Count();
//Quantity3Sum += yzCount.Count();
//Quantity4Sum += NoBackCount.Count();
Quantity1Sum += monethCount.Count();
Quantity2Sum += AllList.Count();
Quantity3Sum += yzCount.Count();
Quantity4Sum += NoBackCount;
i++;
}
gvFileReport.DataSource = list;
@@ -2481,6 +2496,137 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
if (!ValidateFileType(fileName))
{
// 清空文件上传控件
filePhoto.Reset();
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto.Reset();
}
if (filePhoto2.HasFile)
{
string fileName = filePhoto2.ShortFileName;
if (!ValidateFileType(fileName))
{
// 清空文件上传控件
filePhoto2.Reset();
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto2.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto2.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto2.Reset();
}
if (filePhoto3.HasFile)
{
string fileName = filePhoto3.ShortFileName;
if (!ValidateFileType(fileName))
{
// 清空文件上传控件
filePhoto3.Reset();
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto3.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto3.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto3.Reset();
}
if (filePhoto4.HasFile)
{
string fileName = filePhoto4.ShortFileName;
if (!ValidateFileType(fileName))
{
// 清空文件上传控件
filePhoto4.Reset();
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto4.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto4.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto4.Reset();
}
if (filePhoto5.HasFile)
{
string fileName = filePhoto5.ShortFileName;
if (!ValidateFileType(fileName))
{
// 清空文件上传控件
filePhoto5.Reset();
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto5.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto5.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto5.Reset();
}
if (filePhoto6.HasFile)
{
string fileName = filePhoto6.ShortFileName;
if (!ValidateFileType(fileName))
{
// 清空文件上传控件
filePhoto6.Reset();
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto6.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto6.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto6.Reset();
}
}
#endregion
#region 保存
/// <summary>
/// 保存按钮
@@ -2587,6 +2733,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存19.下月质量控制重点
saveNextQualityControl();
//保存23.施工照片
saveImages();
//保存文本框
saveTxtContent();
#endregion
@@ -2672,6 +2821,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 保存施工方案及检验试验计划审批情况
/// <summary>
/// 3.1保存一般施工方案审批情况
/// </summary>
@@ -2774,7 +2924,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.SubmitChanges();
}
}
#endregion
#region 保存4.设计交底管理情况
/// <summary>
/// 保存设计交底管理情况
/// </summary>
@@ -2808,7 +2960,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.SubmitChanges();
}
}
#endregion
#region 保存图纸会审
/// <summary>
/// 保存图纸会审
/// </summary>
@@ -2842,7 +2996,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.SubmitChanges();
}
}
#endregion
#region 保存设备材料报验管理情况
/// <summary>
/// 保存设备材料报验管理情况
/// </summary>
@@ -2877,7 +3033,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.SubmitChanges();
}
}
#endregion
#region 保存文本框内容
/// <summary>
/// 保存文本框内容
/// </summary>
@@ -2938,6 +3096,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
Funs.DB.SubmitChanges();
}
#endregion
#region 9.计量器具报验管理情况
void saveMeasuringInspection()
@@ -3124,11 +3283,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
ReportId = ReportId,
ReType = "14",
ContentName = values.Value<string>("ContentName"),
MonthsCount = values.Value<int>("MonthsCount"),
ProjectCount = values.Value<int>("ProjectCount"),
//RectificationRate = values.Value<string>("RectificationRate"),
Remarks = values.Value<string>("Remarks")
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CurrentPeriodOkNum"),
ProjectCount = values.Value<int>("OKNum"),
TotalNoBackCount = values.Value<int>("CheckNum"),
RectificationRate = values.Value<string>("OKRate"),
};
if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0)
{
@@ -3232,10 +3391,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ReportId = ReportId,
ReType = "3",
ContentName = values.Value<string>("ContentName"),
//MonthsCount = Funs.GetNewInt(values.Value<int>("MonthsCount").ToString()),
//ProjectCount = Funs.GetNewInt(values.Value<int>("ProjectCount").ToString()),
//MonthsBackCount = Funs.GetNewInt(values.Value<int>("MonthsBackCount").ToString()),
//TotalNoBackCount = Funs.GetNewInt(values.Value<int>("TotalNoBackCount").ToString())
MonthsCount = Funs.GetNewInt(values.Value<int>("MonthsCount").ToString()),
ProjectCount = Funs.GetNewInt(values.Value<int>("ProjectCount").ToString()),
MonthsBackCount = Funs.GetNewInt(values.Value<int>("MonthsBackCount").ToString()),
TotalNoBackCount = Funs.GetNewInt(values.Value<int>("TotalNoBackCount").ToString())
};
if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0)
{
@@ -3351,10 +3510,63 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 23.施工照片
void saveImages()
{
var ImageLists = new List<Model.Report_TextBoxContent>();
var imgage1 = new Model.Report_TextBoxContent();
imgage1.Id = Guid.NewGuid().ToString();
imgage1.ReportId = ReportId;
imgage1.ContentType = "23-1";
imgage1.ContentText = txtPhotoContent1.Text;
imgage1.ImageUrl = imgPhoto.ImageUrl;
ImageLists.Add(imgage1);
var imgage2 = new Model.Report_TextBoxContent();
imgage2.Id = Guid.NewGuid().ToString();
imgage2.ReportId = ReportId;
imgage2.ContentType = "23-2";
imgage2.ContentText = txtPhotoContent2.Text;
imgage2.ImageUrl = imgPhoto2.ImageUrl;
ImageLists.Add(imgage2);
var imgage3 = new Model.Report_TextBoxContent();
imgage3.Id = Guid.NewGuid().ToString();
imgage3.ReportId = ReportId;
imgage3.ContentType = "23-3";
imgage3.ContentText = txtPhotoContent3.Text;
imgage3.ImageUrl = imgPhoto3.ImageUrl;
ImageLists.Add(imgage3);
var imgage4 = new Model.Report_TextBoxContent();
imgage4.Id = Guid.NewGuid().ToString();
imgage4.ReportId = ReportId;
imgage4.ContentType = "23-4";
imgage4.ContentText = txtPhotoContent4.Text;
imgage4.ImageUrl = imgPhoto4.ImageUrl;
ImageLists.Add(imgage4);
var imgage5 = new Model.Report_TextBoxContent();
imgage5.Id = Guid.NewGuid().ToString();
imgage5.ReportId = ReportId;
imgage5.ContentType = "23-5";
imgage5.ContentText = txtPhotoContent2.Text;
imgage5.ImageUrl = imgPhoto5.ImageUrl;
ImageLists.Add(imgage5);
var imgage6 = new Model.Report_TextBoxContent();
imgage6.Id = Guid.NewGuid().ToString();
imgage6.ReportId = ReportId;
imgage6.ContentType = "23-6";
imgage6.ContentText = txtPhotoContent6.Text;
imgage6.ImageUrl = imgPhoto6.ImageUrl;
ImageLists.Add(imgage6);
Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(ImageLists);
Funs.DB.SubmitChanges();
}
#endregion
#endregion
}
}