This commit is contained in:
chi
2022-07-20 11:43:55 +09:00
parent 38a681000f
commit f96c853911
26 changed files with 14146 additions and 1442 deletions

View File

@@ -63,13 +63,13 @@ namespace FBS0000.Holiday
this.panel2 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.dtED = new System.Windows.Forms.DateTimePicker();
this.dtSD = new System.Windows.Forms.DateTimePicker();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.panel4 = new System.Windows.Forms.Panel();
this.panel5 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.dtSD = new System.Windows.Forms.DateTimePicker();
this.dtED = new System.Windows.Forms.DateTimePicker();
this.lvOK = new System.Windows.Forms.ListView();
this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -79,6 +79,8 @@ namespace FBS0000.Holiday
this.columnHeader12 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.columnHeader13 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader14 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panel2.SuspendLayout();
@@ -315,7 +317,8 @@ namespace FBS0000.Holiday
this.columnHeader2,
this.columnHeader3,
this.columnHeader4,
this.columnHeader5});
this.columnHeader5,
this.columnHeader14});
this.lvNG.Dock = System.Windows.Forms.DockStyle.Fill;
this.lvNG.HideSelection = false;
this.lvNG.Location = new System.Drawing.Point(3, 17);
@@ -397,6 +400,53 @@ namespace FBS0000.Holiday
this.groupBox3.TabStop = false;
this.groupBox3.Text = "검사기간";
//
// dtED
//
this.dtED.Location = new System.Drawing.Point(223, 20);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(200, 21);
this.dtED.TabIndex = 8;
//
// dtSD
//
this.dtSD.Location = new System.Drawing.Point(17, 20);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(200, 21);
this.dtSD.TabIndex = 7;
//
// button3
//
this.button3.Dock = System.Windows.Forms.DockStyle.Right;
this.button3.Location = new System.Drawing.Point(431, 17);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(100, 29);
this.button3.TabIndex = 6;
this.button3.Text = "<< 이전달";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// button2
//
this.button2.Dock = System.Windows.Forms.DockStyle.Right;
this.button2.Location = new System.Drawing.Point(531, 17);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(100, 29);
this.button2.TabIndex = 5;
this.button2.Text = "이번달";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click_1);
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(631, 17);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(100, 29);
this.button1.TabIndex = 4;
this.button1.Text = "다음달 >>";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click_1);
//
// panel4
//
this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
@@ -413,53 +463,6 @@ namespace FBS0000.Holiday
this.panel5.Size = new System.Drawing.Size(734, 10);
this.panel5.TabIndex = 22;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(631, 17);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(100, 29);
this.button1.TabIndex = 4;
this.button1.Text = "다음달 >>";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click_1);
//
// button2
//
this.button2.Dock = System.Windows.Forms.DockStyle.Right;
this.button2.Location = new System.Drawing.Point(531, 17);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(100, 29);
this.button2.TabIndex = 5;
this.button2.Text = "이번달";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click_1);
//
// button3
//
this.button3.Dock = System.Windows.Forms.DockStyle.Right;
this.button3.Location = new System.Drawing.Point(431, 17);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(100, 29);
this.button3.TabIndex = 6;
this.button3.Text = "<< 이전달";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// dtSD
//
this.dtSD.Location = new System.Drawing.Point(17, 20);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(200, 21);
this.dtSD.TabIndex = 7;
//
// dtED
//
this.dtED.Location = new System.Drawing.Point(223, 20);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(200, 21);
this.dtED.TabIndex = 8;
//
// lvOK
//
this.lvOK.BackColor = System.Drawing.Color.Silver;
@@ -469,7 +472,8 @@ namespace FBS0000.Holiday
this.columnHeader9,
this.columnHeader10,
this.columnHeader11,
this.columnHeader12});
this.columnHeader12,
this.columnHeader13});
this.lvOK.Dock = System.Windows.Forms.DockStyle.Fill;
this.lvOK.HideSelection = false;
this.lvOK.Location = new System.Drawing.Point(3, 17);
@@ -531,6 +535,14 @@ namespace FBS0000.Holiday
this.groupBox5.TabStop = false;
this.groupBox5.Text = "불량 (불일치 데이터가 있는 날짜 입니다)";
//
// columnHeader13
//
this.columnHeader13.Text = "구분";
//
// columnHeader14
//
this.columnHeader14.Text = "구분";
//
// fErrorChk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -619,5 +631,7 @@ namespace FBS0000.Holiday
private System.Windows.Forms.ColumnHeader columnHeader12;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.ColumnHeader columnHeader13;
private System.Windows.Forms.ColumnHeader columnHeader14;
}
}

View File

@@ -111,17 +111,37 @@ namespace FBS0000.Holiday
//휴가신청확인
cmd.CommandText = "select sum(HolyDays),sum(HolyTimes) from EETGW_HolydayRequest where gcode = @gcode and sdate = '{0}' and isnull(conf,0) = 1";
cmd.CommandText = "select cate,sum(HolyDays),sum(HolyTimes) from EETGW_HolydayRequest where gcode = @gcode and sdate = '{0}' and isnull(conf,0) = 1 group by cate";
cmd.CommandText = string.Format(cmd.CommandText, pdate);
var dar = cmd.ExecuteReader();
double val_day = 0;
double val_time = 0;
Dictionary<string, double> catelistd = new Dictionary<string, double>();
Dictionary<string, double> catelistt = new Dictionary<string, double>();
while (dar.Read())
{
var str_day = dar[0].ToString();
var str_time = dar[1].ToString();
if (string.IsNullOrEmpty(str_day) == false) val_day = double.Parse(str_day);
if (string.IsNullOrEmpty(str_time) == false) val_time = double.Parse(str_time);
var str_cate = dar[0].ToString();
var str_day = dar[1].ToString();
var str_time = dar[2].ToString();
var v_day = 0.0;
var v_time = 0.0;
v_day += double.Parse(str_day);
v_time += double.Parse(str_time);
val_day += v_day;
val_time += v_time;
if (v_day != 0.0 && catelistd.ContainsKey(str_cate))
catelistd[str_cate] = catelistd[str_cate] + v_day;
else
catelistd.Add(str_cate, v_day);
if (v_time != 0.0 && catelistt.ContainsKey(str_cate))
catelistt[str_cate] = catelistt[str_cate] + v_time;
else
catelistt.Add(str_cate, v_time);
}
textBox3.Tag = val_day;// db_jobreport.Sum(t => t.kisulamt);
textBox3.Text = textBox3.Tag.ToString();
@@ -131,9 +151,11 @@ namespace FBS0000.Holiday
//근태입력자료확인
cmd.CommandText = "select sum(term) ,sum(crtime),sum(termdr),sum(drtime)" +
cmd.CommandText = "select cate,sum(term) ,sum(crtime),sum(termdr),sum(drtime)" +
" from Holyday " +
" where gcode = @gcode and sdate = '{0}' and isnull(extidx,-1) <> -1";
" where gcode = @gcode and sdate = '{0}' and isnull(extidx,-1) <> -1" +
" group by cate";
cmd.CommandText = string.Format(cmd.CommandText, pdate);
dar = cmd.ExecuteReader();
@@ -141,20 +163,141 @@ namespace FBS0000.Holiday
val_time = 0;
double val_day_dr = 0;
double val_time_dr = 0;
Dictionary<string, double> d_drd = new Dictionary<string, double>();
Dictionary<string, double> d_drt = new Dictionary<string, double>();
Dictionary<string, double> d_crd = new Dictionary<string, double>();
Dictionary<string, double> d_crt = new Dictionary<string, double>();
double v_crd, v_crt, v_drd, v_drt;
System.Text.StringBuilder sbcate = new StringBuilder();
while (dar.Read())
{
var str_day_cr = dar[0].ToString();
var str_time_cr = dar[1].ToString();
var str_day_dr = dar[2].ToString();
var str_time_dr = dar[3].ToString();
v_crd = v_crt = v_drd = v_drt = 0.0;
var str_cate = dar[0].ToString();
var str_day_cr = dar[1].ToString();
var str_time_cr = dar[2].ToString();
var str_day_dr = dar[3].ToString();
var str_time_dr = dar[4].ToString();
if (string.IsNullOrEmpty(str_day_cr) == false) val_day = double.Parse(str_day_cr);
if (string.IsNullOrEmpty(str_time_cr) == false) val_time = double.Parse(str_time_cr);
if (string.IsNullOrEmpty(str_day_cr) == false) v_crd = double.Parse(str_day_cr);
if (string.IsNullOrEmpty(str_time_cr) == false) v_crt = double.Parse(str_time_cr);
if (string.IsNullOrEmpty(str_day_dr) == false) val_day_dr = double.Parse(str_day_dr);
if (string.IsNullOrEmpty(str_time_dr) == false) val_time_dr = double.Parse(str_time_dr);
if (string.IsNullOrEmpty(str_day_dr) == false) v_drd = double.Parse(str_day_dr);
if (string.IsNullOrEmpty(str_time_dr) == false) v_drt = double.Parse(str_time_dr);
if (d_crd.ContainsKey(str_cate))
d_crd[str_cate] = d_crd[str_cate] + v_crd;
else
d_crd.Add(str_cate, v_crd);
if (d_crt.ContainsKey(str_cate))
d_crt[str_cate] = d_crt[str_cate] + v_crt;
else
d_crt.Add(str_cate, v_crt);
if (d_drd.ContainsKey(str_cate))
d_drd[str_cate] = d_drd[str_cate] + v_drd;
else
d_drd.Add(str_cate, v_drd);
if (d_drt.ContainsKey(str_cate))
d_drt[str_cate] = d_drt[str_cate] + v_drt;
else
d_drt.Add(str_cate, v_drt);
val_day += v_crd;// double.Parse(str_day_cr);
val_time += v_crt;// double.Parse(str_time_cr);
val_day_dr += v_drd;// double.Parse(str_day_dr);
val_time_dr += v_drt;// double.Parse(str_time_dr);
}
dar.Close();
//카테고리별데이터확인 (대변[CR]자료를 대상으로함)
bool cateerr = false;
foreach (var item in catelistd)
{
if (d_crd.ContainsKey(item.Key) == false)
{
sbcate.Append($"{item.Key}(X)");
cateerr = true;
break;
}
else
{
if (d_crd[item.Key] != item.Value)
{
sbcate.Append($"{item.Key}({d_crd[item.Key]}|{item.Value})");
cateerr = true;
break;
}
}
}
if (cateerr == false)
{
foreach (var item in catelistt)
{
if (d_crt.ContainsKey(item.Key) == false)
{
sbcate.Append($"{item.Key}(X)");
cateerr = true;
break;
}
else
{
if (d_crt[item.Key] != item.Value)
{
sbcate.Append($"{item.Key}({d_crt[item.Key]}|{item.Value})");
cateerr = true;
break;
}
}
}
}
if (cateerr == false)
{
foreach (var item in d_crd)
{
if (item.Key.Equals("대체")) continue;
if (catelistd.ContainsKey(item.Key) == false)
{
sbcate.Append($"{item.Key}(X)");
cateerr = true;
break;
}
else
{
if (catelistd[item.Key] != item.Value)
{
sbcate.Append($"{item.Key}({catelistd[item.Key]}|{item.Value})");
cateerr = true;
break;
}
}
}
}
if (cateerr == false)
{
foreach (var item in d_crt)
{
if (item.Key.Equals("대체")) continue;
if (catelistt.ContainsKey(item.Key) == false)
{
sbcate.Append($"{item.Key}(X)");
cateerr = true;
break;
}
else
{
if (catelistt[item.Key] != item.Value)
{
sbcate.Append($"{item.Key}({catelistt[item.Key]}|{item.Value})");
cateerr = true;
break;
}
}
}
}
textBox6.Tag = val_day;// db_jobreport.Sum(t => t.kisulamt);
textBox6.Text = textBox6.Tag.ToString();
textBox5.Tag = val_time;// db_jobreport.Sum(t => t.kisulamt);
@@ -170,6 +313,7 @@ namespace FBS0000.Holiday
if (textBox2.Text.Equals(textBox7.Text) == false) dataError = true;
if (textBox3.Text.Equals(textBox6.Text) == false) dataError = true;
if (textBox4.Text.Equals(textBox5.Text) == false) dataError = true;
if (cateerr) dataError = true;
ListViewItem lv = dataError ? this.lvNG.Items.Add(pdate) : this.lvOK.Items.Add(pdate);
@@ -178,6 +322,7 @@ namespace FBS0000.Holiday
lv.SubItems.Add($"{textBox2.Text}/{textBox7.Text}");
lv.SubItems.Add($"{textBox3.Text}/{textBox6.Text}");
lv.SubItems.Add($"{textBox4.Text}/{textBox5.Text}");
lv.SubItems.Add(sbcate.ToString());
if (dataError)
{

View File

@@ -117,4 +117,121 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="btChk.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="btCorr.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="progressBar1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tbDate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label10.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label9.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="textBox6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label11.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="label12.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="lvNG.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dtED.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dtSD.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="lvOK.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>