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-06-25 14:18:23 +09:00
parent 139c48721f
commit acc368d065
24 changed files with 712 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs generated
View File

@@ -117,13 +117,13 @@
this.taPartStatus = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter();
this.panel3 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox5 = new System.Windows.Forms.TextBox();
this.tbProjectName = new System.Windows.Forms.TextBox();
this.tbProjectIdx = new System.Windows.Forms.TextBox();
this.tbDue = new System.Windows.Forms.TextBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.textBox3 = new System.Windows.Forms.TextBox();
this.pdateTextBox = new System.Windows.Forms.TextBox();
this.textBox4 = new System.Windows.Forms.TextBox();
this.tbOrderNo = new System.Windows.Forms.TextBox();
this.tbPDate = new System.Windows.Forms.TextBox();
this.tbStatus = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
pdateLabel = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
@@ -1012,7 +1012,6 @@
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amt";
this.fpSpread1_Sheet1.Columns.Get(12).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-3]*RC[-2]";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "1대 금액";
this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amt";
@@ -1021,7 +1020,6 @@
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "amtn";
this.fpSpread1_Sheet1.Columns.Get(13).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[-4]*RC[-2]";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "N대 금액";
this.fpSpread1_Sheet1.Columns.Get(13).Tag = "amtn";
@@ -1139,16 +1137,16 @@
//
// panel4
//
this.panel4.Controls.Add(this.textBox1);
this.panel4.Controls.Add(this.textBox5);
this.panel4.Controls.Add(this.tbProjectName);
this.panel4.Controls.Add(this.tbProjectIdx);
this.panel4.Controls.Add(this.tbDue);
this.panel4.Controls.Add(this.linkLabel1);
this.panel4.Controls.Add(this.textBox3);
this.panel4.Controls.Add(this.tbOrderNo);
this.panel4.Controls.Add(label3);
this.panel4.Controls.Add(label5);
this.panel4.Controls.Add(this.pdateTextBox);
this.panel4.Controls.Add(this.tbPDate);
this.panel4.Controls.Add(pdateLabel);
this.panel4.Controls.Add(this.textBox4);
this.panel4.Controls.Add(this.tbStatus);
this.panel4.Controls.Add(label4);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(0, 24);
@@ -1157,26 +1155,26 @@
this.panel4.Size = new System.Drawing.Size(1345, 31);
this.panel4.TabIndex = 8;
//
// textBox1
// tbProjectName
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Location = new System.Drawing.Point(768, 5);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(572, 21);
this.textBox1.TabIndex = 3;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbProjectName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true));
this.tbProjectName.Dock = System.Windows.Forms.DockStyle.Fill;
this.tbProjectName.Location = new System.Drawing.Point(768, 5);
this.tbProjectName.Name = "tbProjectName";
this.tbProjectName.Size = new System.Drawing.Size(572, 21);
this.tbProjectName.TabIndex = 3;
this.tbProjectName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox5
// tbProjectIdx
//
this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true));
this.textBox5.Dock = System.Windows.Forms.DockStyle.Left;
this.textBox5.Location = new System.Drawing.Point(714, 5);
this.textBox5.Name = "textBox5";
this.textBox5.ReadOnly = true;
this.textBox5.Size = new System.Drawing.Size(54, 21);
this.textBox5.TabIndex = 9;
this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbProjectIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true));
this.tbProjectIdx.Dock = System.Windows.Forms.DockStyle.Left;
this.tbProjectIdx.Location = new System.Drawing.Point(714, 5);
this.tbProjectIdx.Name = "tbProjectIdx";
this.tbProjectIdx.ReadOnly = true;
this.tbProjectIdx.Size = new System.Drawing.Size(54, 21);
this.tbProjectIdx.TabIndex = 9;
this.tbProjectIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbDue
//
@@ -1201,35 +1199,35 @@
this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// textBox3
// tbOrderNo
//
this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true));
this.textBox3.Dock = System.Windows.Forms.DockStyle.Left;
this.textBox3.Location = new System.Drawing.Point(345, 5);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(177, 21);
this.textBox3.TabIndex = 5;
this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbOrderNo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true));
this.tbOrderNo.Dock = System.Windows.Forms.DockStyle.Left;
this.tbOrderNo.Location = new System.Drawing.Point(345, 5);
this.tbOrderNo.Name = "tbOrderNo";
this.tbOrderNo.Size = new System.Drawing.Size(177, 21);
this.tbOrderNo.TabIndex = 5;
this.tbOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// pdateTextBox
// tbPDate
//
this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true));
this.pdateTextBox.Dock = System.Windows.Forms.DockStyle.Left;
this.pdateTextBox.Location = new System.Drawing.Point(193, 5);
this.pdateTextBox.Name = "pdateTextBox";
this.pdateTextBox.Size = new System.Drawing.Size(100, 21);
this.pdateTextBox.TabIndex = 1;
this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbPDate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true));
this.tbPDate.Dock = System.Windows.Forms.DockStyle.Left;
this.tbPDate.Location = new System.Drawing.Point(193, 5);
this.tbPDate.Name = "tbPDate";
this.tbPDate.Size = new System.Drawing.Size(100, 21);
this.tbPDate.TabIndex = 1;
this.tbPDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// textBox4
// tbStatus
//
this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true));
this.textBox4.Dock = System.Windows.Forms.DockStyle.Left;
this.textBox4.Location = new System.Drawing.Point(49, 5);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(100, 21);
this.textBox4.TabIndex = 7;
this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbStatus.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true));
this.tbStatus.Dock = System.Windows.Forms.DockStyle.Left;
this.tbStatus.Location = new System.Drawing.Point(49, 5);
this.tbStatus.Name = "tbStatus";
this.tbStatus.Size = new System.Drawing.Size(100, 21);
this.tbStatus.TabIndex = 7;
this.tbStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label1
//
@@ -1323,13 +1321,13 @@
private dsPRJTableAdapters.ProjectPartStatusTableAdapter taPartStatus;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.TextBox pdateTextBox;
private System.Windows.Forms.TextBox tbPDate;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.TextBox tbProjectName;
private System.Windows.Forms.TextBox tbOrderNo;
private System.Windows.Forms.TextBox tbStatus;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.TextBox tbProjectIdx;
private System.Windows.Forms.TextBox tbDue;
private System.Windows.Forms.LinkLabel linkLabel1;
private arCtl.arLabel prb4;

45
SubProject/FPJ0000/Project/fPartBuyStatus.cs
View File

@@ -39,6 +39,19 @@ namespace FPJ0000
this.FormClosed += fPartList_FormClosed;
this.FormClosing += FPartList_FormClosing;
this.KeyDown += fPartList_KeyDown;
this.dsPRJ.ProjectPartStatus.ColumnChanged += ProjectPartStatus_ColumnChanged;
this.dsPRJ.ProjectPartStatus.RowChanged += ProjectPartStatus_RowChanged;
}
private void ProjectPartStatus_RowChanged(object sender, DataRowChangeEventArgs e)
{
//if (e.Action == DataRowAction.Add || ) return;
//Console.WriteLine("d");
}
private void ProjectPartStatus_ColumnChanged(object sender, DataColumnChangeEventArgs e)
{
}
private void FPartList_FormClosing(object sender, FormClosingEventArgs e)
@@ -96,7 +109,8 @@ namespace FPJ0000
string sortkey = string.Empty;
void RefreshData()
{
if (dsPRJ.HasChanges())
var changes = dsPRJ.ProjectPartStatus.GetChanges();
if (changes != null && changes.Rows.Count > 0)
{
var dlg = FCOMMON.Util.MsgQ("변경 사항이 있습니다. 갱신하면 변경 내용이 손실 됩니다.\n지금 갱신 하겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
@@ -127,9 +141,10 @@ namespace FPJ0000
// }
//}
//this.dsPRJ.AcceptChanges();
RefreshSum();
//RefreshSum();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
FormattingData();
dsPRJ.ProjectPartStatus.AcceptChanges();
}
void FormattingData()
{
@@ -287,14 +302,12 @@ namespace FPJ0000
this.fpSpread1.ResumeLayout();
}
void RefreshSum()
{
decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
//lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
}
//void RefreshSum()
//{
// decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
// decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
// //lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
//}
private void toolStripButton1_Click(object sender, EventArgs e)
@@ -488,7 +501,7 @@ namespace FPJ0000
var amt = iQty1 * iPrice1;
fpSpread1.ActiveSheet.Cells[Rowidx, colidx_amt].Value = amt;
//dv1.Rows[e.RowIndex].Cells["dvc_amt"].Value = amt;
RefreshSum();
//RefreshSum();
break;
}
@@ -861,7 +874,7 @@ namespace FPJ0000
if (dlg == DialogResult.Yes)
{
var taprj = new dsPRJTableAdapters.ProjectsTableAdapter();
var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(textBox5.Text), FCOMMON.info.Login.gcode);
var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(tbProjectIdx.Text), FCOMMON.info.Login.gcode);
if (cnt != 1)
{
FCOMMON.Util.MsgE($"적용실패 {cnt}건의 자료가 업데이트 됨");
@@ -875,6 +888,14 @@ namespace FPJ0000
var drv = this.bsPart.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
//tbDue.Text = dr.crdue;
//tbProjectIdx.Text = dr.Project.ToString();
//tbProjectName.Text = dr.name;
//tbOrderNo.Text = dr.orderno;
//tbPDate.Text = dr.pdate;
//tbStatus.Text = dr.status;
if (dr.crdue.isEmpty() == false)
{
DateTime dt;

26
SubProject/FPJ0000/Project/fPartBuyStatus.resx
View File

@@ -332,19 +332,19 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY
zVTMvM0pmprowiBbTCNTF5o4oUKUohcV2kWnNnXOOd1wRuYytTl1XsDLUnc5x+1Mvz3nbKmB0A8+PC+e
8/1wft9zeOyE3VcnX6rQKaMrdb/DJTqKnDSHjD31dHTFAB35RGs8K9ZUB8S83ceFdk/Eoz7Nko1eMRqN
HqtjA1b7Dis2Fho/F2wo/mRBfOWYU5Cj2O+LeieqTLvEhgem3dDPMNBbGOimGWinXFD/2kD7qAMbDNAy
RqH4wwzSnhmpfyThknZq3enC0KwHX2cZcjIY5CQu9Jo28GXUSQSbGFrwQD/vRqnCgpB73W+4cJws2HxD
ErMlkl9DWu111HY0oqRJhhBJIIIJgtIzCJOeRFVLFbeKnWawuOpEWFIvwwliK0Led4+0onXiJWp1hZwk
qSYSha8TkdsYD2HdZaTWpaJleBGtRjs+f1/HGukpXNpHcwJBtWB/gCTPoxvvwasRKcrVOZwkWR5FwleQ
+TwDGpODW6VrgoKS9LDqcCO8pN8rYCeirJfOr0+BwaRFnf4uHncWIE52Ack1MTBMO2EgxbIFaya9nViJ
IEy6S3DugcR9qugwEqsFGJocQGlPFqSKfMQ/DUWj+iO+zTEwkGIHptzoJyzZ3Ah56BMcF/uJ+OJDyG1I
wE15BBKqLnKSfEUixE0Z5E1Cwd4PWTwYZD8xwUaKDMrTegV88YE5vvggecgP/EI/XC0PRfaLFGhGlShV
FiHrXQqE8lgYiEBP/g0dEdDuTSJQ76xwPq+PXlijMTzn4egdn8ed+kykk6CoLh4FDbe371icLg8RNO8I
WNusdUfwPxzsChm7BKfzVc5yecPWXg/vhUql2jya1GL3xUmRmZ3mmXWnjb0wL1MwL1Ew+Vi2uznY5u20
N0xR1Jr/rbYfvjiPdyKzIztI2N55TKS0Boma6W3SvQT+RdhM+wvbVo+ktnUFpijSeDwe7w/xnZ33IE8q
nQAAAABJRU5ErkJggg==
zVTMdDqnaGpDFwbZYhqal9BEB11EKXpRoV10alPnnNMNZ2QuU5vzLnhZ6i7n6M7023POlhoI/eDD8+I5
3w/n9z2Hx07IfU3ipVK9KrJM/ztUpqfISXOUs6eBjizto8Mf60xnpdpKv6i3+7jQ7gl71KNdtNHLJpPJ
bXWsw2rfYdnGQuPnvA35n6YRWzbiFGQq93ujnoko1i2y4b5JFwxTDAzTDPSTDHQTG9D8WkfrsAPrDNA0
QiH/wxSSn5qofyShslZqzbmBgRk3vs4w5GTQz0k20G1ex5dhJxFsYmDeDcOcC4XKaQTd63zDhWPKAy03
ZFFb4pprSK6+juq2ehQ0lCNI5o9AgqDwDELkJ1HRVMGtYqcZLKw4EZLQzXCC6NKg951DzWgee4FqfS4n
SagKR+7reGTVx0KkuIwkRRKaBhfQbLLj8/c1rJKeQuU9NCcQVAr2+8my3frRLrwakqNEk8lJEmsiSPgK
0p6lQmt2cKt0jFFQkR5WHC6EFvR6BOyEFXfTklohjGYdFIa7KGrPQUz5BSRWRcE46YSRFMsWrB33dGIl
ghD5LsG5BzLXqbzDiK8UYGC8D4Vd6ZArJYh9Eox6zUd8m2VgJMX2TbjQS1i0uRD00Cs4LvUR86WHkFUX
h5s1YYiruMhJJMp4SBtSyZsEg70fmHajn/3EBBspMiBb5xHwpQdm+dKD5CEf8HN9cLUkGBnPhdAOq1Co
ykP6OyFENdEwEoGB/Bt6IqBdm0Sg2VnhfHYPPb9KY3DWzdE9Ooc7tWlIIUGxIhY5dbe371icG24iaNwR
sLYZ647gfzjYFVJ3CU5L1M6iqpdbez28F2q1evNoQpPdGydFprVbptacNvbCskTBskjB7GXJ7uJgm7fT
njBFUau+t1p+eOM83om0towAUWv7MbHKGiBupLdJ8eD/F1Ej7StqWTmS1NLhL1Qm83g83h/rHJ3uwC6N
XgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">