From f14de05f941d033b034167374f12d5061c8055fb Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 6 Nov 2023 09:50:39 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=9E=90=EC=8B=A4=20=EA=B5=AC?= =?UTF-8?q?=EB=A7=A4=EA=B4=80=EB=A0=A8=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 26 +- Project/fMain.resx | 8 +- SubProject/FEQ0000/FEQ0000.csproj | 2 + .../FEQ0000/PurchaseEB/Rpt_Purchase.rdlc | 843 +++++++++++++++++ .../FEQ0000/PurchaseEB/Rpt_PurchasePrc.rdlc | 845 ++++++++++++++++++ .../PurchaseEB/fPurchaseEB.Designer.cs | 174 ++-- .../PurchaseEB/fPurchaseEBList.Designer.cs | 274 +++--- .../FEQ0000/PurchaseEB/fPurchaseEBList.cs | 2 +- .../FEQ0000/PurchaseEB/fPurchaseEBList.resx | 23 +- .../PurchaseEB/fPurchaseEB_Add.Designer.cs | 76 +- .../FEQ0000/PurchaseEB/fPurchaseEB_Add.cs | 26 +- .../PurchaseEB/rPurchaseEB.Designer.cs | 32 +- SubProject/FEQ0000/PurchaseEB/rPurchaseEB.cs | 52 +- .../FEQ0000/PurchaseEB/rPurchaseEB.resx | 11 +- .../PurchaseNR/fPurchaseNR.Designer.cs | 359 ++++---- SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs | 14 +- .../FEQ0000/PurchaseNR/fPurchaseNR.resx | 58 +- .../PurchaseNR/fPurchase_excelimport.cs | 92 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 4 +- SubProject/FEQ0000/dsPurchase.xsd | 152 ++-- .../FPJ0000/JobReport_/rJobReportPrjSche.cs | 2 + 22 files changed, 2436 insertions(+), 643 deletions(-) create mode 100644 SubProject/FEQ0000/PurchaseEB/Rpt_Purchase.rdlc create mode 100644 SubProject/FEQ0000/PurchaseEB/Rpt_PurchasePrc.rdlc diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 91954ea..dee3ec1 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.10.30.2000")] -[assembly: AssemblyFileVersion("23.10.30.2000")] +[assembly: AssemblyVersion("23.11.06.0950")] +[assembly: AssemblyFileVersion("23.11.06.0950")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 31a8849..5e4f0f7 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -41,6 +41,7 @@ this.lbSvr = new System.Windows.Forms.ToolStripStatusLabel(); this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.sbLoginUseTime = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.btSetting = new System.Windows.Forms.ToolStripMenuItem(); this.로그인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -154,7 +155,6 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.sbLoginUseTime = new System.Windows.Forms.ToolStripStatusLabel(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -230,6 +230,12 @@ this.toolStripStatusLabel1.Size = new System.Drawing.Size(35, 17); this.toolStripStatusLabel1.Text = "MAIL"; // + // sbLoginUseTime + // + this.sbLoginUseTime.Name = "sbLoginUseTime"; + this.sbLoginUseTime.Size = new System.Drawing.Size(68, 17); + this.sbLoginUseTime.Text = "LOGINTIME"; + // // menuStrip1 // this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F); @@ -401,7 +407,7 @@ // 일반구매ToolStripMenuItem // this.일반구매ToolStripMenuItem.Name = "일반구매ToolStripMenuItem"; - this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.일반구매ToolStripMenuItem.Text = "일반 구매"; this.일반구매ToolStripMenuItem.Click += new System.EventHandler(this.일반구매ToolStripMenuItem_Click); // @@ -409,27 +415,27 @@ // this.cR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.cR구매ToolStripMenuItem.Name = "cR구매ToolStripMenuItem"; - this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.cR구매ToolStripMenuItem.Text = "CR 구매"; this.cR구매ToolStripMenuItem.Click += new System.EventHandler(this.cR구매ToolStripMenuItem_Click); // // sPR구매ToolStripMenuItem // - this.sPR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Blue; + this.sPR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.sPR구매ToolStripMenuItem.Name = "sPR구매ToolStripMenuItem"; - this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.sPR구매ToolStripMenuItem.Text = "전자실 구매"; this.sPR구매ToolStripMenuItem.Click += new System.EventHandler(this.sPR구매ToolStripMenuItem_Click); // // toolStripMenuItem14 // this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(150, 6); + this.toolStripMenuItem14.Size = new System.Drawing.Size(177, 6); // // 품목입고ToolStripMenuItem // this.품목입고ToolStripMenuItem.Name = "품목입고ToolStripMenuItem"; - this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.품목입고ToolStripMenuItem.Text = "품목 입고"; this.품목입고ToolStripMenuItem.Click += new System.EventHandler(this.품목입고ToolStripMenuItem_Click); // @@ -1207,12 +1213,6 @@ this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // sbLoginUseTime - // - this.sbLoginUseTime.Name = "sbLoginUseTime"; - this.sbLoginUseTime.Size = new System.Drawing.Size(68, 17); - this.sbLoginUseTime.Text = "LOGINTIME"; - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/Project/fMain.resx b/Project/fMain.resx index 59a8fb3..3b025bb 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UzMr/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3tzr9vV7o9blnWyHc + /U7m/E+5XP8/92TF/3lzYj/UzMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3tzr8vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP69+fX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQCz2KrByZltZQAAAABJRU5ErkJggg== + 2d+jAdUG1LhtIjtQcP6dufX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQCiCqq1gzZLfQAAAABJRU5ErkJggg== diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 5073dd1..1669487 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -380,6 +380,8 @@ fPurchaseEB_Ipgo.cs + + rPurchaseEB.cs diff --git a/SubProject/FEQ0000/PurchaseEB/Rpt_Purchase.rdlc b/SubProject/FEQ0000/PurchaseEB/Rpt_Purchase.rdlc new file mode 100644 index 0000000..4c54d86 --- /dev/null +++ b/SubProject/FEQ0000/PurchaseEB/Rpt_Purchase.rdlc @@ -0,0 +1,843 @@ + + + + + + + + + + + + true + true + + + + + User + + + + + + + Textbox10 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + + + + + + 1.78563cm + + + 1.99729cm + + + 2.57938cm + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + pumamt + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + pumamt1 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox8 + + + Silver + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox6 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox20 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox9 + + + Silver + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + = left(Fields!pdate.Value,4) + + + + + =Fields!pdate.Value + + + + 0.6cm + + + true + true + + + + + = left(Fields!pdate.Value,4) + + + + + + + pdate1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =mid(Fields!pdate.Value,6,2) + + + + + =Fields!pdate.Value + + + + 0.6cm + + + true + true + + + + + =mid(Fields!pdate.Value,6,2) + + + + + + + pdate + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 0.6cm + + + true + true + + + + + S.Total + + + + + + + Textbox18 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 1.2cm + + + true + true + + + + + Total + + + + + + + Textbox12 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + =Fields!request.Value + + + + + =Fields!request.Value + + + + 2.5cm + + + true + true + + + + + =Fields!request.Value + + + + + + + request + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 2.5cm + + + true + true + + + + + 합계 + + + + + + + Textbox5 + + + LightGrey + 2pt + 2pt + 2pt + 2pt + + + + + Before + + + + DataSet1 + 2.4cm + 8.8623cm + + + + + + 0.94488in + + + + + + + Textbox10 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + 2 + + + + + + + + + + + + 1.78563cm + + + 1.99729cm + + + 2.57938cm + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + pumamt + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + pumamt1 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox8 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox6 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox20 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!pumamt.Value) + + + + + + + Textbox9 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + = left(Fields!pdate.Value,4) + + + + + =Fields!pdate.Value + + + + 0.6cm + + + true + true + + + + + = left(Fields!pdate.Value,4) + + + + + + + pdate1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =mid(Fields!pdate.Value,6,2) + + + + + =Fields!pdate.Value + + + + 0.6cm + + + true + true + + + + + =mid(Fields!pdate.Value,6,2) + + + + + + + pdate + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 0.6cm + + + true + true + + + + + S.Total + + + + + + + Textbox18 + + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 1.2cm + + + true + true + + + + + Total + + + + + + + Textbox12 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + =Fields!process.Value + + + + + =Fields!request.Value + + + + 3.77cm + + + true + true + + + + + =Fields!process.Value + + + + + + + process + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 3.77cm + + + true + true + + + + + 합계 + + + + + + + Textbox5 + + + LightGrey + 2pt + 2pt + 2pt + 2pt + + + + + Before + + + + DataSet1 + 2.4cm + 10.1323cm + + + + + + 0.94488in +