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

质量月报增加新内容

This commit is contained in:
潘鸿锋 2024-03-22 16:38:14 +08:00
parent f8f0a26913
commit 2cec230cda
5 changed files with 1394 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

344
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
View File

@ -860,6 +860,350 @@
</Items>
</f:Panel>
<%--15.质量巡检情况--%>
<f:Panel ID="Panel21" IsFluid="true" Title="15.质量巡检情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form20" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="gvQualityInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
DataKeyNames="Id" ShowGridHeader="true"
AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月累计数量">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目累计数量">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="RectificationRate" DataField="RectificationRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改率">
<Editor>
<f:TextBox ID="TextBox9" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
<Editor>
<f:TextBox ID="TextBox11" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<%--16.质量专项检查情况--%>
<f:Panel ID="Panel22" IsFluid="true" Title="16.质量专项检查情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form21" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="gvSpecialCheck" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
DataKeyNames="Id" ShowGridHeader="true"
AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查类别">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月检查数量">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目累计检测数量">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
<Editor>
<f:TextBox ID="TextBox12" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<%--17.质量文件上报情况--%>
<f:Panel ID="Panel23" IsFluid="true" Title="17.质量文件上报情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form22" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="gvFileReport" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
DataKeyNames="Id" ShowGridHeader="true"
AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="上报单位">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月上报数量">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计上报数量">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="MonthsBackCount" DataField="MonthsBackCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月业主/监理返回数量">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计未返回数量">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<%--18.本月质量问题处理情况--%>
<f:Panel ID="Panel24" IsFluid="true" Title="18.本月质量问题处理情况" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Panel ID="Panel25" IsFluid="true" Title="（1）原材料问题" runat="server" EnableCollapse="false"
ShowHeader="true">
<Toolbars>
<f:Toolbar ID="Toolbar5" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="btnRowMaterialProblem" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnRowMaterialProblem_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="Form23" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="gvRowMaterialProblem" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="RowMaterialProblemId" Hidden="true"
DataKeyNames="RowMaterialProblemId" ShowGridHeader="true"
AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="gvRowMaterialProblem_PreDataBound"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="240px" ColumnID="UnitId" DataField="UnitId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="供应商">
<Editor>
<f:TextBox ID="txtUnitId" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="ProblemDesrioption" DataField="ProblemDesrioption"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述">
<Editor>
<f:TextBox ID="txtProblemDesrioption" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="TreatmentMeasures" DataField="TreatmentMeasures"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理措施">
<Editor>
<f:TextBox ID="txtTreatmentMeasures" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ProcessingResults" DataField="ProcessingResults"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
<Editor>
<f:TextBox ID="txtProcessingResults" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
<Editor>
<f:TextBox ID="txtRemark" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ReportId" DataField="ReportId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ReportId" Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RowMaterialProblemId" DataField="RowMaterialProblemId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="RowMaterialProblemId" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="delRowMaterialProblem" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<f:Panel ID="Panel26" IsFluid="true" Title="（2）施工过程问题" runat="server" EnableCollapse="false"
ShowHeader="true">
<Toolbars>
<f:Toolbar ID="Toolbar6" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="btnAddConstructionProblems" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddConstructionProblems_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="Form24" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="gvConstructionProblems" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="ConstructionProblemsId" Hidden="true"
DataKeyNames="ConstructionProblemsId" ShowGridHeader="true"
AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="gvConstructionProblems_PreDataBound"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="240px" ColumnID="UnitId" DataField="UnitId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
<Editor>
<f:DropDownList ID="drpUnitId" runat="server" EnableEdit="true"></f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="ProblemDesrioption" DataField="ProblemDesrioption"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述">
<Editor>
<f:TextBox ID="txtProblemDesrioption2" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="TreatmentMeasures" DataField="TreatmentMeasures"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理措施">
<Editor>
<f:TextBox ID="txtTreatmentMeasures2" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="160px" ColumnID="ProcessingResults" DataField="ProcessingResults"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
<Editor>
<f:TextBox ID="txtProcessingResults2" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
<Editor>
<f:TextBox ID="txtRemark2" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ReportId" DataField="ReportId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ReportId" Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ConstructionProblemsId" DataField="ConstructionProblemsId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ConstructionProblemsId" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="delConstructionProblems" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
</Items>
</f:Panel>
<%--19.下月质量控制重点--%>
<f:Panel ID="Panel27" IsFluid="true" Title="19.下月质量控制重点" runat="server" EnableCollapse="false"
ShowHeader="true">
<Toolbars>
<f:Toolbar ID="Toolbar7" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="btnAddNextControl" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddNextControl_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="Form25" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="gvNextQualityControl" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="NextQualityControlId" Hidden="true"
DataKeyNames="NextQualityControlId" ShowGridHeader="true"
AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="gvNextQualityControl_PreDataBound"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="240px" ColumnID="NextQualityControlContent" DataField="NextQualityControlContent"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="下月质量控制重点" ExpandUnusedSpace="true">
<Editor>
<f:TextBox ID="TextBox13" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ReportId" DataField="ReportId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="ReportId" Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="NextQualityControlId" DataField="NextQualityControlId"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="NextQualityControlId" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="delNextQualityControl" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<%--20.项目质量体系审核--%>
<f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
ShowHeader="true">

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

@ -42,6 +42,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 列表集合
private static List<Model.Report_CqmsTarget> detailsGrid1 = new List<Model.Report_CqmsTarget>();
/// <summary>
/// 18.本月质量问题处理情况
/// (1)原材料问题
/// </summary>
private static List<Model.Report_RowMaterialProblem> rowMaterialProblemLists = new List<Model.Report_RowMaterialProblem>();
/// <summary>
/// 18.本月质量问题处理情况
/// (2)施工过程问题
/// </summary>
private static List<Model.Report_ConstructionProblems> constructionProblemsLists = new List<Model.Report_ConstructionProblems>();
/// <summary>
/// 19.下月质量控制重点
/// </summary>
private static List<Model.Report_NextQualityControl> nextQualityControlLists = new List<Model.Report_NextQualityControl>();
#endregion
#region 加载页面
@ -121,6 +138,43 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 加载18.本月质量问题处理情况
//(1)原材料问题
rowMaterialProblemLists.Clear();
rowMaterialProblemLists = (from x in Funs.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 Funs.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 Funs.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 = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
@ -190,6 +244,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//8 设备报验管理Grid11
LoadInspectionEquipment(objType);
//加载15.质量巡检情况
loadQualityInspection(objType);
//加载16.质量专项检查情况
loadSpecialCheck(objType);
//加载17.质量文件上报情况
loadFileReport(objType);
}
#endregion
@ -1283,6 +1344,386 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
#endregion
#region 15.质量巡检情况 gvQualityInspection方法
/// <summary>
/// 加载质量巡检情况
/// </summary>
void loadQualityInspection(string objType)
{
var db = Funs.DB;
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
var list = new List<Model.Report_CQMS_MonthReportItem>();
int i = 1;
int Quantity1Sum = 0;
int Quantity2Sum = 0;
//加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode
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 monethCount = query
.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
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.ReportId = ReportId;
//如果是修改，查询表中数据
if (objType == "1")
{
var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "1");
if (NewModel != null)
{
model.RectificationRate = NewModel.RectificationRate;
model.Remarks = NewModel.Remarks;
}
}
list.Add(model);
Quantity1Sum += monethCount.Count();
Quantity2Sum += AllList.Count();
i++;
}
gvQualityInspection.DataSource = list;
gvQualityInspection.DataBind();
//合计
JObject summary = new JObject();
summary.Add("ContentName", "合计");
summary.Add("MonthsCount", Quantity1Sum.ToString());
summary.Add("ProjectCount", Quantity2Sum.ToString());
gvQualityInspection.SummaryData = summary;
}
#endregion
#region 16.质量专项检查情况 gvSpecialCheck方法
/// <summary>
/// 加载质量专项检查情况
/// </summary>
void loadSpecialCheck(string objType)
{
var db = Funs.DB;
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
var list = new List<Model.Report_CQMS_MonthReportItem>();
int i = 1;
int Quantity1Sum = 0;
int Quantity2Sum = 0;
//加载检查类别
var lists = BLL.JointCheckService.GetCheckTypeList();
foreach (var item in lists)
{
var query = from c in db.Check_JointCheck
where c.ProjectId == this.CurrUser.LoginProjectId && c.CheckType == item.Key.ToString()
select new
{
c.CheckDate,
c.ProjectId,
c.CheckType
};
var AllList = query.ToList();
var monethCount = query
.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
model.ContentName = item.Value;
model.MonthsCount = monethCount.Count();
model.ProjectCount = AllList.Count();
model.ReportId = ReportId;
//如果是修改，查询表中数据
if (objType == "1")
{
var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.Value && x.ReType == "2");
if (NewModel != null)
{
model.Remarks = NewModel.Remarks;
}
}
list.Add(model);
Quantity1Sum += monethCount.Count();
Quantity2Sum += AllList.Count();
i++;
}
gvSpecialCheck.DataSource = list;
gvSpecialCheck.DataBind();
//合计
JObject summary = new JObject();
summary.Add("ContentName", "合计");
summary.Add("MonthsCount", Quantity1Sum.ToString());
summary.Add("ProjectCount", Quantity2Sum.ToString());
gvSpecialCheck.SummaryData = summary;
}
#endregion
#region 17.质量文件上报情况 gvFileReport方法
/// <summary>
/// 加载质量文件上报情况
/// </summary>
void loadFileReport(string objType)
{
var db = Funs.DB;
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
var list = new List<Model.Report_CQMS_MonthReportItem>();
int i = 1;
int Quantity1Sum = 0;
int Quantity2Sum = 0;
int Quantity3Sum = 0;
int Quantity4Sum = 0;
//加载所有单位
var units = from x in Funs.DB.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
orderby y.UnitCode
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 monethCount = query.Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate)));
//var yzCount = 0;//本月业主/ 监理返回数量
//var NoBackCount = 0;//累计未返回数量
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.ReportId = ReportId;
//如果是修改，查询表中数据
if (objType == "1")
{
var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "3");
if (NewModel != null)
{
model.Remarks = NewModel.Remarks;
}
}
list.Add(model);
//Quantity1Sum += monethCount.Count();
//Quantity2Sum += AllList.Count();
//Quantity3Sum += yzCount.Count();
//Quantity4Sum += NoBackCount.Count();
i++;
}
gvFileReport.DataSource = list;
gvFileReport.DataBind();
//合计
JObject summary = new JObject();
summary.Add("ContentName", "合计");
summary.Add("MonthsCount", Quantity1Sum.ToString());
summary.Add("ProjectCount", Quantity2Sum.ToString());
summary.Add("MonthsBackCount", Quantity3Sum.ToString());
summary.Add("TotalNoBackCount", Quantity4Sum.ToString());
gvFileReport.SummaryData = summary;
}
#endregion
#region 18.本月质量问题处理情况
#region gvRowMaterialProblem 事件
/// <summary>
/// 增加原材料问题
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
List<JObject> list = new List<JObject>();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
{ { "RowMaterialProblemId",Guid.NewGuid().ToString() },
{ "ReportId", ReportId },
{ "UnitId", "" },
{ "ProblemDesrioption",""},
{ "TreatmentMeasures", "" },
{ "ProcessingResults","" },
{ "Remark", "" },
{ "delRowMaterialProblem", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteRowMaterialProblem(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
};
list.Add(defaultObj);
gvRowMaterialProblem.DataSource = list;
gvRowMaterialProblem.DataBind();
}
/// <summary>
/// 绑定数据前事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void gvRowMaterialProblem_PreDataBound(object sender, EventArgs e)
{
// 设置LinkButtonField的点击客户端事件
LinkButtonField deleteField = gvRowMaterialProblem.FindColumn("delRowMaterialProblem") as LinkButtonField;
deleteField.OnClientClick = GetDeleteRowMaterialProblem();
}
/// <summary>
/// 删除提示
/// </summary>
/// <returns></returns>
private string GetDeleteRowMaterialProblem()
{
return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, gvRowMaterialProblem.GetDeleteSelectedRowsReference(), String.Empty);
}
#endregion
#region gvConstructionProblems 事件
/// <summary>
/// 增加施工过程问题
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
List<JObject> list = new List<JObject>();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
{ { "ConstructionProblemsId",Guid.NewGuid() },
{ "ReportId", ReportId },
{ "UnitId", "" },
{ "ProblemDesrioption",""},
{ "TreatmentMeasures", "" },
{ "ProcessingResults","" },
{ "Remark", "" },
{ "delConstructionProblems", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteConstructionProblems(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
};
list.Add(defaultObj);
gvConstructionProblems.DataSource = list;
gvConstructionProblems.DataBind();
}
/// <summary>
/// 绑定数据前事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void gvConstructionProblems_PreDataBound(object sender, EventArgs e)
{
// 设置LinkButtonField的点击客户端事件
LinkButtonField deleteField = gvConstructionProblems.FindColumn("delConstructionProblems") as LinkButtonField;
deleteField.OnClientClick = GetDeleteConstructionProblems();
}
/// <summary>
/// 删除提示
/// </summary>
/// <returns></returns>
private string GetDeleteConstructionProblems()
{
return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, gvConstructionProblems.GetDeleteSelectedRowsReference(), String.Empty);
}
#endregion
#endregion
#region 19.下月质量控制重点
/// <summary>
/// gvNextQualityControl加载前事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void gvNextQualityControl_PreDataBound(object sender, EventArgs e)
{
// 设置LinkButtonField的点击客户端事件
LinkButtonField deleteField = gvNextQualityControl.FindColumn("delNextQualityControl") as LinkButtonField;
deleteField.OnClientClick = GetDeleteNextQualityControl();
}
/// <summary>
/// 增加
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
List<JObject> list = new List<JObject>();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
{ { "NextQualityControlId",Guid.NewGuid().ToString() },
{ "ReportId", ReportId },
{ "NextQualityControlContent", "" },
{ "delNextQualityControl", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteNextQualityControl(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
};
list.Add(defaultObj);
gvNextQualityControl.DataSource = list;
gvNextQualityControl.DataBind();
}
/// <summary>
/// 删除提示
/// </summary>
/// <returns></returns>
private string GetDeleteNextQualityControl()
{
return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, gvNextQualityControl.GetDeleteSelectedRowsReference(), String.Empty);
}
#endregion
#region 保存
/// <summary>
/// 保存按钮
@ -1326,6 +1767,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//删除施工方案及检验试验计划审批情况
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
// 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//18.本月质量问题处理情况(1)原材料问题
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//18.本月质量问题处理情况(2)施工过程问题
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
//19.下月质量控制重点
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
#endregion
#region 保存所有子表
@ -1353,6 +1804,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存8 设备材料报验管理情况
saveSbclBy();
//保存15.质量巡检情况
saveQualityInspection();
//保存16.质量专项检查情况
saveSpecialCheck();
//保存17.质量文件上报情况
saveFileReport();
//保存18.(1)原材料问题
saveRowMaterialProblem();
//保存18.(2)施工过程问题
saveConstructionProblems();
//保存19.下月质量控制重点
saveNextQualityControl();
//保存文本框
saveTxtContent();
#endregion
@ -1705,8 +2169,217 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Funs.DB.SubmitChanges();
}
#region 15.质量巡检情况
/// <summary>
/// 15.质量巡检情况
/// </summary>
void saveQualityInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvQualityInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "1",
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")
};
if (gvQualityInspection.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = gvQualityInspection.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
#endregion
#region 16.质量专项检查情况
/// <summary>
/// 16.质量专项检查情况
/// </summary>
void saveSpecialCheck()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialCheck.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "2",
ContentName = values.Value<string>("ContentName"),
MonthsCount = values.Value<int>("MonthsCount"),
ProjectCount = values.Value<int>("ProjectCount"),
Remarks = values.Value<string>("Remarks")
};
if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = gvSpecialCheck.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
#endregion
#region 17.质量文件上报情况
/// <summary>
/// 17.质量文件上报情况
/// </summary>
void saveFileReport()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvFileReport.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
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())
};
if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = gvFileReport.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
#endregion
#region 18.本月质量问题处理情况
/// <summary>
/// (1)原材料问题
/// </summary>
void saveRowMaterialProblem()
{
List<Model.Report_RowMaterialProblem> detailLists = new List<Model.Report_RowMaterialProblem>();
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
TreatmentMeasures = values.Value<string>("TreatmentMeasures"),
ProcessingResults = values.Value<string>("ProcessingResults"),
Remark = values.Value<string>("Remark")
};
if (gvRowMaterialProblem.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.RowMaterialProblemId = gvRowMaterialProblem.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_RowMaterialProblem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// (2)施工过程问题
/// </summary>
void saveConstructionProblems()
{
List<Model.Report_ConstructionProblems> detailLists = new List<Model.Report_ConstructionProblems>();
JArray teamGroupData = gvConstructionProblems.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
TreatmentMeasures = values.Value<string>("TreatmentMeasures"),
ProcessingResults = values.Value<string>("ProcessingResults"),
Remark = values.Value<string>("Remark")
};
if (gvConstructionProblems.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.ConstructionProblemsId = gvConstructionProblems.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_ConstructionProblems.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
#endregion
#region 19.下月质量控制重点
/// <summary>
/// 下月质量控制重点
/// </summary>
void saveNextQualityControl()
{
List<Model.Report_NextQualityControl> detailLists = new List<Model.Report_NextQualityControl>();
JArray teamGroupData = gvNextQualityControl.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
};
if (gvNextQualityControl.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.NextQualityControlId = gvNextQualityControl.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_NextQualityControl.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
#endregion
#endregion
}
}

351
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs generated
View File

@ -788,6 +788,357 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </remarks>
protected global::FineUIPro.TextArea txtAre8;
/// <summary>
/// Panel21 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel21;
/// <summary>
/// Form20 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form20;
/// <summary>
/// gvQualityInspection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvQualityInspection;
/// <summary>
/// TextBox9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox9;
/// <summary>
/// TextBox11 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox11;
/// <summary>
/// Panel22 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel22;
/// <summary>
/// Form21 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form21;
/// <summary>
/// gvSpecialCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvSpecialCheck;
/// <summary>
/// TextBox12 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox12;
/// <summary>
/// Panel23 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel23;
/// <summary>
/// Form22 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form22;
/// <summary>
/// gvFileReport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvFileReport;
/// <summary>
/// Panel24 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel24;
/// <summary>
/// Panel25 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel25;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// btnRowMaterialProblem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnRowMaterialProblem;
/// <summary>
/// Form23 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form23;
/// <summary>
/// gvRowMaterialProblem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvRowMaterialProblem;
/// <summary>
/// txtUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitId;
/// <summary>
/// txtProblemDesrioption 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProblemDesrioption;
/// <summary>
/// txtTreatmentMeasures 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTreatmentMeasures;
/// <summary>
/// txtProcessingResults 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProcessingResults;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// Panel26 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel26;
/// <summary>
/// Toolbar6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar6;
/// <summary>
/// btnAddConstructionProblems 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAddConstructionProblems;
/// <summary>
/// Form24 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form24;
/// <summary>
/// gvConstructionProblems 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvConstructionProblems;
/// <summary>
/// drpUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// txtProblemDesrioption2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProblemDesrioption2;
/// <summary>
/// txtTreatmentMeasures2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTreatmentMeasures2;
/// <summary>
/// txtProcessingResults2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProcessingResults2;
/// <summary>
/// txtRemark2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark2;
/// <summary>
/// Panel27 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel27;
/// <summary>
/// Toolbar7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar7;
/// <summary>
/// btnAddNextControl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAddNextControl;
/// <summary>
/// Form25 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form25;
/// <summary>
/// gvNextQualityControl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid gvNextQualityControl;
/// <summary>
/// TextBox13 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox13;
/// <summary>
/// Panel3 控件。
/// </summary>

8
SGGL/FineUIPro.Web/Web.config
View File

@ -12,13 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<<<<<<< HEAD
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
=======
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
>>>>>>> 26d564fea551967fa9d0b160daa17b795a97ae34
<add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

219
SGGL/Model/Model.cs
View File

@ -1970,9 +1970,6 @@ namespace Model
partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
partial void InsertReport_CqmsTarget(Report_CqmsTarget instance);
partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance);
partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance);
@ -7810,14 +7807,6 @@ namespace Model
}
}
public System.Data.Linq.Table<Report_CQMS_ProblemHandle> Report_CQMS_ProblemHandle
{
get
{
return this.GetTable<Report_CQMS_ProblemHandle>();
}
}
public System.Data.Linq.Table<Report_CqmsTarget> Report_CqmsTarget
{
get
@ -98333,10 +98322,10 @@ namespace Model
private string _ProjectId;
private string _DraCode;
private string _CNProfessionalId;
private string _DraCode;
private System.Nullable<System.DateTime> _ReviewDate;
private string _UnitWorkId;
@ -98359,10 +98348,10 @@ namespace Model
partial void OnIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnDraCodeChanging(string value);
partial void OnDraCodeChanged();
partial void OnCNProfessionalIdChanging(string value);
partial void OnCNProfessionalIdChanged();
partial void OnDraCodeChanging(string value);
partial void OnDraCodeChanged();
partial void OnReviewDateChanging(System.Nullable<System.DateTime> value);
partial void OnReviewDateChanged();
partial void OnUnitWorkIdChanging(string value);
@ -98404,7 +98393,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
@ -98424,26 +98413,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string DraCode
{
get
{
return this._DraCode;
}
set
{
if ((this._DraCode != value))
{
this.OnDraCodeChanging(value);
this.SendPropertyChanging();
this._DraCode = value;
this.SendPropertyChanged("DraCode");
this.OnDraCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")]
public string CNProfessionalId
{
@ -98464,6 +98433,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50)")]
public string DraCode
{
get
{
return this._DraCode;
}
set
{
if ((this._DraCode != value))
{
this.OnDraCodeChanging(value);
this.SendPropertyChanging();
this._DraCode = value;
this.SendPropertyChanged("DraCode");
this.OnDraCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")]
public System.Nullable<System.DateTime> ReviewDate
{
@ -306714,164 +306703,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")]
public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _ReportId;
private string _ReType;
private string _UnitName;
private string _ProblemDes;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnReportIdChanging(string value);
partial void OnReportIdChanged();
partial void OnReTypeChanging(string value);
partial void OnReTypeChanged();
partial void OnUnitNameChanging(string value);
partial void OnUnitNameChanged();
partial void OnProblemDesChanging(string value);
partial void OnProblemDesChanged();
#endregion
public Report_CQMS_ProblemHandle()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")]
public string ReportId
{
get
{
return this._ReportId;
}
set
{
if ((this._ReportId != value))
{
this.OnReportIdChanging(value);
this.SendPropertyChanging();
this._ReportId = value;
this.SendPropertyChanged("ReportId");
this.OnReportIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")]
public string ReType
{
get
{
return this._ReType;
}
set
{
if ((this._ReType != value))
{
this.OnReTypeChanging(value);
this.SendPropertyChanging();
this._ReType = value;
this.SendPropertyChanged("ReType");
this.OnReTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")]
public string UnitName
{
get
{
return this._UnitName;
}
set
{
if ((this._UnitName != value))
{
this.OnUnitNameChanging(value);
this.SendPropertyChanging();
this._UnitName = value;
this.SendPropertyChanged("UnitName");
this.OnUnitNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")]
public string ProblemDes
{
get
{
return this._ProblemDes;
}
set
{
if ((this._ProblemDes != value))
{
this.OnProblemDesChanging(value);
this.SendPropertyChanging();
this._ProblemDes = value;
this.SendPropertyChanged("ProblemDes");
this.OnProblemDesChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CqmsTarget")]
public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged
{