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

修改质量月报

Browse Source
This commit is contained in:
潘鸿锋
2024-03-26 17:43:35 +08:00
parent bee1bbd935
commit 4064fac52d
5 changed files with 478 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+119 -121
View File
@@ -187,11 +187,7 @@ 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;
if (txtAre8.Text != "本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批")
{
Form19.Hidden = false;
Toolbar4.Hidden = true;
}
#endregion
//加载所有grid
@@ -781,7 +777,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional orderby x.SortIndex select x;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合
@@ -1082,9 +1078,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
var query = from c in db.ProcessControl_NondestructiveTest_New
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
join u in db.Base_Unit on c.UnitId equals u.UnitId
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
&& c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate)
@@ -1104,122 +1100,124 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
c.MonthRate,
c.TotalRate
};
//加载工艺管道
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 = "工艺管道";
if (gygdModel != null)
if (query.ToList().Count>0)
{
model.MonthQuantity = gygdModel.MonthQuantity;
model.TotalQuantity = gygdModel.TotalQuantity;
model.MonthRate = gygdModel.MonthRate + "%";
model.TotalRate = gygdModel.TotalRate + "%";
#region 小计和合计
//加载工艺管道
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 = "工艺管道";
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;