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

20250125 质量月报

This commit is contained in:
毕文静 2025-01-24 14:29:31 +08:00
parent 02c2410b2f
commit 85bd05b848
11 changed files with 331 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs
View File

@ -64,11 +64,11 @@ namespace BLL.CQMS.ManageReport.ReportNew
}
}
public static bool Delete(string newId)
public static bool Delete(string newId, string reType)
{
try
{
var result = Funs.DB.Report_Construction_Plan.Where(a => a.ReportId == newId).ToList();
var result = Funs.DB.Report_Construction_Plan.Where(a => a.ReportId == newId && a.ReType == reType).ToList();
if (result.Count > 0)
{
Funs.DB.Report_Construction_Plan.DeleteAllOnSubmit(result);

12
SGGL/BLL/CQMS/ManageReport/ReportNew/Report_CQMS_MonthReportItemService.cs
View File

@ -39,7 +39,17 @@ namespace BLL
/// 根据月报id删除相关明细信息
/// </summary>
/// <param name="reportId"></param>
public static void DeleteReportItemByReportId(string reportId)
public static void DeleteReportItemByReportId(string reportId,string reType)
{
var q = (from x in Funs.DB.Report_CQMS_MonthReportItem where x.ReportId == reportId && x.ReType==reType select x).ToList();
if (q.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.DeleteAllOnSubmit(q);
Funs.DB.SubmitChanges();
}
}
public static void DeleteReportItem(string reportId)
{
var q = (from x in Funs.DB.Report_CQMS_MonthReportItem where x.ReportId == reportId select x).ToList();
if (q.Count > 0)

2
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
View File

@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//本月质量目标管理情况
CqmsTargetService.Delete(rowID);
TextBoxContentService.Delete(rowID);
Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(rowID);
Report_CQMS_MonthReportItemService.DeleteReportItem(rowID);
WeekAndMonthReportNewService.Delete(rowID);
}
BindGrid();

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

@ -180,7 +180,6 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="200px" ColumnID="ProStage" DataField="ProStage"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目阶段">
<Editor>
@ -188,7 +187,6 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="ProDescribe" DataField="ProDescribe"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目质量管理目标描述" ExpandUnusedSpace="true">
<Editor>
@ -196,7 +194,6 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="TargetValue" DataField="TargetValue"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="目标值">
<Editor>
@ -204,7 +201,6 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="MonthPer" DataField="MonthPer"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月绩效">
<Editor>
@ -212,7 +208,6 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
<Editor>
@ -220,8 +215,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
</Columns>
@ -334,7 +330,10 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
@ -386,10 +385,10 @@
<f:TextBox ID="TextBox1" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -436,7 +435,10 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
@ -489,7 +491,10 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
@ -539,7 +544,10 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
@ -594,7 +602,6 @@
<f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
</Columns>
</f:GroupField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -725,6 +732,9 @@
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="Delete9" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
@ -779,6 +789,9 @@
<f:RenderField Width="180px" ColumnID="TotalRate" DataField="TotalRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计一次合格率">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -840,9 +853,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -900,6 +913,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -962,6 +978,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1016,6 +1035,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1070,6 +1092,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1124,6 +1149,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1178,6 +1206,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1232,6 +1263,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1286,6 +1320,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1330,6 +1367,9 @@
<f:RenderField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" Hidden="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1372,6 +1412,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1418,6 +1461,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1461,6 +1507,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1499,6 +1548,9 @@
<f:RenderField Width="150px" ColumnID="OKRate" DataField="OKRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成比例">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1550,6 +1602,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1594,6 +1649,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1633,6 +1691,9 @@
<f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计未返回数量">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1712,7 +1773,7 @@
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">
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="delRowMaterialProblem" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
@ -1784,7 +1845,7 @@
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">
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="delConstructionProblems" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
@ -1833,7 +1894,7 @@
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">
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="delNextQualityControl" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />

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

@ -439,9 +439,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
SaveMethod();
{
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@ -449,7 +447,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -466,6 +464,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(defaultObj);
Grid1.DataSource = list;
Grid1.DataBind();
//SaveMethod();
}
protected void Grid1_PreDataBound(object sender, EventArgs e)
@ -1076,8 +1076,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
SaveMethod();
{
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@ -1085,7 +1084,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -1101,6 +1100,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(defaultObj);
Grid9.DataSource = list;
Grid9.DataBind();
//SaveMethod();
}
protected void Grid9_PreDataBound(object sender, EventArgs e)
@ -2527,7 +2528,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@ -2535,7 +2535,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2551,6 +2551,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(defaultObj);
gvRowMaterialProblem.DataSource = list;
gvRowMaterialProblem.DataBind();
//SaveMethod();
}
/// <summary>
@ -2582,7 +2584,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@ -2590,7 +2591,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2606,6 +2607,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(defaultObj);
gvConstructionProblems.DataSource = list;
gvConstructionProblems.DataBind();
//SaveMethod();
}
/// <summary>
@ -2651,7 +2654,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@ -2659,7 +2661,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2671,6 +2673,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(defaultObj);
gvNextQualityControl.DataSource = list;
gvNextQualityControl.DataBind();
//SaveMethod();
}
/// <summary>
@ -2686,7 +2690,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@ -2812,6 +2815,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto6.Reset();
}
SaveMethod();
}
#endregion
@ -2865,22 +2870,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 删除所有子表
//本月质量目标管理情况
CqmsTargetService.Delete(ReportId);
//CqmsTargetService.Delete(ReportId);
//所有文本框表
TextBoxContentService.Delete(ReportId);
//删除施工方案及检验试验计划审批情况
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
//BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
// 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//18.本月质量问题处理情况(1)原材料问题
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//18.本月质量问题处理情况(2)施工过程问题
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
//BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
//19.下月质量控制重点
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
//BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
#endregion
@ -2961,6 +2966,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 保存本月质量目标管理情况
void saveTarget()
{
CqmsTargetService.Delete(ReportId);//本月质量目标管理情况
List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -2969,7 +2975,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ProStage = values.Value<string>("ProStage"),
ProDescribe = values.Value<string>("ProDescribe"),
@ -2985,7 +2991,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
{
db.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
@ -2996,6 +3002,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 保存PQR/WPS报验情况
void savePqrWps()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "5");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid9.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3004,7 +3011,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "5",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3032,6 +3039,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveYbsgfa()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid2.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3040,7 +3048,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "0",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3066,6 +3074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveWdgcfa()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid3.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3074,7 +3083,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "1",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3101,6 +3110,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveJysyjh()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid4.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3109,7 +3119,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "2",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3137,6 +3147,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSjjd()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid5.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3145,7 +3156,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "3",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3173,6 +3184,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveTzhs()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid6.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3181,7 +3193,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "4",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3209,6 +3221,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSbclBy()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid11.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3217,7 +3230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "6",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3306,7 +3319,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 9.计量器具报验管理情况
void saveMeasuringInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "9");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvMeasuringInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3315,7 +3328,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "9",
ContentName = values.Value<string>("ContentName"),
@ -3341,6 +3354,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10.现场质量共检数据
void saveTjInspection() //检验批统计:土建
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvTj.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3349,7 +3363,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-1",
ContentName = values.Value<string>("WorkName"),
@ -3374,6 +3388,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveSbInspection() //检验批统计:设备
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvSb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3382,7 +3397,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-2",
ContentName = values.Value<string>("WorkName"),
@ -3407,6 +3422,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveGDInspection() //检验批统计:管道
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvGD.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3415,7 +3431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-3",
ContentName = values.Value<string>("WorkName"),
@ -3441,6 +3457,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
void saveDQInspection() //检验批统计:电气
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvDq.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3449,7 +3466,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-4",
ContentName = values.Value<string>("WorkName"),
@ -3476,6 +3493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveYBInspection() //检验批统计:仪表
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvYb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3484,7 +3502,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-5",
ContentName = values.Value<string>("WorkName"),
@ -3511,6 +3529,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveFFInspection() //检验批统计:防腐
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvFf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3519,7 +3538,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-6",
ContentName = values.Value<string>("WorkName"),
@ -3546,6 +3565,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveXFInspection() //检验批统计:消防
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvXf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3554,7 +3574,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-7",
ContentName = values.Value<string>("WorkName"),
@ -3581,6 +3601,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveInspectionDataInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvInspectionDataInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3589,7 +3610,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10",
ContentName = values.Value<string>("WorkName"),
@ -3622,6 +3643,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 11.压力管道监检情况
void savePressureInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPressureInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3630,7 +3652,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "11",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -3658,6 +3680,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 12.管道试压包管理情况
void savePipingInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPipingInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3666,7 +3689,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "12",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -3694,6 +3717,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 13.特种设备监检情况
void saveSpecialInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3702,7 +3726,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "13",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -3730,6 +3754,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 14.NCR管理情况
void saveNcrManagementInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvNcrManagementInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3738,7 +3763,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "14",
ContentName = values.Value<string>("WorkName"),
@ -3755,6 +3780,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
if (detailLists.Count > 0)
{
db.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
db.SubmitChanges();
}
@ -3767,6 +3793,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveQualityInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvQualityInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3775,7 +3802,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "1",
ContentName = values.Value<string>("ContentName"),
@ -3804,6 +3831,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSpecialCheck()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialCheck.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3812,7 +3840,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "2",
ContentName = values.Value<string>("ContentName"),
@ -3840,6 +3868,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveFileReport()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvFileReport.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3848,7 +3877,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "3",
ContentName = values.Value<string>("ContentName"),
@ -3877,6 +3906,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveRowMaterialProblem()
{
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
List<Model.Report_RowMaterialProblem> detailLists = new List<Model.Report_RowMaterialProblem>();
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3885,7 +3915,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{
RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)),
RowMaterialProblemId = values.Value<string>("Id"),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3911,6 +3941,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveConstructionProblems()
{
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
List<Model.Report_ConstructionProblems> detailLists = new List<Model.Report_ConstructionProblems>();
JArray teamGroupData = gvConstructionProblems.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3919,7 +3950,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{
ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)),
ConstructionProblemsId = values.Value<string>("Id"),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3948,6 +3979,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveNextQualityControl()
{
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
List<Model.Report_NextQualityControl> detailLists = new List<Model.Report_NextQualityControl>();
JArray teamGroupData = gvNextQualityControl.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3956,7 +3988,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)),
NextQualityControlId = values.Value<string>("Id"),
ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
};

2
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
View File

@ -291,7 +291,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
TextBoxContentService.Delete(ReportId);
// 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//18.本月质量问题处理情况(1)原材料问题
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//18.本月质量问题处理情况(2)施工过程问题

4
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
View File

@ -2536,10 +2536,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
TextBoxContentService.Delete(ReportId);
//删除施工方案及检验试验计划审批情况
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
//BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
// 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//18.本月质量问题处理情况(1)原材料问题
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//18.本月质量问题处理情况(2)施工过程问题

2
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs
View File

@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//本周质量目标管理情况
CqmsTargetService.Delete(rowID);
TextBoxContentService.Delete(rowID);
Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(rowID);
Report_CQMS_MonthReportItemService.DeleteReportItem(rowID);
WeekAndMonthReportNewService.Delete(rowID);
}
BindGrid();

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

@ -220,7 +220,9 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
</Columns>
@ -334,7 +336,9 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
@ -386,7 +390,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
@ -435,7 +441,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
@ -489,7 +497,9 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
@ -539,7 +549,9 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
@ -723,7 +735,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
<f:LinkButtonField ColumnID="Delete9" Width="50px" EnablePostBack="false" Icon="Delete"
HeaderTextAlign="Center" HeaderText="删除" />
@ -777,7 +791,10 @@
<f:RenderField Width="180px" ColumnID="TotalRate" DataField="TotalRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计一次合格率">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -840,7 +857,9 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
@ -898,6 +917,9 @@
<f:TextBox ID="TextBox9" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
@ -960,7 +982,9 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计">
</f:RenderField>
</Columns>
</f:GroupField>
</f:GroupField> <f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1015,6 +1039,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1069,6 +1096,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1123,6 +1153,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1177,6 +1210,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1231,6 +1267,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1285,6 +1324,9 @@
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1329,6 +1371,9 @@
<f:RenderField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" Hidden="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1371,6 +1416,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1418,6 +1466,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1461,6 +1512,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1499,6 +1553,9 @@
<f:RenderField Width="150px" ColumnID="OKRate" DataField="OKRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成比例">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1550,6 +1607,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1595,6 +1655,9 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
@ -1634,6 +1697,9 @@
<f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计未返回数量">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Id" DataField="Id"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="主键" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>

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

@ -381,7 +381,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@ -389,7 +389,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -1007,7 +1007,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@ -1015,7 +1015,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2462,7 +2462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@ -2470,7 +2470,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2517,7 +2517,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@ -2525,7 +2525,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2586,7 +2586,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
SaveMethod();
//SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@ -2594,7 +2594,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
values.Add("Id", teamGroupRow.Value<string>("id"));
//values.Add("Id", teamGroupRow.Value<string>("id"));
list.Add(values);
}
JObject defaultObj = new JObject
@ -2621,7 +2621,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@ -2747,6 +2746,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto6.Reset();
}
SaveMethod();
}
#endregion
@ -2803,22 +2804,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 删除所有子表
//本月质量目标管理情况
CqmsTargetService.Delete(ReportId);
//CqmsTargetService.Delete(ReportId);
//所有文本框表
TextBoxContentService.Delete(ReportId);
//删除施工方案及检验试验计划审批情况
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
//BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
// 15.质量巡检情况 16.质量专项检查情况 17.质量文件上报情况
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId);
//18.本月质量问题处理情况(1)原材料问题
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
//18.本月质量问题处理情况(2)施工过程问题
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
//BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
//19.下月质量控制重点
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
//BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
#endregion
@ -2901,6 +2902,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 保存本月质量目标管理情况
void saveTarget()
{
CqmsTargetService.Delete(ReportId);
List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
JArray teamGroupData = Grid1.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -2909,7 +2911,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ProStage = values.Value<string>("ProStage"),
ProDescribe = values.Value<string>("ProDescribe"),
@ -2936,6 +2938,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 保存PQR/WPS报验情况
void savePqrWps()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId,"5");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid9.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -2944,7 +2947,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "5",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -2972,6 +2975,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveYbsgfa()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "0");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid2.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -2980,7 +2984,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "0",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3006,6 +3010,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveWdgcfa()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "1");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid3.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3014,7 +3019,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "1",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3041,6 +3046,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveJysyjh()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "2");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid4.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3049,7 +3055,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "2",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3077,6 +3083,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSjjd()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "3");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid5.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3085,7 +3092,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "3",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3113,6 +3120,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveTzhs()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "4");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid6.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3121,7 +3129,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "4",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3149,6 +3157,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSbclBy()
{
BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId, "6");
List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
JArray teamGroupData = Grid11.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3157,7 +3166,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "6",
UnitOrMajor = values.Value<string>("UnitOrMajor"),
@ -3246,7 +3255,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 9.计量器具报验管理情况
void saveMeasuringInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId,"9");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvMeasuringInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3255,7 +3264,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "9",
ContentName = values.Value<string>("ContentName"),
@ -3281,6 +3290,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10.现场质量共检数据
void saveTjInspection() //检验批统计:土建
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvTj.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3289,7 +3299,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-1",
ContentName = values.Value<string>("WorkName"),
@ -3317,6 +3327,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveSbInspection() //检验批统计:设备
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvSb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3325,7 +3336,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-2",
ContentName = values.Value<string>("WorkName"),
@ -3352,6 +3363,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveGDInspection() //检验批统计:管道
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvGD.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3360,7 +3372,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-3",
ContentName = values.Value<string>("WorkName"),
@ -3388,6 +3400,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
void saveDQInspection() //检验批统计:电气
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-4");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvDq.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3396,7 +3409,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-4",
ContentName = values.Value<string>("WorkName"),
@ -3423,6 +3436,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveYBInspection() //检验批统计:仪表
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-5");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvYb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3431,7 +3445,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-5",
ContentName = values.Value<string>("WorkName"),
@ -3458,6 +3472,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveFFInspection() //检验批统计:防腐
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-6");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvFf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3466,7 +3481,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-6",
ContentName = values.Value<string>("WorkName"),
@ -3493,6 +3508,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveXFInspection() //检验批统计:消防
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10-7");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvXf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3501,7 +3517,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10-7",
ContentName = values.Value<string>("WorkName"),
@ -3528,6 +3544,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
void saveInspectionDataInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "10");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvInspectionDataInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3536,7 +3553,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "10",
ContentName = values.Value<string>("WorkName"),
@ -3569,6 +3586,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 11.压力管道监检情况
void savePressureInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "11");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPressureInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3577,7 +3595,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "11",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -3605,6 +3623,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 12.管道试压包管理情况
void savePipingInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "12");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvPipingInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3613,7 +3632,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "12",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -3641,6 +3660,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 13.特种设备监检情况
void saveSpecialInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "13");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3649,7 +3669,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "13",
TotalNoBackCount = Funs.GetNewIntOrZero(values.Value<string>("TotalNoBackCount")),
@ -3677,6 +3697,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 14.NCR管理情况
void saveNcrManagementInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "14");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvNcrManagementInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3685,7 +3706,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "14",
ContentName = values.Value<string>("WorkName"),
@ -3714,6 +3735,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveQualityInspection()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "1");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvQualityInspection.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3722,7 +3744,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "1",
ContentName = values.Value<string>("ContentName"),
@ -3751,6 +3773,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveSpecialCheck()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "2");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvSpecialCheck.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3759,7 +3782,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "2",
ContentName = values.Value<string>("ContentName"),
@ -3787,6 +3810,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveFileReport()
{
BLL.Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(ReportId, "3");
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvFileReport.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3795,7 +3819,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
Id = values.Value<string>("Id"),
ReportId = ReportId,
ReType = "3",
ContentName = values.Value<string>("ContentName"),
@ -3824,6 +3848,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveRowMaterialProblem()
{
BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(ReportId);
List<Model.Report_RowMaterialProblem> detailLists = new List<Model.Report_RowMaterialProblem>();
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3832,7 +3857,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{
RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)),
RowMaterialProblemId = values.Value<string>("RowMaterialProblemId"),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3858,6 +3883,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveConstructionProblems()
{
BLL.ConstructionProblemsService.DeleteConstructionProblemsByReportId(ReportId);
List<Model.Report_ConstructionProblems> detailLists = new List<Model.Report_ConstructionProblems>();
JArray teamGroupData = gvConstructionProblems.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3866,7 +3892,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{
ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)),
ConstructionProblemsId = values.Value<string>("ConstructionProblemsId"),
ReportId = ReportId,
UnitId = values.Value<string>("UnitId"),
ProblemDesrioption = values.Value<string>("ProblemDesrioption"),
@ -3895,6 +3921,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// </summary>
void saveNextQualityControl()
{
BLL.NextQualityControlService.DeleteNextQualityControlByReportId(ReportId);
List<Model.Report_NextQualityControl> detailLists = new List<Model.Report_NextQualityControl>();
JArray teamGroupData = gvNextQualityControl.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3903,7 +3930,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)),
NextQualityControlId = values.Value<string>("NextQualityControlId"),
ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
};

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

@ -19357,7 +19357,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.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">