From 2aca2e9a8c920cc1cdf582bc49e39fe8f1b4d333 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 8 Jan 2025 16:17:34 +0900 Subject: [PATCH] .. --- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 36 ++- Project/fMain.cs | 6 + Project/fMain.resx | 6 +- SubProject/FBS0000/FBS0000.csproj | 13 +- .../FBS0000/Holiday/fTimeTransfer.Designer.cs | 291 ++++++++++++++++++ SubProject/FBS0000/Holiday/fTimeTransfer.cs | 166 ++++++++++ SubProject/FBS0000/Holiday/fTimeTransfer.resx | 120 ++++++++ SubProject/FBS0000/dsReport.xsd | 12 +- SubProject/FBS0000/dsReport.xss | 8 +- SubProject/FCM0000/Mail/fJRForm.Designer.cs | 77 +++-- SubProject/FCM0000/Mail/fJRForm.cs | 10 +- SubProject/FCM0000/Mail/fJRForm.resx | 34 +- .../FPJ0000/JobReport_/fJobProcessSelect.cs | 2 +- 14 files changed, 721 insertions(+), 64 deletions(-) create mode 100644 SubProject/FBS0000/Holiday/fTimeTransfer.Designer.cs create mode 100644 SubProject/FBS0000/Holiday/fTimeTransfer.cs create mode 100644 SubProject/FBS0000/Holiday/fTimeTransfer.resx diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 72691d8..32226c6 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("25.01.08.0830")] -[assembly: AssemblyFileVersion("25.01.08.0830")] +[assembly: AssemblyVersion("25.01.08.1140")] +[assembly: AssemblyFileVersion("25.01.08.1140")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index d760158..e2c6572 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -74,6 +74,8 @@ this.목록ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.자동입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.업무분류및형태설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.업무현황전자실ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.교육목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.비용절감ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -149,8 +151,7 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.업무분류및형태설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.대체시간이월ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -527,6 +528,18 @@ this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(211, 6); + // + // 업무분류및형태설정ToolStripMenuItem + // + this.업무분류및형태설정ToolStripMenuItem.Name = "업무분류및형태설정ToolStripMenuItem"; + this.업무분류및형태설정ToolStripMenuItem.Size = new System.Drawing.Size(214, 24); + this.업무분류및형태설정ToolStripMenuItem.Text = "업무분류 및 형태설정"; + this.업무분류및형태설정ToolStripMenuItem.Click += new System.EventHandler(this.업무분류및형태설정ToolStripMenuItem_Click); + // // 업무현황전자실ToolStripMenuItem // this.업무현황전자실ToolStripMenuItem.Name = "업무현황전자실ToolStripMenuItem"; @@ -599,7 +612,8 @@ this.근로명부ToolStripMenuItem, this.toolStripMenuItem11, this.근태입력오류확인ToolStripMenuItem, - this.근태마감ToolStripMenuItem}); + this.근태마감ToolStripMenuItem, + this.대체시간이월ToolStripMenuItem}); this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.휴가관리ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("휴가관리ToolStripMenuItem.Image"))); this.휴가관리ToolStripMenuItem.Name = "휴가관리ToolStripMenuItem"; @@ -1168,17 +1182,12 @@ this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // toolStripMenuItem2 + // 대체시간이월ToolStripMenuItem // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(211, 6); - // - // 업무분류및형태설정ToolStripMenuItem - // - this.업무분류및형태설정ToolStripMenuItem.Name = "업무분류및형태설정ToolStripMenuItem"; - this.업무분류및형태설정ToolStripMenuItem.Size = new System.Drawing.Size(214, 24); - this.업무분류및형태설정ToolStripMenuItem.Text = "업무분류 및 형태설정"; - this.업무분류및형태설정ToolStripMenuItem.Click += new System.EventHandler(this.업무분류및형태설정ToolStripMenuItem_Click); + this.대체시간이월ToolStripMenuItem.Name = "대체시간이월ToolStripMenuItem"; + this.대체시간이월ToolStripMenuItem.Size = new System.Drawing.Size(248, 24); + this.대체시간이월ToolStripMenuItem.Text = "대체시간 이월"; + this.대체시간이월ToolStripMenuItem.Click += new System.EventHandler(this.대체시간이월ToolStripMenuItem_Click); // // fMain // @@ -1332,6 +1341,7 @@ private System.Windows.Forms.ToolStripMenuItem 전자실구매승인ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 업무분류및형태설정ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 대체시간이월ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index b6f5836..9154aa9 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -1494,5 +1494,11 @@ namespace Project var f = new FPJ0000.JobReport_.fJobProcessSelect("",true); f.Show(); } + + private void 대체시간이월ToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new FBS0000.Holiday.fTimeTransfer();//.fJobProcessSelect("", true); + f.Show(); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index d43f8d7..535a71c 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -457,14 +457,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/U9Of/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP + /U7m/E+5XP8/92TF/3lzYj/U9OX/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP /0Mzc/4/6kz7f3VS5k+QGAyb7A49wbBE5xpUJxQs1RUsvtVdB1PUcaj+//XSiP/7W+3/Xi/0+tyzrRBu QPGtrgsg9VCdCFB8s3suTFHlpY5l5wtDDl5Odvt2MUjt/7YKp73FFzs+guQKbva8g2pBBTAXFN3sKQHx X7RGiD8u8/x/JUPrz5NsG7XCm736QNs/F93qOQ/WgA6K7/QYF9/oOg7lMjwu9vR8VOrxH4xLvDxAYkBX lgItagErwAaK73SLQZkMTyq8smAGPKn0zgSJ1d+v58i9NZEPrIAQeFTh2fek3Os/CD8u9+qFChMPgP7f CPdCqccGqDBx4P/+eo4XXVGn3/TE/Qfhl52Rp0BiUGns4N+Bfs2/B3r7/h/oPXP/QO9vIP0fGUPFzoDV - 7O/RgGoDatw2kR0oOP/ylPp/6JpwYZDavwd65oH0Mvzd39uLTRExGKQX6PQ+W6Bpy4ECq0jBID3/DvTZ - AgBpU6qH8SY7KwAAAABJRU5ErkJggg== + 7O/RgGoDatw2kR0oOP/S5Pp/6JpwYZDavwd65oH0Mvzd39uLTRExGKQX6PQ+W6Bpy4ECq0jBID3/DvTZ + AgBjWaqCXsfGmAAAAABJRU5ErkJggg== diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index 217fede..7b0e3dc 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -35,6 +35,9 @@ false + + ..\..\DLL\arCommUtil.dll + False ..\..\Sub\arCtl\bin\debug\arControl.Net4.dll @@ -142,6 +145,12 @@ fLovWorkUser.cs + + Form + + + fTimeTransfer.cs + Form @@ -249,6 +258,9 @@ fLovWorkUser.cs + + fTimeTransfer.cs + fErrorChk.cs @@ -319,7 +331,6 @@ MSDataSetGenerator - dsReport.Designer.cs Designer diff --git a/SubProject/FBS0000/Holiday/fTimeTransfer.Designer.cs b/SubProject/FBS0000/Holiday/fTimeTransfer.Designer.cs new file mode 100644 index 0000000..c8a4027 --- /dev/null +++ b/SubProject/FBS0000/Holiday/fTimeTransfer.Designer.cs @@ -0,0 +1,291 @@ + +namespace FBS0000.Holiday +{ + partial class fTimeTransfer + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btChk = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + 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.groupBox4 = new System.Windows.Forms.GroupBox(); + this.listView1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.button4 = new System.Windows.Forms.Button(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); + this.panel1 = new System.Windows.Forms.Panel(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // btChk + // + this.btChk.Dock = System.Windows.Forms.DockStyle.Top; + this.btChk.Font = new System.Drawing.Font("맑은 고딕", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btChk.Location = new System.Drawing.Point(5, 5); + this.btChk.Name = "btChk"; + this.btChk.Size = new System.Drawing.Size(734, 66); + this.btChk.TabIndex = 5; + this.btChk.Text = "대체 시간 계산"; + this.btChk.UseVisualStyleBackColor = true; + this.btChk.Click += new System.EventHandler(this.button1_Click); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.dtSD); + this.groupBox3.Controls.Add(this.button3); + this.groupBox3.Controls.Add(this.button2); + this.groupBox3.Controls.Add(this.button1); + this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox3.Location = new System.Drawing.Point(5, 81); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 3, 3, 10); + this.groupBox3.Size = new System.Drawing.Size(734, 70); + this.groupBox3.TabIndex = 20; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "계산기준"; + // + // dtSD + // + this.dtSD.CalendarFont = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.dtSD.CustomFormat = "yyy-MM"; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Bold); + this.dtSD.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtSD.Location = new System.Drawing.Point(17, 20); + this.dtSD.Name = "dtSD"; + this.dtSD.Size = new System.Drawing.Size(170, 39); + 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, 43); + 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, 43); + 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, 43); + 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; + this.panel4.Location = new System.Drawing.Point(5, 151); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(734, 10); + this.panel4.TabIndex = 21; + // + // panel5 + // + this.panel5.Dock = System.Windows.Forms.DockStyle.Top; + this.panel5.Location = new System.Drawing.Point(5, 71); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(734, 10); + this.panel5.TabIndex = 22; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.listView1); + this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox4.Location = new System.Drawing.Point(5, 161); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(734, 473); + this.groupBox4.TabIndex = 24; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "정상"; + // + // listView1 + // + this.listView1.CheckBoxes = true; + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2, + this.columnHeader3, + this.columnHeader4, + this.columnHeader5}); + this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.listView1.FullRowSelect = true; + this.listView1.GridLines = true; + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(3, 17); + this.listView1.MultiSelect = false; + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(728, 453); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.View = System.Windows.Forms.View.Details; + // + // columnHeader1 + // + this.columnHeader1.Text = "No"; + this.columnHeader1.Width = 117; + // + // columnHeader2 + // + this.columnHeader2.Text = "Name"; + this.columnHeader2.Width = 222; + // + // columnHeader3 + // + this.columnHeader3.Text = "발생"; + this.columnHeader3.Width = 108; + // + // columnHeader4 + // + this.columnHeader4.Text = "사용"; + this.columnHeader4.Width = 94; + // + // columnHeader5 + // + this.columnHeader5.Text = "잔량"; + this.columnHeader5.Width = 128; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.button4); + this.groupBox1.Controls.Add(this.dateTimePicker1); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.groupBox1.Location = new System.Drawing.Point(5, 644); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 10); + this.groupBox1.Size = new System.Drawing.Size(734, 70); + this.groupBox1.TabIndex = 25; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "등록 기준"; + // + // button4 + // + this.button4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.button4.Dock = System.Windows.Forms.DockStyle.Right; + this.button4.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.button4.Location = new System.Drawing.Point(292, 17); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(439, 43); + this.button4.TabIndex = 27; + this.button4.Text = "좌측 기준일로 데이터를 등록 합니다"; + this.button4.UseVisualStyleBackColor = false; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // dateTimePicker1 + // + this.dateTimePicker1.CalendarFont = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.dateTimePicker1.CustomFormat = "yyyy-MM-dd"; + this.dateTimePicker1.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Bold); + this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dateTimePicker1.Location = new System.Drawing.Point(17, 20); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(200, 39); + this.dateTimePicker1.TabIndex = 7; + // + // panel1 + // + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(5, 634); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(734, 10); + this.panel1.TabIndex = 26; + // + // fTimeTransfer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(744, 719); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.panel1); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.panel4); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.panel5); + this.Controls.Add(this.btChk); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fTimeTransfer"; + this.Padding = new System.Windows.Forms.Padding(5); + this.Text = "대체시간 이월"; + this.Load += new System.EventHandler(this.fErrorChk_Load); + this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.Button btChk; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.DateTimePicker dtSD; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.ColumnHeader columnHeader5; + } +} \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fTimeTransfer.cs b/SubProject/FBS0000/Holiday/fTimeTransfer.cs new file mode 100644 index 0000000..4531c0c --- /dev/null +++ b/SubProject/FBS0000/Holiday/fTimeTransfer.cs @@ -0,0 +1,166 @@ +using FCOMMON; +using NetOffice.Extensions.Invoker; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using AR; +using NetOffice.OutlookApi; + +namespace FBS0000.Holiday +{ + public partial class fTimeTransfer : fBase + { + public fTimeTransfer() + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + + //dtSD.KeyDown += dtSD_KeyDown; + //dtED.KeyDown += dtSD_KeyDown; + } + private void fErrorChk_Load(object sender, EventArgs e) + { + //기본 이번달 설정한다 + dtSD.Value = DateTime.Now.AddMonths(-1); + dateTimePicker1.Value = new DateTime(DateTime.Now.Year, 1, 1); + EnsureVisibleAndUsableSize(); + } + + private void button1_Click(object sender, EventArgs e) + { + //검사버튼 + var sd = DateTime.Parse(dtSD.Text); + var stime = new DateTime(sd.Year, 1, 1); + var etime = new DateTime(sd.Year, sd.Month, 1).AddMonths(1).AddDays(-1); + + var gcode = FCOMMON.info.Login.gcode; + //var id = FCOMMON.info.Login.no; + + var cn = FCOMMON.DBM.getCn(); + cn.Open(); + var cmd = new System.Data.SqlClient.SqlCommand("", cn); + cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode; + cmd.Parameters.Add("sd", SqlDbType.VarChar).Value = stime.ToShortDateString(); + cmd.Parameters.Add("ed", SqlDbType.VarChar).Value = etime.ToShortDateString(); + + //근태입력자료확인 + cmd.CommandText = "SELECT holyday.uid, Users.name,\r\nsum( Holyday.DrTime) AS Dr," + + " sum(Holyday.CrTime) AS Cr, sum( Holyday.DrTime) - sum(holyday.crtime) as jan" + + " FROM Holyday WITH (NOLOCK)" + + " LEFT OUTER JOIN EETGW_GroupUser WITH (NOLOCK) " + + " ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid " + + " LEFT OUTER JOIN Users WITH (NOLOCK) ON Holyday.uid = Users.id" + + " WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) and EETGW_GroupUser.useUserState = 1 " + + " AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) <> 0)" + + " group by holyday.uid,Users.name" + + " having sum( Holyday.DrTime) - sum(holyday.crtime) <> 0" + + " order by Users.name"; + + var dar = cmd.ExecuteReader(); + this.listView1.Items.Clear(); + double sum_dr, sum_cr, sum_jan; + sum_dr = sum_cr = sum_jan = 0.0; + while (dar.Read()) + { + var str_uid = dar[0].ToString(); + var str_name = dar[1].ToString(); + var str_dr = (double)dar[2]; + var str_cr = (double)dar[3]; + var str_jan = (double)dar[4]; + + sum_dr += str_dr; + sum_cr += str_cr; + sum_jan += str_jan; + + var lv = this.listView1.Items.Add(str_uid); + lv.SubItems.Add(str_name); + lv.SubItems.Add(str_dr.ToString()); + lv.SubItems.Add(str_cr.ToString()); + lv.SubItems.Add(str_jan.ToString()); + lv.Tag = $"{str_uid}|{str_jan}"; + lv.Checked = true; + } + + var lvsum = this.listView1.Items.Add("Total"); + lvsum.SubItems.Add(""); + lvsum.SubItems.Add(sum_dr.ToString()); + lvsum.SubItems.Add(sum_cr.ToString()); + lvsum.SubItems.Add(sum_jan.ToString()); + lvsum.Checked = false; + lvsum.BackColor = Color.Gray; + + dar.Close(); + cn.Dispose(); + + } + + private void button2_Click_1(object sender, EventArgs e) + { + dtSD.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01"); + } + + private void button3_Click(object sender, EventArgs e) + { + var 시작달 = DateTime.Parse(dtSD.Value.ToString("yyyy-MM") + "-01"); + dtSD.Value = 시작달.AddMonths(-1); + } + + private void button1_Click_1(object sender, EventArgs e) + { + var 다음달 = DateTime.Parse(dtSD.Value.ToString("yyyy-MM") + "-01"); + dtSD.Value = 다음달.AddMonths(1); + } + + private void button4_Click(object sender, EventArgs e) + { + var chkitems = this.listView1.CheckedItems; + if (chkitems.Count < 1) + { + UTIL.MsgE("등록 가능한 아이템이 없습니다"); + return; + } + + var ed = dateTimePicker1.Value; + if (UTIL.MsgQ($"{chkitems.Count}건의 자료를 {ed.ToShortDateString()}일자로 등록할까요?\n구분은 '대체'로 입력됩니다") != DialogResult.Yes) + return; + + var sumjan = 0.0; + var ta = new dsMSSQLTableAdapters.HolydayTableAdapter(); + var dt = new dsMSSQL.HolydayDataTable(); + foreach (ListViewItem lv in chkitems) + { + if (lv.Tag == null) continue; + var buf = lv.Tag.ToString().Split('|'); + var uid = buf[0]; + var jan = double.Parse(buf[1]); + sumjan += jan; + + var dr = dt.NewHolydayRow(); + dr.DrTime = jan; + dr.sdate = ed; + dr.edate = ed; + dr.uid = uid; + dr.title = "대체이월"; + dr.contents = "대체이월"; + dr.tag = "iwol"; + dr.wuid = FCOMMON.info.Login.no; + dr.wdate = DateTime.Now; + dr.cate = "대체"; + dr.iwol = true; + dr.gcode = FCOMMON.info.Login.gcode; + dt.AddHolydayRow(dr); + } + var cnt = ta.Update(dt); + if (cnt > 0) + UTIL.MsgI($"{cnt}건의 자료가 추가 되었습니다"); + else UTIL.MsgE("저장된 자료가 없습니다"); + } + } +} diff --git a/SubProject/FBS0000/Holiday/fTimeTransfer.resx b/SubProject/FBS0000/Holiday/fTimeTransfer.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FBS0000/Holiday/fTimeTransfer.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SubProject/FBS0000/dsReport.xsd b/SubProject/FBS0000/dsReport.xsd index b647912..3c9c478 100644 --- a/SubProject/FBS0000/dsReport.xsd +++ b/SubProject/FBS0000/dsReport.xsd @@ -73,7 +73,8 @@ ORDER BY Holyday.uid, CrDay FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON Holyday.uid = Users.id -WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) = 0) +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) = 0) AND + (EETGW_GroupUser.useUserState = 1) ORDER BY Holyday.sdate, Holyday.idx @@ -137,7 +138,8 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users WITH (NOLOCK) ON Holyday.uid = Users.id -WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) <> 0) +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) <> 0) AND + (EETGW_GroupUser.useUserState = 1) ORDER BY Holyday.sdate, Holyday.idx @@ -272,7 +274,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -326,7 +328,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -342,7 +344,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + diff --git a/SubProject/FBS0000/dsReport.xss b/SubProject/FBS0000/dsReport.xss index 365563b..ebca15d 100644 --- a/SubProject/FBS0000/dsReport.xss +++ b/SubProject/FBS0000/dsReport.xss @@ -6,10 +6,10 @@ --> - - - - + + + + \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fJRForm.Designer.cs b/SubProject/FCM0000/Mail/fJRForm.Designer.cs index 67e02e6..71d92f5 100644 --- a/SubProject/FCM0000/Mail/fJRForm.Designer.cs +++ b/SubProject/FCM0000/Mail/fJRForm.Designer.cs @@ -51,9 +51,11 @@ this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1 = new System.Windows.Forms.Panel(); + this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); this.subjectTextBox = new System.Windows.Forms.TextBox(); this.ta = new FCM0000.dsMSSQLTableAdapters.EETGW_DocuFormTableAdapter(); - this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); subjectLabel = new System.Windows.Forms.Label(); bodyLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -62,6 +64,7 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).BeginInit(); this.panel1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // subjectLabel @@ -167,6 +170,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -229,10 +233,10 @@ this.titleDataGridViewTextBoxColumn}); this.mailFormDataGridView.DataSource = this.bs; this.mailFormDataGridView.Dock = System.Windows.Forms.DockStyle.Left; - this.mailFormDataGridView.Location = new System.Drawing.Point(0, 0); + this.mailFormDataGridView.Location = new System.Drawing.Point(0, 31); this.mailFormDataGridView.Name = "mailFormDataGridView"; this.mailFormDataGridView.RowTemplate.Height = 23; - this.mailFormDataGridView.Size = new System.Drawing.Size(317, 591); + this.mailFormDataGridView.Size = new System.Drawing.Size(317, 560); this.mailFormDataGridView.TabIndex = 2; this.mailFormDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.mailFormDataGridView_DataError); // @@ -257,11 +261,32 @@ this.panel1.Controls.Add(this.subjectTextBox); this.panel1.Controls.Add(bodyLabel); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(317, 0); + this.panel1.Location = new System.Drawing.Point(317, 31); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(516, 591); + this.panel1.Size = new System.Drawing.Size(516, 560); this.panel1.TabIndex = 3; // + // richTextBoxEx1 + // + this.richTextBoxEx1.AllowBullets = true; + this.richTextBoxEx1.AllowDefaultInsertText = true; + this.richTextBoxEx1.AllowDefaultSmartText = true; + this.richTextBoxEx1.AllowHyphenation = true; + this.richTextBoxEx1.AllowPictures = true; + this.richTextBoxEx1.AllowSpellCheck = true; + this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; + this.richTextBoxEx1.FilePath = ""; + this.richTextBoxEx1.Location = new System.Drawing.Point(74, 41); + this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.richTextBoxEx1.Name = "richTextBoxEx1"; + this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + + "*\\generator Riched20 10.0.22621}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + + "Ex1\\par\r\n}\r\n"; + this.richTextBoxEx1.SetColorWithFont = true; + this.richTextBoxEx1.ShowToolStrip = true; + this.richTextBoxEx1.Size = new System.Drawing.Size(430, 531); + this.richTextBoxEx1.TabIndex = 59; + // // subjectTextBox // this.subjectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -276,25 +301,26 @@ // this.ta.ClearBeforeFill = true; // - // richTextBoxEx1 + // toolStrip1 // - this.richTextBoxEx1.AllowBullets = true; - this.richTextBoxEx1.AllowDefaultInsertText = true; - this.richTextBoxEx1.AllowDefaultSmartText = true; - this.richTextBoxEx1.AllowHyphenation = true; - this.richTextBoxEx1.AllowPictures = true; - this.richTextBoxEx1.AllowSpellCheck = true; - this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; - this.richTextBoxEx1.FilePath = ""; - this.richTextBoxEx1.Location = new System.Drawing.Point(74, 41); - this.richTextBoxEx1.Name = "richTextBoxEx1"; - this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + - "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + - "Ex1\\par\r\n}\r\n"; - this.richTextBoxEx1.SetColorWithFont = true; - this.richTextBoxEx1.ShowToolStrip = true; - this.richTextBoxEx1.Size = new System.Drawing.Size(430, 531); - this.richTextBoxEx1.TabIndex = 59; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton6}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(833, 31); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton6 + // + this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(59, 28); + this.toolStripButton6.Text = "닫기"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); // // fJRForm // @@ -304,6 +330,7 @@ this.Controls.Add(this.panel1); this.Controls.Add(this.mailFormDataGridView); this.Controls.Add(this.bn); + this.Controls.Add(this.toolStrip1); this.Name = "fJRForm"; this.Text = "문서 양식"; this.Load += new System.EventHandler(this.fMailform_Load); @@ -315,6 +342,8 @@ ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -343,5 +372,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn; private RichTextBoxEx.RichTextBoxEx richTextBoxEx1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton6; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fJRForm.cs b/SubProject/FCM0000/Mail/fJRForm.cs index 780b6f3..29d887f 100644 --- a/SubProject/FCM0000/Mail/fJRForm.cs +++ b/SubProject/FCM0000/Mail/fJRForm.cs @@ -53,11 +53,6 @@ namespace FCM0000 this.bs.EndEdit(); this.ta.Update(this.dsMSSQL1.EETGW_DocuForm); - } - - private void toolStripButton1_Click(object sender, EventArgs e) - { - } dsMSSQL.EETGW_DocuFormRow dr = null; private void bs_CurrentChanged(object sender, EventArgs e) @@ -94,5 +89,10 @@ namespace FCM0000 { } + + private void toolStripButton6_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/SubProject/FCM0000/Mail/fJRForm.resx b/SubProject/FCM0000/Mail/fJRForm.resx index 9e402c2..500854a 100644 --- a/SubProject/FCM0000/Mail/fJRForm.resx +++ b/SubProject/FCM0000/Mail/fJRForm.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -148,7 +148,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -159,7 +159,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -168,7 +168,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -177,7 +177,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -188,7 +188,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -200,7 +200,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= @@ -210,4 +210,24 @@ 258, 17 + + 322, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ0SURBVGhD7ZnNatRgGIXnojLxbzUzahdaBHErXoQKioUK + pSK46MYLEET8RTfirup9WKToprVaqJmW1Mh85osnJcmcZE4yJV8XOfBA22ROnjfJZDpJr0uXLl1OdvZH + /pXx0P8cDPzxeOSbNki2Neh/2h96i9BolmDkP2QbaJNg1F+FTr0ke54UuqF/GVp67GnDy1zgfYSWnnjq + gJe5wPsNLT28yB3Q0sNKXAItPayEsnDWjM+f4suOEWjpYSVTLJwzfz+8N9HLZ7WHCJduJ7BlDGjpYSU5 + IG92dhPqDBHeu2nM1o4x2z9NeP8uXacItPSwkizRq+dH8il/nj6ZOcSRfPo6cQho6WElWQ6uXzWTLxu5 + ASxVR2JK3mIHWL5D188CLT2spEidIeaRt0BLDythKEPMK2+Blh5WUkbVEOHSrbnlLdDSw0qqKBvC/PiV + /72BvAVaeljJLEqHSGkob4GWHlaikAyx+W1aPj4S4bJ2zWdASw8rUUjesNuFcx5EL+p/YqdASw8rmQW9 + 2hRoOgS09LCSKsoulZPN7/m/xTQZAlp6WEkZVdf50ktszSGgpYeVMJQPqeMYAlp6WEkRRT5l3iGgpYeV + ZKkjn3Jw45qZbHzNvyYm+S+WrJ8FWnpYSZbo3Zu8SDyM8gWFHYnDx2t03SzQ0sNKclw4baK3r/9LzNjz + RbJDKPIWaOlhJVNcPJMciTpfDVPs6XT46AFdxoCWHlbiEmjpYSUugZYeVuISaOk5UbcWB94etPTY+/O0 + zAneOrT02IcLvMwJl6BVL/bhAilrlWDor0CnWezDBXt/vt33hN2Wtx7/3GzPd+nSpUtL6fX+AQW5F5FR + g4amAAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobProcessSelect.cs b/SubProject/FPJ0000/JobReport_/fJobProcessSelect.cs index 9cf85ba..27acb2f 100644 --- a/SubProject/FPJ0000/JobReport_/fJobProcessSelect.cs +++ b/SubProject/FPJ0000/JobReport_/fJobProcessSelect.cs @@ -313,7 +313,7 @@ namespace FPJ0000.JobReport_ this.ta.FillByJobProcess(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode, pc); if(this.dsJobReport.Common.Any()==false) { - AR.UTIL.MsgE($"입력된 Process:{pc}에 해당하는 분류가 없어 전체목록을 조회 합니다"); + AR.UTIL.MsgE($"입력된 [{pc}]에 해당하는 분류가 없어 전체목록을 조회 합니다\n분류표는 관리->업무일지->업무형태 설정 화면에서 입력이 가능합니다"); this.ta.Fill(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode); } }