Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

구매 0 달러단가 넣기 전 백업

Browse Source
This commit is contained in:
chi
2021-07-11 12:22:02 +09:00
parent ac45a7429c
commit 5316245ae5
26 changed files with 1811 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs generated
View File

@@ -39,11 +39,12 @@
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = 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();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -69,6 +70,7 @@
this.btReportDay = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.btImport = new System.Windows.Forms.ToolStripButton();
this.cm = new System.Windows.Forms.ContextMenuStrip(this.components);
this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -106,7 +108,7 @@
this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.btOpenFolder = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -148,7 +150,8 @@
this.toolStripButton1,
this.toolStripButton3,
this.toolStripButton5,
this.btImport});
this.btImport,
this.btOpenFolder});
this.bn.Location = new System.Drawing.Point(0, 730);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -352,6 +355,17 @@
this.toolStripButton3.Text = "적정인원보고서";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStripButton5
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(63, 22);
this.toolStripButton5.Text = "보고서";
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
// btImport
//
this.btImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -486,6 +500,7 @@
this.tam.EETGW_JobReport_EBoardTableAdapter = null;
this.tam.EETGW_NoteTableAdapter = null;
this.tam.EETGW_ProjecthistoryDTableAdapter = null;
this.tam.EETGW_ProjectResonTableAdapter = null;
this.tam.EETGW_ProjectsScheduleTableAdapter = null;
this.tam.EETGW_ProjectToDoTableAdapter = null;
this.tam.EETGW_SaveCostTableAdapter = null;
@@ -524,7 +539,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 = 14;
this.fpSpread1_Sheet1.ColumnCount = 15;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
@@ -535,13 +550,14 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "업무분류";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "프로젝트(아이템)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "*";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "시간";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "초과";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "#";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "#";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
@@ -576,52 +592,58 @@
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type";
this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태";
this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "업무분류";
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 80F;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "projectName";
this.fpSpread1_Sheet1.Columns.Get(8).Label = "프로젝트(아이템)";
this.fpSpread1_Sheet1.Columns.Get(8).Width = 158F;
this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F;
this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName";
this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F;
this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pidx";
this.fpSpread1_Sheet1.Columns.Get(9).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pidx";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 39F;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "시간";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 52F;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs";
this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간";
this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F;
numberCellType3.MaximumValue = 999999999999999D;
numberCellType3.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ot";
this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.Red;
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "초과";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "description";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot";
this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red;
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과";
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(13).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(14).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
@@ -783,16 +805,14 @@
this.richTextBox1.TabIndex = 5;
this.richTextBox1.Text = "";
//
// toolStripButton5
// btOpenFolder
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(63, 22);
this.toolStripButton5.Text = "보고서";
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
this.btOpenFolder.Image = ((System.Drawing.Image)(resources.GetObject("btOpenFolder.Image")));
this.btOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btOpenFolder.Name = "btOpenFolder";
this.btOpenFolder.Size = new System.Drawing.Size(75, 22);
this.btOpenFolder.Text = "폴더열기";
this.btOpenFolder.Click += new System.EventHandler(this.btOpenFolder_Click);
//
// fJobReport
//
@@ -879,7 +899,6 @@
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripSplitButton btSearch;
private System.Windows.Forms.ToolStripMenuItem 태그자료만조회ToolStripMenuItem;
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
@@ -887,5 +906,7 @@
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripButton btImport;
private System.Windows.Forms.ToolStripButton toolStripButton5;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripButton btOpenFolder;
}
}

18
SubProject/FPJ0000/JobReport_/fJobReport.cs
View File

@@ -234,7 +234,7 @@ namespace FPJ0000
//사용자 목록다중선택으로 인해 처리
var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww";
var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue";
sql += " FROM JobReport";
sql += " WHERE(pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)";
if (request != "%")
@@ -660,7 +660,7 @@ namespace FPJ0000
private void k5DailyFormToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new JobReport_.rK5Dailyform();
f.Show();
}
@@ -673,7 +673,7 @@ namespace FPJ0000
private void btImport_Click(object sender, EventArgs e)
{
}
private void toolStripButton5_Click(object sender, EventArgs e)
@@ -681,5 +681,17 @@ namespace FPJ0000
var f = new JobReport_.rK5Dailyform();
f.Show();
}
private void btOpenFolder_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.JobReportRow;
if (dr != null && (dr.RowState == DataRowState.Modified || dr.RowState == DataRowState.Unchanged))
{
Util.openjobreportitem(dr.idx);
}
else FCOMMON.Util.MsgE("자료가 저장되기 전에는 폴더를 확인할 수 없습니다.\r\n자료를 저장한 후 다시 시도하세요");
}
}
}

43
SubProject/FPJ0000/JobReport_/fJobReport.resx
View File

@@ -260,20 +260,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSSiupF5WpTQ3s
ZipleZlTLLWhK4PMmJNMW2iiQkUkRS8qonRObV6ac7nRjEwzM++38DJ1l3Me3Tnz23PORisI+sGH58Vz
vh/O73uORJjIG4aU4xVmfdxd87K01MzSk4hohNNC4ip6SMwd08BBpbFqR/yLTWLoz4ku7TYuOMjST5ud
t7nWYHP6WXIIEHybc6CoYQoXNEOMNEe32Rf1TmyZaWFxxcn3TLhhmeRgmeJgnuBgGl+H4ccaWgZdWOMA
7RCLojeTSL8/wP4liVJ1snZmHb3TPD5Nc/Tk8FGUrKNrZA3vBhkq8KB3jodl1g21bgrh1zuei+FEzZGx
s6XxG/La00ivOYOa1nqUvNYgvDgIRyhS9QFEqvahUlspruIkHOZXGERe6+JEQUJF+KuO/iY0DT9CjblA
lFysjkHBs2Tk1idBVncCaXVp0PbNo2nAicYvdqzSnqJU3UQUSKukm4+r83jz9/d42q9CuSFHlKTUxtLw
SWQ9yIRxxCWu0j7MQk97WHG5EVXywSsQJrqsiygep8I6YkKd5Sput+UjUXMUKdXxsE4wsNJihYKNo95O
bFQQqfpDcOhmsXt/4XYkV0nRO9oD9ftsqHQKJN2LQL3hLT7PcLDSYnvG3fhAWXC4EX7LJ9ijDJCHKLch
98k5nK+NxrnKY6JEoUuG8nUmfZMICPe9Uzw+Cp+Y4qBFhilNXkGIcstMiHIrfSgAIQUBOFUegUsPU2Ec
1EOtL0T2y1TIahNgpQIL/TfMVEDcHoTmGfwrHFZ2k7lVgr4ZXqTr+yyuPM5CBg3K65KQ/+Ty7zsBZp1H
cF6LX7BXYSDTNr/gf7joCsGZWr8gTNHJDM0sb/zr4X9hd7GeXRe1Tl+cFpnVNjZtZxxDs6uesUUWYwss
RnwsOt0iQvNOwsNmZzwsIauBF5q/+uISSWhW66VgWUvbbrneFixvJL/J8BKU0eBF1kACZc0rO9Oa24NS
dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NhHMf3Kv+EsF70UohScmFRL0pTmxrY
zVTUvM0pmprowiBTppF5CU1UqBCl6EWFqOnUpuac0w1nZNpS8zov4GVOdzlHd8789pyz4QyEfvDhefGc
74fz+54j4CboiTLhRrlGEV6h2Qou1lDkpHkquVNLh5cP06Ev1BOXparq0xEfj/GhwxPybFC1bqY3VzZM
rNG6C6PFzaaZg8bvVTMK2gyIrZi0iTLlHq6oc8JK1etrxh12eMEO7SIDrYGBZoGBen4Pyj+76NJbscsA
7ZMUCloWkfxqgvpHElzUS+3Y9jC6xOL7EkNOBiO8ZA8DM7v4qrcRgQOjqyy0K3aUyA0IeNz3gQ9HVfrP
3SuO2JfU3UFy7V3UdjehuLkSAYXe8CeISi4hSOaHqvYqfhULzWDNZEOQdIDhBZHlAZ/7xjvQMf0WtZo8
XhJfE4q893HIaoqGuP4mkuqT0D62ho4JC7783ME26SlYNkjzAlG1yCNUls1qpvrxblyGMmUmL0moCyPh
W0h7nQrVjJVfpXeagoL0YLLaEVw85BRwE1I6QOc0JEI3o0a99hGe9+QiqvIaEmoioFuwQUeK5QpWzTo7
MRJBkOyQ4MrTQvuF/FOIqxZhdHYYJf3pkMlzEP0yEE3KVvxYZqAjxQ7P2zFEWDfbEVDkEvhKPSVC6Ulk
NcYgti4EMVXXeUmOPA7S5lTyJoHg7kcNLEa4T0wwkyL9ctVOgVB6fFkoPUEe8oQwzxO3ywKR8SYRKr0C
JYp8pH9KhLguEjoi0JJ/Q0MEtN0B32yle4WruYP06jaNsWWWZ2BqBQ8b0pBCgpL6aOQ2Pji447DtsfDJ
lrsFQmJbMroF/8NKVvBJbXMLLuZ8s+kNm/tHPXwUJrPVcTa+3eKKkyLTeuYWd2xm/dKWY26Dwtw6hRkX
GxY7D9e8hWaxYbI4KIra9rrf+csVFwjOp3Vn+Ii7es5JFEYfSSt9QIoT75QWJ+IW2kvcaTqT1NnrnShP
FggEgr9Ef6FyBTeROAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -286,6 +286,21 @@
f9ACdsMRsLfsgtSLhDC/ugQEF/f/gszO3nIBjZIwIaA8wjB4/1oukE6zVAQ6WOssLAjS2bwrkB5ogZAU
MJkj4FQ9v46shJf66AIzCrzn5G5sZmIBK0AisMdAp4F6BWYm7JyD9Ycxf8jQQxybOGd5AAAAAElFTkSu
QmCC
</value>
</data>
<data name="btOpenFolder.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

7
SubProject/FPJ0000/JobReport_/rK5Dailyform.cs
View File

@@ -58,12 +58,10 @@ namespace FPJ0000.JobReport_
//var ta = new dsReportTableAdapters.vJobReportForUserTableAdapter();
//var rawdata0 = ta.GetData(FCOMMON.info.Login.gcode, sd, ed);
var rawdata = db.vJobReportForUser.AsNoTracking()
.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1)
.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0)
.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
// var rawdata = rawdata0.GroupBy(t => t.pdate);
this.progressBar1.Maximum = rawdata.Count();
@@ -75,6 +73,9 @@ namespace FPJ0000.JobReport_
this.progressBar1.Value += 1;
var drDate = item.FirstOrDefault();
if(drDate.ww == "19")
Console.WriteLine("asdf");
//근무일원
var 휴가인원 = item.Where(t => t.svalue == "휴가").Count();
var 파견인원 = item.Where(t => t.svalue == "파견").Count();