diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
index 47dd984f..9bba523e 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
@@ -183,7 +183,7 @@
-
+
@@ -191,7 +191,7 @@
-
+
@@ -199,7 +199,7 @@
-
+
@@ -207,7 +207,7 @@
-
+
@@ -215,7 +215,7 @@
-
@@ -247,7 +247,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -264,7 +264,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -281,7 +281,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -860,7 +860,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -1399,10 +1399,10 @@
-
+ <%--
-
+ --%>
@@ -1677,35 +1677,35 @@
-
+
-
+
-
+
-
+
-
@@ -1756,28 +1756,28 @@
-
+
-
+
-
+
-
@@ -1826,7 +1826,7 @@
-
+
@@ -1855,7 +1855,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -1872,7 +1872,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -1890,7 +1890,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged" MaxLength="1000">
@@ -1931,10 +1931,10 @@
-
+
-
+
@@ -1966,10 +1966,10 @@
-
+
-
+
@@ -2001,10 +2001,10 @@
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index 9aa69bad..6f941f52 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -2909,7 +2909,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CqmsTarget)),
ReportId = ReportId,
ProStage = values.Value("ProStage"),
ProDescribe = values.Value("ProDescribe"),
@@ -2918,10 +2918,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Remarks = values.Value("Remarks"),
SortId = rowIndex + 1
};
- if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -2944,7 +2944,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "5",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -2952,10 +2952,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2 = values.Value("Quantity2"),
Remarks = values.Value("Remarks"),
};
- if (Grid9.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid9.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid9.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid9.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -2980,7 +2980,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "0",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -2988,10 +2988,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2 = values.Value("Quantity2"),
Remarks = values.Value("Remarks")
};
- if (Grid2.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid2.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid2.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid2.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3014,7 +3014,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "1",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -3023,10 +3023,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3 = values.Value("Quantity3"),
Remarks = values.Value("Remarks")
};
- if (Grid3.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid3.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid3.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid3.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3049,7 +3049,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "2",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -3057,10 +3057,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2 = values.Value("Quantity2"),
Remarks = values.Value("Remarks")
};
- if (Grid4.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid4.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid4.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid4.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3085,7 +3085,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "3",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -3093,10 +3093,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2 = values.Value("Quantity2"),
Remarks = values.Value("Remarks")
};
- if (Grid5.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid5.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid5.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid5.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3121,7 +3121,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "4",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -3129,10 +3129,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2 = values.Value("Quantity2"),
Remarks = values.Value("Remarks")
};
- if (Grid6.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid6.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (Grid6.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = Grid6.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3157,7 +3157,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
{
- //Id = values.Value("Id"),
+ Id = SQLHelper.GetNewID(typeof(Model.Report_Construction_Plan)),
ReportId = ReportId,
ReType = "6",
UnitOrMajor = values.Value("UnitOrMajor"),
@@ -3166,10 +3166,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
QuaRate = values.Value("QuaRate"),
Remarks = values.Value("Remarks")
};
- if (Grid11.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = Grid11.Rows[rowIndex].DataKeys[0].ToString();
- }
+ ////if (Grid11.Rows[rowIndex].DataKeys.Length > 0)
+ ////{
+ //// newDetail.Id = Grid11.Rows[rowIndex].DataKeys[0].ToString();
+ ////}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3255,6 +3255,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "9",
ContentName = values.Value("ContentName"),
@@ -3263,10 +3264,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//RectificationRate = values.Value("RectificationRate"),
Remarks = values.Value("Remarks")
};
- if (gvMeasuringInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvMeasuringInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvMeasuringInspection.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvMeasuringInspection.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3288,6 +3289,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-1",
ContentName = values.Value("WorkName"),
@@ -3301,10 +3303,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (gvTj.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvTj.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvTj.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvTj.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3323,6 +3325,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-2",
ContentName = values.Value("WorkName"),
@@ -3335,10 +3338,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (GvSb.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = GvSb.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (GvSb.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = GvSb.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3357,6 +3360,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-3",
ContentName = values.Value("WorkName"),
@@ -3369,10 +3373,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (GvGD.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = GvGD.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (GvGD.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = GvGD.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3392,6 +3396,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-4",
ContentName = values.Value("WorkName"),
@@ -3404,10 +3409,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (GvDq.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = GvDq.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (GvDq.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = GvDq.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3426,6 +3431,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-5",
ContentName = values.Value("WorkName"),
@@ -3438,10 +3444,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (GvYb.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = GvYb.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (GvYb.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = GvYb.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3460,6 +3466,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-6",
ContentName = values.Value("WorkName"),
@@ -3472,10 +3479,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (GvFf.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = GvFf.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (GvFf.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = GvFf.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3494,6 +3501,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10-7",
ContentName = values.Value("WorkName"),
@@ -3506,10 +3514,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("OneOKRate"),//本月合格点数
Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
};
- if (GvXf.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = GvXf.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (GvXf.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = GvXf.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3528,6 +3536,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "10",
ContentName = values.Value("WorkName"),
@@ -3542,10 +3551,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Remarks = values.Value("Remarks"),//本月累计合格点数
};
- if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvInspectionDataInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ ////if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0)
+ ////{
+ //// newDetail.Id = gvInspectionDataInspection.Rows[rowIndex].DataKeys[0].ToString();
+ ////}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3568,6 +3577,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "11",
TotalNoBackCount = values.Value("TotalNoBackCount"),
@@ -3577,10 +3587,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//RectificationRate = values.Value("RectificationRate"),
Remarks = values.Value("Remarks"),
};
- if (gvPressureInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvPressureInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvPressureInspection.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvPressureInspection.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3603,6 +3613,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "12",
TotalNoBackCount = values.Value("TotalNoBackCount"),
@@ -3612,10 +3623,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//RectificationRate = values.Value("RectificationRate"),
Remarks = values.Value("Remarks"),
};
- if (gvPipingInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvPipingInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvPipingInspection.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvPipingInspection.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3638,6 +3649,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "13",
TotalNoBackCount = values.Value("TotalNoBackCount"),
@@ -3647,10 +3659,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//RectificationRate = values.Value("RectificationRate"),
Remarks = values.Value("Remarks"),
};
- if (gvSpecialInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvSpecialInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvSpecialInspection.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvSpecialInspection.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3673,6 +3685,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "14",
ContentName = values.Value("WorkName"),
@@ -3681,10 +3694,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
TotalNoBackCount = values.Value("CheckNum"),
RectificationRate = values.Value("OKRate"),
};
- if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvNcrManagementInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvNcrManagementInspection.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3709,6 +3722,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "1",
ContentName = values.Value("ContentName"),
@@ -3717,10 +3731,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
RectificationRate = values.Value("RectificationRate"),
Remarks = values.Value("Remarks")
};
- if (gvQualityInspection.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvQualityInspection.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvQualityInspection.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvQualityInspection.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3745,6 +3759,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "2",
ContentName = values.Value("ContentName"),
@@ -3752,10 +3767,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ProjectCount = values.Value("ProjectCount"),
Remarks = values.Value("Remarks")
};
- if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvSpecialCheck.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvSpecialCheck.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvSpecialCheck.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3780,6 +3795,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
+ Id = SQLHelper.GetNewID(typeof(Model.Report_CQMS_MonthReportItem)),
ReportId = ReportId,
ReType = "3",
ContentName = values.Value("ContentName"),
@@ -3788,10 +3804,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
MonthsBackCount = Funs.GetNewInt(values.Value("MonthsBackCount").ToString()),
TotalNoBackCount = Funs.GetNewInt(values.Value("TotalNoBackCount").ToString())
};
- if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.Id = gvFileReport.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvFileReport.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.Id = gvFileReport.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3816,6 +3832,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_RowMaterialProblem newDetail = new Model.Report_RowMaterialProblem
{
+ RowMaterialProblemId = SQLHelper.GetNewID(typeof(Model.Report_RowMaterialProblem)),
ReportId = ReportId,
UnitId = values.Value("UnitId"),
ProblemDesrioption = values.Value("ProblemDesrioption"),
@@ -3823,10 +3840,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ProcessingResults = values.Value("ProcessingResults"),
Remark = values.Value("Remark")
};
- if (gvRowMaterialProblem.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.RowMaterialProblemId = gvRowMaterialProblem.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvRowMaterialProblem.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.RowMaterialProblemId = gvRowMaterialProblem.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3849,6 +3866,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_ConstructionProblems newDetail = new Model.Report_ConstructionProblems
{
+ ConstructionProblemsId = SQLHelper.GetNewID(typeof(Model.Report_ConstructionProblems)),
ReportId = ReportId,
UnitId = values.Value("UnitId"),
ProblemDesrioption = values.Value("ProblemDesrioption"),
@@ -3856,10 +3874,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ProcessingResults = values.Value("ProcessingResults"),
Remark = values.Value("Remark")
};
- if (gvConstructionProblems.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.ConstructionProblemsId = gvConstructionProblems.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvConstructionProblems.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.ConstructionProblemsId = gvConstructionProblems.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
@@ -3885,13 +3903,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int rowIndex = teamGroupRow.Value("index");
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
+ NextQualityControlId = SQLHelper.GetNewID(typeof(Model.Report_NextQualityControl)),
ReportId = ReportId,
NextQualityControlContent = values.Value("NextQualityControlContent")
};
- if (gvNextQualityControl.Rows[rowIndex].DataKeys.Length > 0)
- {
- newDetail.NextQualityControlId = gvNextQualityControl.Rows[rowIndex].DataKeys[0].ToString();
- }
+ //if (gvNextQualityControl.Rows[rowIndex].DataKeys.Length > 0)
+ //{
+ // newDetail.NextQualityControlId = gvNextQualityControl.Rows[rowIndex].DataKeys[0].ToString();
+ //}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.designer.cs
index edca3c7f..3a2510d4 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.designer.cs
@@ -975,15 +975,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew {
///
protected global::FineUIPro.Grid gvPipingInspection;
- ///
- /// TextBox16 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox TextBox16;
-
///
/// TextBox17 控件。
///