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

....

Browse Source
This commit is contained in:
chi
2021-12-20 12:42:18 +09:00
parent 19525c71b6
commit 4cf24cedaf
31 changed files with 2585 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,7 +647,7 @@
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.find;
this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.accept;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);

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

@@ -496,6 +496,13 @@ namespace FPJ0000
//FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
//return;
}
else if(dr.ot > 0 && dr.ot2 > 0)
{
//util.MsgE("연장/휴일 근무가 관리자에의해 확정된 상태이므로 값을 변경할 수 없습니다");
//ReadMod = true;
}
//ot데이터가잇고 관리자 확정되엇다면 처리하지 못한다
var f = new JobReport_.fJobReport_Add(dr,false,ReadMod);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)

201
SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs generated
View File

@@ -40,12 +40,14 @@
System.Windows.Forms.Label label6;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label7;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add));
System.Windows.Forms.Label label8;
System.Windows.Forms.Label label9;
System.Windows.Forms.Label label10;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add));
this.lbSummary = new System.Windows.Forms.Label();
this.tbHrs = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsPRJ = new FPJ0000.dsPRJ();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel();
@@ -64,18 +66,19 @@
this.tbProject = new System.Windows.Forms.ComboBox();
this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
this.panel1 = new System.Windows.Forms.Panel();
this.grpkisul = new System.Windows.Forms.GroupBox();
this.cmb_kisuldiv = new System.Windows.Forms.ComboBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.cmb_kisullv = new System.Windows.Forms.ComboBox();
this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
this.lbTitleTip = new System.Windows.Forms.Label();
this.tbTag = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsPRJ = new FPJ0000.dsPRJ();
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.grpkisul = new System.Windows.Forms.GroupBox();
this.cmb_kisullv = new System.Windows.Forms.ComboBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.cmb_kisuldiv = new System.Windows.Forms.ComboBox();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.lbOt2 = new System.Windows.Forms.ToolStripStatusLabel();
this.lbotReason = new System.Windows.Forms.ToolStripStatusLabel();
hrsLabel = new System.Windows.Forms.Label();
typeLabel = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
@@ -90,10 +93,10 @@
label8 = new System.Windows.Forms.Label();
label9 = new System.Windows.Forms.Label();
label10 = new System.Windows.Forms.Label();
this.statusStrip1.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
this.statusStrip1.SuspendLayout();
this.panel1.SuspendLayout();
this.grpkisul.SuspendLayout();
this.SuspendLayout();
//
@@ -201,6 +204,33 @@
label7.TabIndex = 23;
label7.Text = "초과시간정보";
//
// label8
//
label8.AutoSize = true;
label8.Location = new System.Drawing.Point(19, 38);
label8.Name = "label8";
label8.Size = new System.Drawing.Size(53, 12);
label8.TabIndex = 9;
label8.Text = "기술레벨";
//
// label9
//
label9.AutoSize = true;
label9.Location = new System.Drawing.Point(7, 59);
label9.Name = "label9";
label9.Size = new System.Drawing.Size(65, 12);
label9.TabIndex = 21;
label9.Text = "기술료($K)";
//
// label10
//
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(19, 16);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(53, 12);
label10.TabIndex = 24;
label10.Text = "기술분류";
//
// lbSummary
//
this.lbSummary.AutoSize = true;
@@ -223,11 +253,24 @@
this.tbHrs.Text = "0.0";
this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// bs
//
this.bs.DataMember = "JobReport";
this.bs.DataSource = this.dsPRJ;
//
// dsPRJ
//
this.dsPRJ.DataSetName = "dsPRJ";
this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// statusStrip1
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1,
this.lbIndex});
this.lbIndex,
this.toolStripStatusLabel2,
this.lbOt2,
this.lbotReason});
this.statusStrip1.Location = new System.Drawing.Point(0, 675);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(969, 22);
@@ -442,6 +485,50 @@
this.panel1.Size = new System.Drawing.Size(969, 177);
this.panel1.TabIndex = 0;
//
// grpkisul
//
this.grpkisul.Controls.Add(label10);
this.grpkisul.Controls.Add(this.cmb_kisuldiv);
this.grpkisul.Controls.Add(this.textBox1);
this.grpkisul.Controls.Add(label9);
this.grpkisul.Controls.Add(this.cmb_kisullv);
this.grpkisul.Controls.Add(label8);
this.grpkisul.Location = new System.Drawing.Point(615, 87);
this.grpkisul.Name = "grpkisul";
this.grpkisul.Size = new System.Drawing.Size(207, 82);
this.grpkisul.TabIndex = 29;
this.grpkisul.TabStop = false;
this.grpkisul.Text = "기술료";
//
// cmb_kisuldiv
//
this.cmb_kisuldiv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmb_kisuldiv.FormattingEnabled = true;
this.cmb_kisuldiv.Location = new System.Drawing.Point(77, 12);
this.cmb_kisuldiv.Name = "cmb_kisuldiv";
this.cmb_kisuldiv.Size = new System.Drawing.Size(108, 20);
this.cmb_kisuldiv.TabIndex = 23;
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kisulamt", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N3"));
this.textBox1.Font = new System.Drawing.Font("굴림", 9F);
this.textBox1.Location = new System.Drawing.Point(77, 55);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(108, 21);
this.textBox1.TabIndex = 22;
this.textBox1.Text = "0.000";
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// cmb_kisullv
//
this.cmb_kisullv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmb_kisullv.FormattingEnabled = true;
this.cmb_kisullv.Location = new System.Drawing.Point(77, 34);
this.cmb_kisullv.Name = "cmb_kisullv";
this.cmb_kisullv.Size = new System.Drawing.Size(108, 20);
this.cmb_kisullv.TabIndex = 10;
//
// dateTimePicker2
//
this.dateTimePicker2.CustomFormat = "yyyy-MM-dd hh:mm:ss";
@@ -482,16 +569,6 @@
this.tbTag.TabIndex = 60;
this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// bs
//
this.bs.DataMember = "JobReport";
this.bs.DataSource = this.dsPRJ;
//
// dsPRJ
//
this.dsPRJ.DataSetName = "dsPRJ";
this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// ta
//
this.ta.ClearBeforeFill = true;
@@ -517,76 +594,23 @@
this.tam.SPMasterTableAdapter = null;
this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// grpkisul
// toolStripStatusLabel2
//
this.grpkisul.Controls.Add(label10);
this.grpkisul.Controls.Add(this.cmb_kisuldiv);
this.grpkisul.Controls.Add(this.textBox1);
this.grpkisul.Controls.Add(label9);
this.grpkisul.Controls.Add(this.cmb_kisullv);
this.grpkisul.Controls.Add(label8);
this.grpkisul.Location = new System.Drawing.Point(615, 87);
this.grpkisul.Name = "grpkisul";
this.grpkisul.Size = new System.Drawing.Size(207, 82);
this.grpkisul.TabIndex = 29;
this.grpkisul.TabStop = false;
this.grpkisul.Text = "기술료";
this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
this.toolStripStatusLabel2.Size = new System.Drawing.Size(10, 17);
this.toolStripStatusLabel2.Text = "|";
//
// cmb_kisullv
// lbOt2
//
this.cmb_kisullv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmb_kisullv.FormattingEnabled = true;
this.cmb_kisullv.Location = new System.Drawing.Point(77, 34);
this.cmb_kisullv.Name = "cmb_kisullv";
this.cmb_kisullv.Size = new System.Drawing.Size(108, 20);
this.cmb_kisullv.TabIndex = 10;
this.lbOt2.Name = "lbOt2";
this.lbOt2.Size = new System.Drawing.Size(121, 17);
this.lbOt2.Text = "toolStripStatusLabel3";
//
// label8
// lbotReason
//
label8.AutoSize = true;
label8.Location = new System.Drawing.Point(19, 38);
label8.Name = "label8";
label8.Size = new System.Drawing.Size(53, 12);
label8.TabIndex = 9;
label8.Text = "기술레벨";
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kisulamt", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N3"));
this.textBox1.Font = new System.Drawing.Font("굴림", 9F);
this.textBox1.Location = new System.Drawing.Point(77, 55);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(108, 21);
this.textBox1.TabIndex = 22;
this.textBox1.Text = "0.000";
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label9
//
label9.AutoSize = true;
label9.Location = new System.Drawing.Point(7, 59);
label9.Name = "label9";
label9.Size = new System.Drawing.Size(65, 12);
label9.TabIndex = 21;
label9.Text = "기술료($K)";
//
// cmb_kisuldiv
//
this.cmb_kisuldiv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmb_kisuldiv.FormattingEnabled = true;
this.cmb_kisuldiv.Location = new System.Drawing.Point(77, 12);
this.cmb_kisuldiv.Name = "cmb_kisuldiv";
this.cmb_kisuldiv.Size = new System.Drawing.Size(108, 20);
this.cmb_kisuldiv.TabIndex = 23;
//
// label10
//
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(19, 16);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(53, 12);
label10.TabIndex = 24;
label10.Text = "기술분류";
this.lbotReason.Name = "lbotReason";
this.lbotReason.Size = new System.Drawing.Size(121, 17);
this.lbotReason.Text = "toolStripStatusLabel4";
//
// fJobReport_Add
//
@@ -603,12 +627,12 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "업무일지 등록/변경";
this.Load += new System.EventHandler(this.fJobReport_Add_Load);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.grpkisul.ResumeLayout(false);
this.grpkisul.PerformLayout();
this.ResumeLayout(false);
@@ -650,5 +674,8 @@
private System.Windows.Forms.ComboBox cmb_kisullv;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.ComboBox cmb_kisuldiv;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
private System.Windows.Forms.ToolStripStatusLabel lbOt2;
private System.Windows.Forms.ToolStripStatusLabel lbotReason;
}
}

28
SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
View File

@@ -148,6 +148,28 @@ namespace FPJ0000.JobReport_
tbTag.Text = dr.tag;
if(dr.ot > 0)
{
if(dr.ot2 == 0)
{
lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다";
lbOt2.ForeColor = Color.Blue;
lbotReason.Visible = false;
}
else
{
lbOt2.Text = $"승인시간:{dr.ot2}";
lbotReason.Text = $"사유:{dr.otReason}";
}
}
else
{
lbOt2.Visible = false;
lbotReason.Visible = false;
}
if (getKisulInput)
{
cmb_kisuldiv.Text = dr.kisuldiv;
@@ -210,6 +232,12 @@ namespace FPJ0000.JobReport_
this.Show();
Application.DoEvents();
if(dr.ot > 0 && dr.ot2 > 0)
{
tbOt.Enabled = false;
FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다");
}
//if (this.richTextBoxEx1.Text.Trim() != "")
//{
// this.richTextBoxEx1.Focus();

30
SubProject/FPJ0000/JobReport_/fJobReport_Add.resx
View File

@@ -150,9 +150,21 @@
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>299, 17</value>
</metadata>
@@ -163,24 +175,6 @@
}
</value>
</data>
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>164, 17</value>
</metadata>