This commit is contained in:
parent
273dc4e487
commit
5b8d3f2181
|
@ -0,0 +1,2 @@
|
||||||
|
alter table Report_Construction_Plan add Quantity4 int null
|
||||||
|
GO
|
|
@ -933,7 +933,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
numberIndex = 1;
|
numberIndex = 1;
|
||||||
int? num1 = 0, num2 = 0;
|
int? num1 = 0, num2 = 0, num3 = 0, num4 = 0;
|
||||||
foreach (var item in pqrList)
|
foreach (var item in pqrList)
|
||||||
{
|
{
|
||||||
//创建行
|
//创建行
|
||||||
|
@ -942,10 +942,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
row.Cells.Add(CreateCell(item.UnitOrMajor, doc, table.FirstRow.Cells[1].CellFormat.Width, "", "", "unit"));
|
row.Cells.Add(CreateCell(item.UnitOrMajor, doc, table.FirstRow.Cells[1].CellFormat.Width, "", "", "unit"));
|
||||||
row.Cells.Add(CreateCell(item.Quantity1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
row.Cells.Add(CreateCell(item.Quantity1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||||
row.Cells.Add(CreateCell(item.Quantity2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
row.Cells.Add(CreateCell(item.Quantity2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||||
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[4].CellFormat.Width));
|
row.Cells.Add(CreateCell(item.Quantity3.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width));
|
||||||
|
row.Cells.Add(CreateCell(item.Quantity4.ToString(), doc, table.FirstRow.Cells[5].CellFormat.Width));
|
||||||
|
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[6].CellFormat.Width));
|
||||||
table.Rows.Insert(numberIndex, row);
|
table.Rows.Insert(numberIndex, row);
|
||||||
num1 += item.Quantity1;
|
num1 += item.Quantity1;
|
||||||
num2 += item.Quantity2;
|
num2 += item.Quantity2;
|
||||||
|
num3 += item.Quantity3;
|
||||||
|
num4 += item.Quantity4;
|
||||||
numberIndex += 1;
|
numberIndex += 1;
|
||||||
}
|
}
|
||||||
//自动设置表格样式
|
//自动设置表格样式
|
||||||
|
@ -957,7 +961,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width, "", "", "unit"));
|
rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width, "", "", "unit"));
|
||||||
rowhj.Cells.Add(CreateCell(num1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
rowhj.Cells.Add(CreateCell(num1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
|
||||||
rowhj.Cells.Add(CreateCell(num2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
rowhj.Cells.Add(CreateCell(num2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
|
||||||
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[4].CellFormat.Width));
|
rowhj.Cells.Add(CreateCell(num3.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width));
|
||||||
|
rowhj.Cells.Add(CreateCell(num4.ToString(), doc, table.FirstRow.Cells[5].CellFormat.Width));
|
||||||
|
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[6].CellFormat.Width));
|
||||||
table.Rows.Insert(numberIndex, rowhj);
|
table.Rows.Insert(numberIndex, rowhj);
|
||||||
|
|
||||||
//自动设置表格样式
|
//自动设置表格样式
|
||||||
|
|
|
@ -709,21 +709,36 @@
|
||||||
</Editor>
|
</Editor>
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|
||||||
<f:RenderField Width="130px" ColumnID="Quantity1" DataField="Quantity1"
|
<f:RenderField Width="140px" ColumnID="Quantity1" DataField="Quantity1"
|
||||||
FieldType="int" HeaderTextAlign="Center" TextAlign="Left" HeaderText="PQR批准批次">
|
FieldType="int" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月PQR批准批次">
|
||||||
<Editor>
|
<Editor>
|
||||||
<f:NumberBox ID="TextBox7" runat="server" NoDecimal="true" NoNegative="true">
|
<f:NumberBox ID="TextBox7" runat="server" NoDecimal="true" NoNegative="true">
|
||||||
</f:NumberBox>
|
</f:NumberBox>
|
||||||
</Editor>
|
</Editor>
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|
||||||
<f:RenderField Width="130px" ColumnID="Quantity2" DataField="Quantity2"
|
<f:RenderField Width="140px" ColumnID="Quantity2" DataField="Quantity2"
|
||||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="WPS批准数量">
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计PQR批准批次">
|
||||||
<Editor>
|
<Editor>
|
||||||
<f:NumberBox ID="TextBox8" runat="server" NoDecimal="true" NoNegative="true">
|
<f:NumberBox ID="TextBox8" runat="server" NoDecimal="true" NoNegative="true">
|
||||||
</f:NumberBox>
|
</f:NumberBox>
|
||||||
</Editor>
|
</Editor>
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
<f:RenderField Width="140px" ColumnID="Quantity3" DataField="Quantity3"
|
||||||
|
FieldType="int" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月WPS批准数量">
|
||||||
|
<Editor>
|
||||||
|
<f:NumberBox ID="NumberBox1" runat="server" NoDecimal="true" NoNegative="true">
|
||||||
|
</f:NumberBox>
|
||||||
|
</Editor>
|
||||||
|
</f:RenderField>
|
||||||
|
|
||||||
|
<f:RenderField Width="140px" ColumnID="Quantity4" DataField="Quantity4"
|
||||||
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计WPS批准数量">
|
||||||
|
<Editor>
|
||||||
|
<f:NumberBox ID="NumberBox2" runat="server" NoDecimal="true" NoNegative="true">
|
||||||
|
</f:NumberBox>
|
||||||
|
</Editor>
|
||||||
|
</f:RenderField>
|
||||||
|
|
||||||
<f:RenderField Width="250px" ColumnID="Remarks" DataField="Remarks"
|
<f:RenderField Width="250px" ColumnID="Remarks" DataField="Remarks"
|
||||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
|
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
|
||||||
|
|
|
@ -1097,6 +1097,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
{ "UnitOrMajor",""},
|
{ "UnitOrMajor",""},
|
||||||
{ "Quantity1", "" },
|
{ "Quantity1", "" },
|
||||||
{ "Quantity2","" },
|
{ "Quantity2","" },
|
||||||
|
{ "Quantity3", "" },
|
||||||
|
{ "Quantity4","" },
|
||||||
{ "Remarks", "" },
|
{ "Remarks", "" },
|
||||||
{ "Delete9", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScriptGrid9(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
|
{ "Delete9", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScriptGrid9(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
|
||||||
};
|
};
|
||||||
|
@ -1128,19 +1130,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
void OutPutSummaryGrid9()
|
void OutPutSummaryGrid9()
|
||||||
{
|
{
|
||||||
DataTable source = ObjectToTable(Grid9.DataSource);
|
DataTable source = ObjectToTable(Grid9.DataSource);
|
||||||
int Quantity1Total = 0, Quantity2Total = 0;
|
int Quantity1Total = 0, Quantity2Total = 0, Quantity3Total = 0, Quantity4Total = 0;
|
||||||
if (source != null)
|
if (source != null)
|
||||||
{
|
{
|
||||||
foreach (DataRow row in source.Rows)
|
foreach (DataRow row in source.Rows)
|
||||||
{
|
{
|
||||||
Quantity1Total += Convert.ToInt32(row["Quantity1"]);
|
Quantity1Total += Convert.ToInt32(row["Quantity1"]);
|
||||||
Quantity2Total += Convert.ToInt32(row["Quantity2"]);
|
Quantity2Total += Convert.ToInt32(row["Quantity2"]);
|
||||||
|
Quantity3Total += Convert.ToInt32(row["Quantity3"]);
|
||||||
|
Quantity4Total += Convert.ToInt32(row["Quantity4"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
JObject summary = new JObject();
|
JObject summary = new JObject();
|
||||||
summary.Add("UnitOrMajor", "合计");
|
summary.Add("UnitOrMajor", "合计");
|
||||||
summary.Add("Quantity1", Quantity1Total.ToString());
|
summary.Add("Quantity1", Quantity1Total.ToString());
|
||||||
summary.Add("Quantity2", Quantity2Total.ToString());
|
summary.Add("Quantity2", Quantity2Total.ToString());
|
||||||
|
summary.Add("Quantity3", Quantity3Total.ToString());
|
||||||
|
summary.Add("Quantity4", Quantity4Total.ToString());
|
||||||
Grid9.SummaryData = summary;
|
Grid9.SummaryData = summary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3232,6 +3238,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
UnitOrMajor = values.Value<string>("UnitOrMajor"),
|
UnitOrMajor = values.Value<string>("UnitOrMajor"),
|
||||||
Quantity1 = Funs.GetNewIntOrZero(values.Value<string>("Quantity1")),
|
Quantity1 = Funs.GetNewIntOrZero(values.Value<string>("Quantity1")),
|
||||||
Quantity2 = Funs.GetNewIntOrZero(values.Value<string>("Quantity2")),
|
Quantity2 = Funs.GetNewIntOrZero(values.Value<string>("Quantity2")),
|
||||||
|
Quantity3 = Funs.GetNewIntOrZero(values.Value<string>("Quantity3")),
|
||||||
|
Quantity4 = Funs.GetNewIntOrZero(values.Value<string>("Quantity4")),
|
||||||
Remarks = values.Value<string>("Remarks"),
|
Remarks = values.Value<string>("Remarks"),
|
||||||
};
|
};
|
||||||
//if (Grid9.Rows[rowIndex].DataKeys.Length > 0)
|
//if (Grid9.Rows[rowIndex].DataKeys.Length > 0)
|
||||||
|
|
|
@ -7,12 +7,10 @@
|
||||||
// </自动生成>
|
// </自动生成>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace FineUIPro.Web.CQMS.ManageReportNew
|
namespace FineUIPro.Web.CQMS.ManageReportNew {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
public partial class MonthReportEdit
|
public partial class MonthReportEdit {
|
||||||
{
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// form1 控件。
|
/// form1 控件。
|
||||||
|
@ -689,6 +687,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::FineUIPro.NumberBox TextBox8;
|
protected global::FineUIPro.NumberBox TextBox8;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// NumberBox1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.NumberBox NumberBox1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// NumberBox2 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.NumberBox NumberBox2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// TextBox10 控件。
|
/// TextBox10 控件。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -1,242 +1,122 @@
|
||||||
PK
|
PK |