diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.cs b/SubProject/FPJ0000/JobReport_/rJobReportType.cs
index a500a44..8affabf 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReportType.cs
+++ b/SubProject/FPJ0000/JobReport_/rJobReportType.cs
@@ -102,12 +102,12 @@ namespace FPJ0000.JobReport_
if(cmbUser.SelectedIndex == 0)
{
//전체공정-전체인원
- taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+ taH.FillNew(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
}
else
{
//전체공정-특정인원
- taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+ taH.FillNew(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
}
}
else
@@ -115,12 +115,12 @@ namespace FPJ0000.JobReport_
if (cmbUser.SelectedIndex == 0)
{
//특정공정-전체인원
- taH.FillByProcess(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, tbProcess.Text);
+ taH.FillByProcess_New(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, tbProcess.Text);
}
else
{
//특정공정-특정인원
- taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+ taH.FillNew(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
}
diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc b/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc
index 180ed23..71f609a 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc
+++ b/SubProject/FPJ0000/JobReport_/rJobReportType.rdlc
@@ -354,6 +354,120 @@
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ 소계
+
+
+
+
+
+
+ Textbox31
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!hrs.Value)
+
+
+
+
+
+
+ hrs
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =(Sum(Fields!hrs.Value) / Sum(Fields!hrs.Value, "DataSet1"))*100.0
+
+
+
+
+
+
+ Textbox9
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
0.6cm
@@ -481,16 +595,16 @@
- 4.365cm
+ 2.5cm
-
+
true
true
- 분류
+ process
@@ -501,7 +615,7 @@
- Textbox19
+ Textbox1
+
+
+
+
+
+ Textbox19
+
+
+ LightSteelBlue
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
-
- =Fields!svalue.Value
+
- =Fields!svalue.Value
+ =Fields!process.Value
- =Fields!svalue.Value
+ =Fields!process.Value
- 4.365cm
+ 2.5cm
-
+
true
true
- =Fields!svalue.Value
+ =Fields!process.Value
@@ -554,7 +708,7 @@
- svalue11
+ process
+
+
+
+
+
+ svalue11
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+ =Fields!type.Value
+
+
+
+
+ Before
+
+
+
+ 4.365cm
+
+
+ true
+ true
+
+
+
+
+ Process
+
+
+
+
+
+
+ Textbox31
+
+
+ WhiteSmoke
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
Before
- 4.365cm
+ 2.5cm
-
+
true
true
- 합계
+
@@ -604,7 +849,7 @@
- Textbox40
+ Textbox4
+
+
+
+
+
+ Textbox40
+
+
+ LightGrey
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
DataSet1
- 2.54938cm
- 11.79918cm
+ 3.14938cm
+ 14.29918cm
@@ -633,10 +919,10 @@
- 1.00369in
+ 1.23991in