전자실 자료 입력화면 dialog 방식 해제

This commit is contained in:
chi
2021-02-05 08:29:14 +09:00
parent 8fbee34f90
commit 0e4f3d84d4
12 changed files with 292 additions and 206 deletions

View File

@@ -223,6 +223,7 @@ namespace FPJ0000
this.DialogResult = System.Windows.Forms.DialogResult.OK;
this.Close();
//this.tableAdapterManager.UpdateAll(this.dsPRJ);
}

View File

@@ -278,18 +278,17 @@ namespace FPJ0000
newdr.EndEdit();
var f = new fEboardData(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
}
else
{
newdr.Delete();
}
this.Validate();
this.bs.EndEdit();
this.bs.Position = 0;
f.Show();
f.FormClosed += (s1, e1) => {
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
}
else newdr.Delete();
this.Validate();
this.bs.EndEdit();
this.bs.Position = 0;
};
}
}
@@ -414,23 +413,16 @@ namespace FPJ0000
//this.bs.Position = this.bs.Count - 1;
var f = new fEboardData(newdr);
var dlg = f.ShowDialog();
if (dlg == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
//try
//{
// ta.Update(newdr);
//}
//catch (Exception ex)
//{
// FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
//}
}
else newdr.Delete();
this.Validate();
this.bs.EndEdit();
f.Show();
f.FormClosed += (s1, e1) => {
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
}
else newdr.Delete();
this.Validate();
this.bs.EndEdit();
};
}
private void btEdit_Click(object sender, EventArgs e)
@@ -443,17 +435,15 @@ namespace FPJ0000
if (drv == null) return;
var dr = drv.Row as dsPRJ.EETGW_JobReport_EBoardRow;
var f = new fEboardData(dr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
//int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project));
//if (curLevel < 5)
//{
// funcSave(false); //자동저장
//}
}
this.Validate();
this.bs.EndEdit();
f.Show();
f.FormClosed += (s1, e1) => {
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.Validate();
this.bs.EndEdit();
}
};
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)

View File

@@ -223,20 +223,20 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVDhPhZNZTxNRGIZ7pT/BoBdemrhAtEZxSRQELEsC
LggEUQqlEBCQQA1EEVNQWcSABEjUEIjGCzXEBQpYQEoptKEYEUTAsi/KUoG20ykzLa9npg3FhMQveXIu
zvmenO+dMwKu/O+oYkNKtMrQR9o/IUVaK1lpnlJu1dGhJT10UJFm8JRMXb4//PUOvmlrBd7vUi+a6OWl
NcputNhgNLtZNnHQ+DFvQu6HacSVD1OiVMVOV6uzggs1iytm2t4zyUA3xUI3zUI7yUIzsQ7VTxuahyyw
sUDDsBW576YQ/2TY+o8k8IHaukato2/Gji8zLFlZ9PKSdXQabPg0RBGBA33zdujmGBQopuGb0/6Kb44s
9Rm/UhS+Ia26hPjKy6hsqUN+fSl88zzhQxAVnIS//BjKGsr4Ucw0i4UVCv63O1leEFHi+7Z9oBGNo89R
qc3iJdcrgpD1MgZpdVGQVIchrjoODf0LaBw04+O3NaySnALkXTQvEJWLdoYVptu1Ix14MSBHsSqVl8RW
BZPmC0h6mgi1wcKP0jZqhZLksGJhEJDf7RRwFVjYSWfUiKE3aFCtu4WHrZmILD2H2Ipw6Ccp6EmwXMDq
MWcmRiLwl28RnLmbxxzP3ouYchH6xnpQ0JEMuSIDUY/9UKd6j6+zLPQk2J4JBt2ERRMD33suwRGZh1Qo
24O02mhcrQpEdNl5XpKhiIGsPpHcxA/cft+0Hb3cJyaYSJCnczROgVC2a1Yo200OeUCY5YGLxX5IeSaG
ekiJAmU2kt+IIamKgJ4IdORtaImAZhzwzlS5Rzib00XPr9Lon7XzdI7M4WZNEhJIo7Q6Cpm1Nzb3OKh1
O4TprW7BCZmKnjG6Bf/DQkbwSmx2C7wzPlOG36aN7Q5vB2VjHIfECrOrnQSZ1Dr+a40yGRYsjvElK8YX
rTC4WDIzPFzy5HcBefIOhmVX911r+u5qFwiOJrWkeEmaWw9LlUYvaRO9SYITzwSFE4mCPiBpWjkY19Tm
KVbECwQCwV8VL6KkvF4YKgAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NxGMf3qv6EsF70MpBS0sjIF+XSmhnY
zVTMcjqnVGqWC4vMmEqmGZq4QYUoRS8qpIub1szc5nKjLTLN+/1Wrpa7H3fOmd9+52yogdADH54Xv9/z
4Tzf8xNwFXdTm3Gs2qhJvGf8k1Bp9JJO8dRw3UQlVvdQR+8a+qNl+rrQpOeb+KH1FV/Rrbc6qd9Wu5u1
uZdhc63x28lBYXDBiZI3MxDXDnlEeerNwdFAJVQarH+cXrZnioZpmoFphoFxioFh0gft6DLaB9xYZoDW
IS9KXk0j68Gg9x+JqELndXh8sMyy+DLLkM7gMy/xQTe2jPcDHiLww7LAwjRPo1w9A+H1zmf8cEpNzMSZ
yqQVqeIUshpOo+FdM8paaiAsDUMMQVS+H3HyvahtreVXcVEMFpc8iLuhY3hBcrXwZWefCqqRx2gwFvGS
8/VHUfQ0HfnNqZAojyNTmYnW3kWo+l14+80BO8npsLyb4gWiOtHmxDsFrHG4C0/65KjS5vGSDEUCGT6B
3Ic50I+5+VU+jHihITksuWkcLvsUEHAVX6mjChvFMI8ZoDRdw52Oq0ipOYSM+iSYpzwwk2C5gPXjgUxs
RBAnXyc4cKuUjirejvQ6ESzjPSjvugC5uhCp92PRrH2Nr3MMzCTYnkkanwhWJw3h7aAgQhYijZRtQ35T
Gs4q4pFWe4SXFKrTIWvJIV8SC+7cMsPiM/eLCU4SZHSxISCIlG2Zi5RtJZdCEFkUgpNVsbj4SAz9gAbl
mmJceCGGRJEMMxGYyNswEgFF+xF1Rbu2wsHibmrBTqF3juXRDc/jcmMussmgVJmKq02XVs84PD4WEQWa
NcG+Ii01a1sT/A83WSE8p22doPCjZ/SHY2Wjyxvhpnz+XRkqV3CcBJnbMbHg8DhHf7r8E7+8mLB6MRbk
l4vm4ZJ3USz3iPw+mrbvONf2PTguEOzJfXcxXNLesVuqsYVL1dQq2QHCslUBJCoqVNK2tDOz7UOYWJ0l
EAgEfwHCoaJtQ43MrwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -36,9 +36,10 @@
System.Windows.Forms.Label edateLabel;
System.Windows.Forms.Label odateLabel;
System.Windows.Forms.Label statusLabel;
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.dsPRJ = new FPJ0000.dsPRJ();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
@@ -156,7 +157,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(703, 599);
this.fpSpread1.Size = new System.Drawing.Size(915, 599);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 6;
//
@@ -217,7 +218,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(703, 97);
this.panel1.Size = new System.Drawing.Size(915, 97);
this.panel1.TabIndex = 7;
//
// button1
@@ -333,7 +334,7 @@
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 4;
this.fpSpread1_Sheet1.ColumnCount = 5;
this.fpSpread1_Sheet1.RowCount = 0;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
@@ -341,33 +342,44 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "소분류";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "공급처";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "금액";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "금액(N)";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "중분류";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "소분류";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "공급처";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F;
numberCellType2.DecimalPlaces = 0;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
numberCellType2.NegativeRed = true;
numberCellType2.Separator = ",";
numberCellType2.ShowSeparator = true;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
numberCellType1.DecimalPlaces = 0;
numberCellType1.MaximumValue = 999999999999999D;
numberCellType1.MinimumValue = -999999999999999D;
numberCellType1.NegativeRed = true;
numberCellType1.Separator = ",";
numberCellType1.ShowSeparator = true;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "금액";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 171F;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 143F;
numberCellType2.DecimalPlaces = 0;
numberCellType2.MaximumValue = 10000000D;
numberCellType2.MinimumValue = -10000000D;
numberCellType2.NegativeRed = true;
numberCellType2.ShowSeparator = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "금액(N)";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 140F;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
@@ -376,7 +388,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(703, 696);
this.ClientSize = new System.Drawing.Size(915, 696);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.panel1);
this.Name = "rPartList";

View File

@@ -40,7 +40,7 @@ namespace FPJ0000
//order by 절은 다시 생성한다.
var SSQl = " select ItemGroup,option1,ItemSupply,sum(amt) as amt " +
var SSQl = " select ItemGroup,option1,ItemSupply,sum(amt) as amt ,sum(amtn) as amtn " +
" from projectspart" +
" where Project = " + this.ProjectIndex.ToString() +
" group by ItemGroup,option1,ItemSupply" +
@@ -59,6 +59,12 @@ namespace FPJ0000
decimal sum = 0;
decimal sum2 = 0;
decimal sum3 = 0;
decimal sumn = 0;
decimal sumn2 = 0;
decimal sumn3 = 0;
Boolean first = true;
int grp2cnt = 0;
int spanStart = 0;
@@ -70,6 +76,7 @@ namespace FPJ0000
foreach (dsReport.PartSummaryRow dr in dsReport1.PartSummary.Rows)
{
sum3 += dr.amt;
sumn3 += dr.amtn;
if (first)
{
grp1 = dr.ItemGroup.Trim();
@@ -81,9 +88,14 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = grp2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = dr.ItemSupply;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = dr.amt;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = dr.amtn;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
sum = dr.amt;
sum2 = dr.amt;
sumn = dr.amtn;
sumn2 = dr.amtn;
first = false;
grp2cnt = 0;
}
@@ -100,6 +112,9 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = "소계(" + grp2 + ")";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].BackColor = Color.FromArgb(240, 240, 240);
@@ -126,6 +141,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn;
this.fpSpread1_Sheet1.Rows[this.fpSpread1_Sheet1.RowCount - 1].BackColor = Color.FromArgb(220, 220, 220);
//중분류가 변경되었으므로 처음 줄부터 지금 줄까지 스팬을 건다
@@ -140,6 +156,10 @@ namespace FPJ0000
spanStart2 = this.fpSpread1_Sheet1.RowCount;
sum = 0;
sum2 = 0;
sumn = 0;
sumn2 = 0;
grp1 = dr.ItemGroup.Trim();
grp2 = dr.option1.Trim();
grp2cnt = 0;
@@ -156,6 +176,8 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = "소계(" + grp2 + ")";// ;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].BackColor = Color.FromArgb(240, 240, 240);
@@ -176,6 +198,7 @@ namespace FPJ0000
grp2cnt = 1;
spanStart2 = this.fpSpread1_Sheet1.RowCount;
sum2 = 0;
sumn2 = 0;
grp2 = dr.option1.Trim();
}
@@ -186,11 +209,17 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = grp2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = dr.ItemSupply;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = dr.amt;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = dr.amtn;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
cnt++;
sum += dr.amt;
sum2 += dr.amt;
sumn += dr.amtn;
sumn2 += dr.amtn;
//grp2cnt += 1;
}
}
@@ -204,6 +233,8 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = "소계(" + grp2 + ")";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].BackColor = Color.FromArgb(240, 240, 240);
@@ -231,6 +262,8 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn;
this.fpSpread1_Sheet1.Rows[this.fpSpread1_Sheet1.RowCount - 1].BackColor = Color.FromArgb(220, 220, 220);
var spanRows2 = (this.fpSpread1_Sheet1.RowCount - spanStart - 1);
@@ -242,6 +275,8 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum3;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn3;
this.fpSpread1_Sheet1.Rows[this.fpSpread1_Sheet1.RowCount - 1].BackColor = Color.LightSkyBlue;
this.fpSpread1.ResumeLayout();

View File

@@ -1640,6 +1640,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnamt;
private global::System.Data.DataColumn columnamtn;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public PartSummaryDataTable() {
@@ -1705,6 +1707,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn amtnColumn {
get {
return this.columnamtn;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1742,13 +1752,14 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public PartSummaryRow AddPartSummaryRow(string ItemGroup, string option1, string ItemSupply, decimal amt) {
public PartSummaryRow AddPartSummaryRow(string ItemGroup, string option1, string ItemSupply, decimal amt, decimal amtn) {
PartSummaryRow rowPartSummaryRow = ((PartSummaryRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
ItemGroup,
option1,
ItemSupply,
amt};
amt,
amtn};
rowPartSummaryRow.ItemArray = columnValuesArray;
this.Rows.Add(rowPartSummaryRow);
return rowPartSummaryRow;
@@ -1775,6 +1786,7 @@ namespace FPJ0000 {
this.columnoption1 = base.Columns["option1"];
this.columnItemSupply = base.Columns["ItemSupply"];
this.columnamt = base.Columns["amt"];
this.columnamtn = base.Columns["amtn"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1788,6 +1800,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnItemSupply);
this.columnamt = new global::System.Data.DataColumn("amt", typeof(decimal), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnamt);
this.columnamtn = new global::System.Data.DataColumn("amtn", typeof(decimal), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnamtn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2415,6 +2429,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public decimal amtn {
get {
if (this.IsamtnNull()) {
return 0m;
}
else {
return ((decimal)(this[this.tablePartSummary.amtnColumn]));
}
}
set {
this[this.tablePartSummary.amtnColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsItemGroupNull() {
@@ -2462,6 +2492,18 @@ namespace FPJ0000 {
public void SetamtNull() {
this[this.tablePartSummary.amtColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsamtnNull() {
return this.IsNull(this.tablePartSummary.amtnColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetamtnNull() {
this[this.tablePartSummary.amtnColumn] = global::System.Convert.DBNull;
}
}
/// <summary>

View File

@@ -150,7 +150,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
<xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
@@ -180,7 +180,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -216,7 +216,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -229,7 +229,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -246,7 +246,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
<xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
@@ -256,13 +256,14 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
<xs:element name="option1" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="option1" msprop:Generator_ColumnVarNameInTable="columnoption1" msprop:Generator_ColumnPropNameInTable="option1Column" msprop:Generator_UserColumnName="option1" type="xs:string" minOccurs="0" />
<xs:element name="ItemSupply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemSupply" msprop:Generator_ColumnVarNameInTable="columnItemSupply" msprop:Generator_ColumnPropNameInTable="ItemSupplyColumn" msprop:Generator_UserColumnName="ItemSupply" type="xs:string" minOccurs="0" />
<xs:element name="amt" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="amt" msprop:Generator_ColumnVarNameInTable="columnamt" msprop:Generator_ColumnPropNameInTable="amtColumn" msprop:Generator_UserColumnName="amt" type="xs:decimal" minOccurs="0" />
<xs:element name="amtn" msprop:Generator_ColumnVarNameInTable="columnamtn" msprop:Generator_ColumnPropNameInRow="amtn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="amtnColumn" msprop:Generator_UserColumnName="amtn" type="xs:decimal" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -10,7 +10,7 @@
<Shape ID="DesignTable:JobReportDay" ZOrder="4" X="335" Y="164" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="3" X="587" Y="65" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="2" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:PartSummary" ZOrder="1" X="852" Y="79" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:PartSummary" ZOrder="1" X="852" Y="79" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />
</Shapes>
<Connectors />
</DiagramLayout>