diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs
index a823285..dfda387 100644
--- a/Project/fMain.Designer.cs
+++ b/Project/fMain.Designer.cs
@@ -82,6 +82,7 @@
this.근태입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.휴가신청ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.개인별근태원장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.근태입력오류확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.휴가사용현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -130,7 +131,6 @@
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
- this.근태입력오류확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -566,6 +566,13 @@
this.개인별근태원장ToolStripMenuItem.Text = "개인별 근태 원장";
this.개인별근태원장ToolStripMenuItem.Click += new System.EventHandler(this.개인별근태원장ToolStripMenuItem_Click);
//
+ // 근태입력오류확인ToolStripMenuItem
+ //
+ this.근태입력오류확인ToolStripMenuItem.Name = "근태입력오류확인ToolStripMenuItem";
+ this.근태입력오류확인ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
+ this.근태입력오류확인ToolStripMenuItem.Text = "근태 입력 오류 확인";
+ this.근태입력오류확인ToolStripMenuItem.Click += new System.EventHandler(this.근태입력오류확인ToolStripMenuItem_Click);
+ //
// toolStripMenuItem10
//
this.toolStripMenuItem10.Name = "toolStripMenuItem10";
@@ -910,7 +917,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
- this.tabControl1.Size = new System.Drawing.Size(1065, 594);
+ this.tabControl1.Size = new System.Drawing.Size(1062, 594);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -926,9 +933,9 @@
this.toolStripMenuItem6,
this.toolStripButton1,
this.toolStripButton2});
- this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
+ this.toolStrip1.Location = new System.Drawing.Point(1063, 28);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(29, 594);
+ this.toolStrip1.Size = new System.Drawing.Size(32, 594);
this.toolStrip1.TabIndex = 35;
this.toolStrip1.Text = "toolStrip1";
//
@@ -937,7 +944,7 @@
this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
- this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20);
+ this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem8.Text = "업무일지";
this.toolStripMenuItem8.ToolTipText = "업무일지";
this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@@ -947,7 +954,7 @@
this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
- this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20);
+ this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem7.Text = "구매신청";
this.toolStripMenuItem7.ToolTipText = "구매신청";
this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
@@ -957,7 +964,7 @@
this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
- this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20);
+ this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem6.Text = "프로젝트";
this.toolStripMenuItem6.ToolTipText = "프로젝트";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
@@ -968,7 +975,7 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(26, 20);
+ this.toolStripButton1.Size = new System.Drawing.Size(29, 20);
this.toolStripButton1.Text = "구매진행상황";
this.toolStripButton1.ToolTipText = "구매진행상황";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2);
@@ -979,17 +986,10 @@
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
- this.toolStripButton2.Size = new System.Drawing.Size(26, 20);
+ this.toolStripButton2.Size = new System.Drawing.Size(29, 20);
this.toolStripButton2.Text = "품목정보";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
//
- // 근태입력오류확인ToolStripMenuItem
- //
- this.근태입력오류확인ToolStripMenuItem.Name = "근태입력오류확인ToolStripMenuItem";
- this.근태입력오류확인ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
- this.근태입력오류확인ToolStripMenuItem.Text = "근태 입력 오류 확인";
- this.근태입력오류확인ToolStripMenuItem.Click += new System.EventHandler(this.근태입력오류확인ToolStripMenuItem_Click);
- //
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.cs b/SubProject/FBS0000/Holiday/rHolidaySummary.cs
index 80e752f..5f71d69 100644
--- a/SubProject/FBS0000/Holiday/rHolidaySummary.cs
+++ b/SubProject/FBS0000/Holiday/rHolidaySummary.cs
@@ -40,14 +40,14 @@ namespace FBS0000
void refrehData()
{
- var dt = DateTime.Parse(this.tbMon.Text);
+ var dt = DateTime.Parse(this.tbMon.Text);
ta.Fill(this.dsReport.holydata, FCOMMON.info.Login.gcode, dt.Year.ToString("0000") + "-01-01", dt.ToShortDateString());
//this.reportViewer1.LocalReport.ReportPath = "JobReport_\\rK5Dailyform.rdlc";
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal);
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
- this.reportViewer1.Refresh();
+ this.reportViewer1.RefreshReport();
////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
index d406bd2..adf0fdb 100644
--- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
@@ -395,7 +395,55 @@ namespace FPJ0000.JobReport_
fpSpread1.Sheets[0].Cells[row, 85].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ //포션값추가
+ row += 1;
this.fpSpread1.Sheets[0].RowCount = row + 1;
+
+
+ //fpSpread1.Sheets[0].Cells[row, 1].Value = "포션";
+ //fpSpread1.Sheets[0].Cells[row, 1].BackColor = Color.LightGray;
+ fpSpread1.Sheets[0].Cells[row, 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ fpSpread1.Sheets[0].Cells[row, 1].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+
+
+ FarPoint.Win.Spread.CellType.PercentCellType pct = new FarPoint.Win.Spread.CellType.PercentCellType();
+ //numberCellType1.NegativeRed = true;
+ //numberCellType1.NullDisplay = "--";
+
+
+ for (int i = 2; i <= 82; i++)
+ {
+ fpSpread1.Sheets[0].Cells[row, i].Formula = ColumnAdress(i + 1) + row.ToString() + "/" + "CF" + row.ToString();
+ //fpSpread1.Sheets[0].Cells[row, i].BackColor = Color.LightGray;
+
+ fpSpread1.Sheets[0].Cells[row, i].CellType = pct;
+ //fpSpread1.Sheets[0].Cells[row, i].ParseFormatString = "N1";
+
+
+
+
+ fpSpread1.Sheets[0].Cells[row, i].Border = new ComplexBorder(left, top, right, bottom);
+ fpSpread1.Sheets[0].Cells[row, i].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ fpSpread1.Sheets[0].Cells[row, i].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ }
+
+ //CI8데이터 추가
+ //fpSpread1_Sheet1.ColumnCount += 1;
+ for (int i = 8; i < row ; i++)
+ {
+ var cellname = "CI" + i.ToString();
+ fpSpread1.Sheets[0].Cells[cellname].Formula = $"CF{i}/CF{row}";
+ fpSpread1.Sheets[0].Cells[cellname].CellType = pct;
+ fpSpread1.Sheets[0].Cells[cellname].Border = new ComplexBorder(left, top, right, bottom);
+ fpSpread1.Sheets[0].Cells[cellname].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ fpSpread1.Sheets[0].Cells[cellname].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ }
+
+
+
+ this.fpSpread1.Sheets[0].RowCount = row + 1;
+
+
}
public string ColumnAdress(int col)
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
index 5df99a4..1abe701 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
@@ -331,20 +331,20 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY
- zVTMvM0pmprowiBbzEWmLrygQoUoRS8qtItOberc5tyGMzKXqem8C16Wuss5ujP99pyzpQZCP/jwvHjO
- 98P5fc/hsRP6QJ10ucygjCo3/A6TGChy0hxy9jTSUWV6OuKpznxOrK30j357gAvtnfDHvdolG71iNpvd
- VscGrPZdVmwsNH4u2FD0aQZx5SNOQbbCxxv1TGSJbokN66dcME4zMM4wMEwx0E1uQv1rA+3DDmwwQMsI
- haIP00itMlP/SMIk7dS6cxMDs258nWXIyaCfk2xCM76BL8NOItjCwIIbxnkXZIoZBN/vfsOFY+VBlpuS
- 6G1R7XWk1txATUcjipvkCJYEIIggkJ1FqPQUKloquFXsNIPFVSdCEzUMJ4gpC37fPdSK1rGXqDEUcJLE
- 6ggUvE5ATmMchHVXkFKXgpbBRbSa7fj8fR1rpKcwaS/NCQSVAh9/Sa7bMNqDV0NSlKqzOUlSbSQJX0XG
- 83Roxx3cKl1jFJSkh1WHC2HFfR4BO+ElGjqvPhmmcR3qjPfwpDMfsfKLSKqOhmnKCRMpli1YO+HpxEoE
- odI9gvMPJa7ThUeQUCnAwIQesp5MSBV5iHsWgkb1R3ybY2AixeonXegjLNlcCH7kFZwQ+4r44sPIaYjH
- rdpwxFdc4iR5igSIm9LJm4SAvR+YcaOf/cQEGykyMFfnEfDFB+f44kPkIV/wC3xxrTQEWS+SoR1WQqYs
- ROa7ZAhrY2AiAiP5NwxEQLu2iEC9u8KF3F56YY3G4JybQzM6j7v1GUgjQVFdHPIb7uzcsTg33UTQvCtg
- bbPWXcH/cLArpO8RnMlTOSUlVdv7PbwfKpVq61hii90bJ0VmdFqm15029sKyTMGyRGHcy7LdxcE2b6c9
- YYqi1vxut/3wxnm8kxkdWYHC9s7jIqU1UNRM75DmIeAvwmbaT9i2ejSlrSsgWZHK4/F4fwDVcZ3Qsek6
- FQAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY
+ zVTMdDqnaGqiC4NsMQ3NS2iiQoUoRS8qtItObeqcc27DLTKXqem8C16Wuss5c2f67TlnSw2EfvDhefGc
+ 74fz+57DYyf0gSrpcrlOEVWh+x0m1VHkpDkq2VNPR5Vr6YgnGtM5ibraP/rtAS60d8If96uXrfSqyWRy
+ W+xOWGy7rFpZaPxctKLw0yziKkYdgiy5jzfqmchSzTIb1k67oJ9hoJ9loJtmoJnahOqXEx0jdjgZoHWU
+ QuGHGaQ8M1H/SMKkHdSGYxPGOTe+zjHkZDDISTbRN+HElxEHEWzBuOiGfsGFYvks+Pd73nDh2Mpg801p
+ 9La47jpSam+gtrMJRc2V4EsDEEwQFJ9FqOwUqlqruFVsNIOlNQdCE/sYThBTzn/fM9yGtvGXqNXlc5LE
+ mgjkv05AdlMcRPVXkFyfjNahJbSZbPj8fQPrpKcwWT/NCQTVAh9/aY5bN9aLV8MylKmyOElSXSQJX0X6
+ 8zSoJ+zcKt3jFBSkhzW7C2FFAx4BO+GlfXRugxCGCQ3q9fdQ0pWH2MqLSKqJhmHaAQMpli1YPenpxEIE
+ obI9gvMPpa7TBUeQUC2AcVKL4t4MyOS5iHsagibVR3ybZ2AgxWqnXBggLFtd4D/yCk5IfMVBksPIbozH
+ rbpwxFdd4iS58gRImtPIm4SAvTfOujHIfmKClRQZmKPxCIIkB+eDJIfIQ74IyvfFtbIQZL4QQj2iQLGi
+ ABnvhBDVxcBABHryb+iIgHZtEYFqd4ULOf304jqNoXk3R9/YAu42pCOVBMX1cchrvLNzx+LYdBNBy66A
+ tc1ZdgX/w86ukLZHcCZX6ZCWVG/v9/B+KJXKrWOJrTZvnBSZ3mWe2XBY2QvzCgXzMoUJLys2FwfbvI32
+ hCmKWve73f7DG+fxTqZ3ZgaKOrqOixWWQHELvUOqh4C/iFpoP1H72tHk9u4AoTyFx+Px/gDUAJ3OKTT2
+ RgAAAABJRU5ErkJggg==
@@ -383,4 +383,7 @@
542, 17
+
+ 63
+
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs
index ad6a567..bac5a96 100644
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -95,7 +95,7 @@ namespace FPJ0000
private void fPartList_Load(object sender, EventArgs e)
{
-
+
//정렬방식 저장값 불러오기
var SetFile = util.CurrentPath + "FormSetting.xml";
@@ -257,7 +257,7 @@ namespace FPJ0000
//여기서부터는 무조건 구매대상이다
if (bPR == false)
{
- if (qty_in > 0 )
+ if (qty_in > 0)
{
입력오류 += 1;
row.ForeColor = Color.White;
@@ -272,7 +272,7 @@ namespace FPJ0000
}
else if (bPO == false)
{
- if (qty_in > 0 )
+ if (qty_in > 0)
{
입력오류 += 1;
row.ForeColor = Color.White;
@@ -367,6 +367,23 @@ namespace FPJ0000
this.bsPart.EndEdit();
this.Focus();
+ //저장전 더미데이터 백업
+ var backdup = new dsPRJ.ProjectsPartDataTable();
+ backdup.Merge(dsPRJ.ProjectsPart);
+ backdup.RejectChanges();
+ try
+ {
+ var fn = System.IO.Path.Combine(util.CurrentPath, "Backup", "PartList", this.ProjectIndex.ToString("00000") + "_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xml");
+ var fi = new System.IO.FileInfo(fn);
+ if (fi.Directory.Exists == false) fi.Directory.Create();
+ backdup.WriteXml(fi.FullName);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+
+
//모든데이터의 공백을 제거(sid)
foreach (var item in this.dsPRJ.ProjectsPart)
{
diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs
index 9d27fce..afbafc1 100644
--- a/SubProject/FPJ0000/dsPRJ.Designer.cs
+++ b/SubProject/FPJ0000/dsPRJ.Designer.cs
@@ -30376,7 +30376,7 @@ WHERE (idx = @idx)";
AS userGroupName
FROM vProjectPartPurchase
WHERE (gcode = @gcode)
-ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0)";
+ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
diff --git a/SubProject/FPJ0000/dsPRJ.cs b/SubProject/FPJ0000/dsPRJ.cs
index 2eb5dea..c8b8776 100644
--- a/SubProject/FPJ0000/dsPRJ.cs
+++ b/SubProject/FPJ0000/dsPRJ.cs
@@ -4,6 +4,10 @@
partial class dsPRJ
{
+ partial class ProjectsPartDataTable
+ {
+ }
+
partial class EETGW_ProjectToDoDataTable
{
}
diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd
index afbbbea..8af41b9 100644
--- a/SubProject/FPJ0000/dsPRJ.xsd
+++ b/SubProject/FPJ0000/dsPRJ.xsd
@@ -1672,7 +1672,7 @@ WHERE (idx = @idx)
AS userGroupName
FROM vProjectPartPurchase
WHERE (gcode = @gcode)
-ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0)
+ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx
@@ -2772,7 +2772,7 @@ WHERE (idx = @idx)
-
+
@@ -3053,7 +3053,7 @@ WHERE (idx = @idx)
-
+
@@ -3097,7 +3097,7 @@ WHERE (idx = @idx)
-
+
@@ -3142,7 +3142,7 @@ WHERE (idx = @idx)
-
+
@@ -3258,7 +3258,7 @@ WHERE (idx = @idx)
-
+
@@ -3424,7 +3424,7 @@ WHERE (idx = @idx)
-
+
@@ -3462,7 +3462,7 @@ WHERE (idx = @idx)
-
+
@@ -3578,7 +3578,7 @@ WHERE (idx = @idx)
-
+
@@ -3629,7 +3629,7 @@ WHERE (idx = @idx)
-
+
@@ -3642,7 +3642,7 @@ WHERE (idx = @idx)
-
+
@@ -3814,7 +3814,7 @@ WHERE (idx = @idx)
-
+
@@ -3998,7 +3998,7 @@ WHERE (idx = @idx)
-
+
@@ -4043,7 +4043,7 @@ WHERE (idx = @idx)
-
+
@@ -4120,7 +4120,7 @@ WHERE (idx = @idx)
-
+
@@ -4311,7 +4311,7 @@ WHERE (idx = @idx)
-
+
@@ -4450,7 +4450,7 @@ WHERE (idx = @idx)
-
+
@@ -4509,7 +4509,7 @@ WHERE (idx = @idx)
-
+
diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss
index 44d8370..13ec86d 100644
--- a/SubProject/FPJ0000/dsPRJ.xss
+++ b/SubProject/FPJ0000/dsPRJ.xss
@@ -4,18 +4,18 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
+
-
+