diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 9a1ae3d..cbb8fc2 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("20.04.29.1430")] -[assembly: AssemblyFileVersion("20.04.29.1430")] +[assembly: AssemblyVersion("20.05.07.1700")] +[assembly: AssemblyFileVersion("20.05.07.1700")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index f025d4c..5da90d3 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -60,6 +60,7 @@ this.mn_jago = new System.Windows.Forms.ToolStripMenuItem(); this.관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.재고현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pMP현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mn_eq = new System.Windows.Forms.ToolStripMenuItem(); this.dataFOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataMoldEOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -97,7 +98,7 @@ this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); - this.pMP현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -299,7 +300,7 @@ // this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image"))); this.mn_purchase.Name = "mn_purchase"; - this.mn_purchase.Size = new System.Drawing.Size(180, 24); + this.mn_purchase.Size = new System.Drawing.Size(162, 24); this.mn_purchase.Text = "구매신청"; this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); // @@ -307,7 +308,7 @@ // this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image"))); this.mn_project.Name = "mn_project"; - this.mn_project.Size = new System.Drawing.Size(180, 24); + this.mn_project.Size = new System.Drawing.Size(162, 24); this.mn_project.Text = "프로젝트"; this.mn_project.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click); // @@ -315,7 +316,7 @@ // this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image"))); this.mn_dailyhistory.Name = "mn_dailyhistory"; - this.mn_dailyhistory.Size = new System.Drawing.Size(180, 24); + this.mn_dailyhistory.Size = new System.Drawing.Size(162, 24); this.mn_dailyhistory.Text = "업무일지"; this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click); // @@ -327,24 +328,31 @@ this.pMP현황ToolStripMenuItem}); this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image"))); this.mn_jago.Name = "mn_jago"; - this.mn_jago.Size = new System.Drawing.Size(180, 24); + this.mn_jago.Size = new System.Drawing.Size(162, 24); this.mn_jago.Text = "품목재고"; this.mn_jago.Click += new System.EventHandler(this.재고관리ToolStripMenuItem_Click); // // 관리ToolStripMenuItem // this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem"; - this.관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); this.관리ToolStripMenuItem.Text = "재고 관리"; this.관리ToolStripMenuItem.Click += new System.EventHandler(this.관리ToolStripMenuItem_Click); // // 재고현황ToolStripMenuItem // this.재고현황ToolStripMenuItem.Name = "재고현황ToolStripMenuItem"; - this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); this.재고현황ToolStripMenuItem.Text = "재고 현황"; this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click); // + // pMP현황ToolStripMenuItem + // + this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem"; + this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); + this.pMP현황ToolStripMenuItem.Text = "PMP 현황"; + this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click); + // // mn_eq // this.mn_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -355,7 +363,7 @@ this.라인코드관리ToolStripMenuItem}); this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image"))); this.mn_eq.Name = "mn_eq"; - this.mn_eq.Size = new System.Drawing.Size(180, 24); + this.mn_eq.Size = new System.Drawing.Size(162, 24); this.mn_eq.Text = "장비 목록"; // // dataFOLToolStripMenuItem @@ -395,7 +403,7 @@ // this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; - this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(162, 24); this.personalInventoryToolStripMenuItem.Text = "개인별 물품"; this.personalInventoryToolStripMenuItem.Visible = false; this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); @@ -404,7 +412,7 @@ // this.메일전송ToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem1.Image"))); this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1"; - this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(162, 24); this.메일전송ToolStripMenuItem1.Text = "메일자동발신"; this.메일전송ToolStripMenuItem1.Click += new System.EventHandler(this.메일전송ToolStripMenuItem1_Click); // @@ -430,14 +438,14 @@ // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.패치내역ToolStripMenuItem1.Text = "패치 내역"; this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click); // // 메일내역ToolStripMenuItem // this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem"; - this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // @@ -445,20 +453,20 @@ // this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem"; - this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.holidayToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.holidayToolStripMenuItem.Text = "휴가 내역"; this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -467,7 +475,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -476,7 +484,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -484,7 +492,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -492,7 +500,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -501,7 +509,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -509,7 +517,7 @@ // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 24); + this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24); this.toolStripMenuItem5.Text = "123"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -536,7 +544,8 @@ this.그룹정보ToolStripMenuItem1, this.toolStripMenuItem1, this.임의테이블조작ToolStripMenuItem, - this.pMP데이터베이스업데이트ToolStripMenuItem}); + this.pMP데이터베이스업데이트ToolStripMenuItem, + this.mailBackupToolStripMenuItem}); this.btDev.ForeColor = System.Drawing.Color.Blue; this.btDev.Name = "btDev"; this.btDev.Size = new System.Drawing.Size(91, 23); @@ -657,12 +666,12 @@ this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); // - // pMP현황ToolStripMenuItem + // mailBackupToolStripMenuItem // - this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem"; - this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); - this.pMP현황ToolStripMenuItem.Text = "PMP 현황"; - this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click); + this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem"; + this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.mailBackupToolStripMenuItem.Text = "Mail Backup"; + this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click); // // fMain // @@ -761,6 +770,7 @@ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5; private System.Windows.Forms.ToolStripMenuItem pMP데이터베이스업데이트ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pMP현황ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mailBackupToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 6671ecc..7f25f2d 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -903,5 +903,12 @@ namespace Project AddForm(formkey, new FPM0000.fSPMaster()); } + + private void mailBackupToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new FCM0000.Mail.fMailBackup(); + f.TopMost = true; + f.Show(); + } } } diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index d1b4fa3..e7850a0 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -134,6 +134,12 @@ fMailAutoAdd.cs + + Form + + + fMailBackup.cs + Form @@ -339,6 +345,9 @@ fMailAutoAdd.cs + + fMailBackup.cs + fMailList.cs diff --git a/SubProject/FCM0000/Mail/fMailBackup.Designer.cs b/SubProject/FCM0000/Mail/fMailBackup.Designer.cs new file mode 100644 index 0000000..4a4a678 --- /dev/null +++ b/SubProject/FCM0000/Mail/fMailBackup.Designer.cs @@ -0,0 +1,217 @@ +namespace FCM0000.Mail +{ + partial class fMailBackup + { + /// + /// 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.button1 = new System.Windows.Forms.Button(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(71, 168); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(436, 50); + this.button1.TabIndex = 0; + this.button1.Text = "실행!"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // dateTimePicker1 + // + this.dateTimePicker1.Location = new System.Drawing.Point(71, 8); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(178, 21); + this.dateTimePicker1.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(36, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 2; + this.label1.Text = "범위"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(277, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(14, 12); + this.label2.TabIndex = 2; + this.label2.Text = "~"; + // + // dateTimePicker2 + // + this.dateTimePicker2.Location = new System.Drawing.Point(329, 8); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(178, 21); + this.dateTimePicker2.TabIndex = 1; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(71, 146); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(220, 16); + this.checkBox1.TabIndex = 3; + this.checkBox1.Text = "파일이 존재하는 경우 덮어씌웁니다."; + this.checkBox1.UseVisualStyleBackColor = true; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(12, 37); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(53, 12); + this.label3.TabIndex = 2; + this.label3.Text = "백업대상"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(71, 33); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(436, 21); + this.textBox1.TabIndex = 4; + this.textBox1.Text = "받은 편지함"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(71, 60); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(436, 21); + this.textBox2.TabIndex = 6; + this.textBox2.Text = "지운 편지함,동기화 문제"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(12, 64); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 5; + this.label4.Text = "제외대상"; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(71, 87); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(436, 21); + this.textBox3.TabIndex = 8; + this.textBox3.Text = "C:\\temp\\mailbak"; + this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(12, 91); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(57, 12); + this.label5.TabIndex = 7; + this.label5.Text = "백업 위치"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(71, 114); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(436, 21); + this.textBox4.TabIndex = 10; + this.textBox4.Text = "{folder}\\{yyyy}\\{mm}\\{dd}_{sender}_{subject}_{datetime}.msg"; + this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(12, 118); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(57, 12); + this.label6.TabIndex = 9; + this.label6.Text = "파일 규칙"; + // + // fMailBackup + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(558, 226); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.label6); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.label5); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.label4); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.checkBox1); + this.Controls.Add(this.label2); + this.Controls.Add(this.label3); + this.Controls.Add(this.label1); + this.Controls.Add(this.dateTimePicker2); + this.Controls.Add(this.dateTimePicker1); + this.Controls.Add(this.button1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fMailBackup"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Outlook Mail backup"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.Label label6; + } +} \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fMailBackup.cs b/SubProject/FCM0000/Mail/fMailBackup.cs new file mode 100644 index 0000000..9fc8b1e --- /dev/null +++ b/SubProject/FCM0000/Mail/fMailBackup.cs @@ -0,0 +1,206 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using NetOffice; +using Outlook = NetOffice.OutlookApi; +using NetOffice.OutlookApi.Enums; +using NetOffice.OutlookApi; + +namespace FCM0000.Mail +{ + public partial class fMailBackup : Form + { + public fMailBackup() + { + InitializeComponent(); + dateTimePicker1.Value = DateTime.Now.AddYears(-2); + dateTimePicker2.Value = DateTime.Now.AddYears(-1); + } + + int cntp = 0; + int cnte = 0; + int cntb = 0; + List okfolder; + List nofolder; + private void button1_Click(object sender, EventArgs e) + { + this.okfolder = new List(); + this.nofolder = new List(); + + textBox1.Text = textBox1.Text.Trim(); + textBox2.Text = textBox2.Text.Trim(); + + var buf1 = textBox1.Text.Split(','); + var buf2 = textBox2.Text.Split(','); + foreach(var item in buf1) + { + if (string.IsNullOrEmpty(item)) continue; + if(okfolder.IndexOf(item.ToLower()) == -1) okfolder.Add(item.ToLower()); + } + foreach (var item in buf2) + { + if (string.IsNullOrEmpty(item)) continue; + if (nofolder.IndexOf(item.ToLower()) == -1) nofolder.Add(item.ToLower()); + } + + if (FCOMMON.Util.MsgQ("진짜?") != DialogResult.Yes) return; + int cnt = 0; + var fd = new FolderBrowserDialog(); + fd.SelectedPath = this.textBox3.Text; + if (fd.ShowDialog() != DialogResult.OK) return; + + var path = fd.SelectedPath; + + cntp = 0; + cntb = 0; + cnte = 0; + + Outlook.Application oApp = new Outlook.Application(); + var oNS = oApp.GetNamespace("mapi"); + foreach (MAPIFolder folder in oNS.Folders) + { + if (folder.DefaultItemType != OlItemType.olMailItem) continue; + folderbak(path, folder); + } + this.button1.Text = "저장된 메일 " + cntb.ToString() + "건/" + cntp.ToString() + "건 처리"; + this.button1.Refresh(); + FCOMMON.Util.MsgI("백업 성공"); + + + //get first message + + + //var newmail = ol.CreateItem(OlItemType.olMailItem) as Outlook.MailItem; + //newmail.Display(); + //ol. + + //foreach (var to in tolist) + //{ + // if (to.isEmpty()) continue; + // var newMail = ol.CreateItem(OlItemType.olMailItem) as Outlook.MailItem; + // newMail.Display(); + // newMail.Subject = this.tbSubject.Text.Trim(); // dr.title; + // newMail.To = to; + // newMail.CC = tbCC.Text.Trim(); + // newMail.BCC = tbBCC.Text.Trim(); + // // newMail.BodyFormat = OlBodyFormat.olFormatHTML; + // newMail.HTMLBody = this.tbBody.Html + // .Replace("{USER}", FCOMMON.info.Login.nameK) + // .Replace("{EUSER}", FCOMMON.info.Login.nameE) + // .Replace("{EMAIL}", FCOMMON.info.Login.email) + // .Replace("%7BEMAIL%7D", FCOMMON.info.Login.email) + // .Replace("{HP}", FCOMMON.info.Login.hp) + // .Replace("{TEL}", FCOMMON.info.Login.tel) + // .Replace("{ITEM}", tbSubject.Text) + newMail.HTMLBody; + + + + //} + } + + void folderbak(string basepatth, MAPIFolder folder) + { + if (folder.Folders.Count > 0) + { + foreach (var fold in folder.Folders) + { + folderbak(basepatth, fold); + } + } + else + { + //폴더명이 지정되었다면 그곳에 포함되어있는지 체크한다. + if(okfolder.Count > 0) + { + if (okfolder.Contains(folder.Name.ToLower()) == false) + { + return; + } + + } + if(nofolder.Count > 0) + { + if (nofolder.Contains(folder.Name.ToLower()) == true) + { + return; + } + } + var oItems = folder.Items; + var path = basepatth;// + "\\" + folder.FolderPath.Replace(@"\\", ""); + foreach (object miitem in oItems) + { + var mi = miitem as MailItem; + if (mi == null) continue; + + cntp += 1; + + if (cntp % 10 == 0) + { + this.button1.Text = "저장된 메일 " + cntb.ToString() + "건/" + cntp.ToString() + "건 처리"; + this.button1.Refresh(); + } + + if (mi.Subject.StartsWith("회수:")) continue; + //var mailitem = oItems.GetFirst() as Outlook.MailItem; + + //var nowitem = ol.ActiveInspector(); + //var mailitem = nowitem.CurrentItem as Outlook.MailItem; + + var sd = DateTime.Parse(dateTimePicker1.Value.ToString("yyyy-MM-dd 00:00:00")); + var ed = DateTime.Parse(dateTimePicker2.Value.ToString("yyyy-MM-dd 23:59:59")); + + //기간을 벗어나면 처리하지 않음 + if (mi.CreationTime < sd || mi.CreationTime > ed) continue; + + + var subject = mi.Subject.Replace("\t", "").Replace("\r", "").Replace("\n", "").Replace("!", "").Replace("*", "").Replace("\"", "").Replace("@", "").Replace("#", "").Replace("^", "").Replace("&", "").Replace(">", "").Replace("<", "").Replace("/", "").Replace(":", "").Replace(" ", "").Replace("\\", "").Replace("?", "").Replace("%", "").Replace("_", "").Replace(".", ""); + var filename = textBox4.Text.Trim(); + filename = filename.Replace("{yyyy}", mi.CreationTime.Year.ToString("0000")); + filename = filename.Replace("{mm}", mi.CreationTime.Month.ToString("00")); + filename = filename.Replace("{dd}", mi.CreationTime.Day.ToString("00")); + filename = filename.Replace("{datetime}", mi.CreationTime.ToString("yyyyMMddHHmmss")); + + filename = filename.Replace("{sender}", mi.SentOnBehalfOfName); + filename = filename.Replace("{subject}", subject); + filename = filename.Replace("{messageid}", mi.ConversationID); + filename = filename.Replace("{folder}", folder.FolderPath.Replace(@"\\", "")); + + + + //filename = string.Format("{0}\\{1}\\{2}_{5}_{6}_{3}.msg", + // mi.CreationTime.Year.ToString("000"), + // mi.CreationTime.Month.ToString("00"), + // mi.CreationTime.Day.ToString("00"), + // mi.CreationTime.ToString("yyyyMMddHHmmss"), + // mi.ConversationID, + // mi.SentOnBehalfOfName, + // mi.Subject.Replace("\t", "").Replace("\r", "").Replace("\n", "").Replace("!", "").Replace("*", "").Replace("\"", "").Replace("@", "").Replace("#", "").Replace("^", "").Replace("&", "").Replace(">", "").Replace("<", "").Replace("/", "").Replace(":", "").Replace(" ", "").Replace("\\", "").Replace("?", "").Replace("%", "").Replace("_", "").Replace(".", "")); + + var finame = System.IO.Path.Combine(path, filename); + var fi = new System.IO.FileInfo(finame); + if (fi.Directory.Exists == false) fi.Directory.Create(); + if ( checkBox1.Checked || fi.Exists == false) + { + + try + { + cntb += 1; + mi.SaveAs(fi.FullName); + } + catch (System.Exception ex) + { + Console.WriteLine("mail save err:" + ex.Message); + } + + } + } + } + + } + } +} diff --git a/SubProject/FCM0000/Mail/fMailBackup.resx b/SubProject/FCM0000/Mail/fMailBackup.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FCM0000/Mail/fMailBackup.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/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index b5a395a..15ca7d1 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -49,17 +49,17 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.radSortGrp = new System.Windows.Forms.RadioButton(); @@ -259,7 +259,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1092, 97); + this.panel1.Size = new System.Drawing.Size(1246, 97); this.panel1.TabIndex = 0; // // radSortGrp @@ -520,14 +520,14 @@ this.toolStripButton3, this.toolStripButton4, this.toolStripButton5}); - this.bn.Location = new System.Drawing.Point(0, 624); + this.bn.Location = new System.Drawing.Point(0, 612); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1092, 25); + this.bn.Size = new System.Drawing.Size(1246, 25); this.bn.TabIndex = 3; this.bn.Text = "bindingNavigator1"; // @@ -752,7 +752,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1092, 527); + this.fpSpread1.Size = new System.Drawing.Size(1246, 515); this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; this.fpSpread1.TabIndex = 4; this.fpSpread1.TitleInfo.Text = "PartList"; @@ -785,18 +785,18 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "품명"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "PMP재고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "구매수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "제조사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "공급사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "납기일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "공급사코드"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "품명코드"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "1대 수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "N대 수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "1대 금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "N대 금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "PMP재고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "구매수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "제조사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "공급사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "납기일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; @@ -839,18 +839,25 @@ this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 99F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemUnit"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "unit"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType2.DecimalPlaces = 0; numberCellType2.MaximumValue = 10000000D; numberCellType2.MinimumValue = -10000000D; numberCellType2.NegativeRed = true; numberCellType2.NullDisplay = "0"; numberCellType2.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "price"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(7).Tag = "price"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); numberCellType3.DecimalPlaces = 0; numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType3.MaximumValue = 2147483647D; @@ -858,92 +865,86 @@ numberCellType3.NegativeRed = true; numberCellType3.Separator = ","; numberCellType3.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "qty"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(7).Tag = "qty"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "qty"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "1대 수량"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "qty"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType4.DecimalPlaces = 0; numberCellType4.NegativeRed = true; - numberCellType4.NullDisplay = "--"; numberCellType4.Separator = ","; numberCellType4.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "qtyjago"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "PMP재고"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "pmp"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "N대 수량"; + this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType5.DecimalPlaces = 0; numberCellType5.NegativeRed = true; numberCellType5.NullDisplay = "--"; numberCellType5.Separator = ","; numberCellType5.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qtybuy"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "구매수량"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "buy"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ItemUnit"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "amt"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "1대 금액"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "amt"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amtn"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "N대 금액"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amtn"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType6.DecimalPlaces = 0; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; numberCellType6.NegativeRed = true; + numberCellType6.NullDisplay = "--"; numberCellType6.Separator = ","; numberCellType6.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amt"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "금액"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ItemManu"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "qtyjago"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "PMP재고"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pmp"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(13).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "ItemSupply"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(13).ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "공급사"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "option2"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "납기일"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "ItemSupplyidx"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "공급사코드"; + numberCellType7.NegativeRed = true; + numberCellType7.NullDisplay = "--"; + numberCellType7.Separator = ","; + numberCellType7.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtybuy"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "구매수량"; + this.fpSpread1_Sheet1.Columns.Get(13).Tag = "buy"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ItemManu"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "ItemSupply"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(15).ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "공급사"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "option2"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 80F; - this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "Item"; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "품명코드"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bsPart; @@ -976,7 +977,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1092, 649); + this.ClientSize = new System.Drawing.Size(1246, 637); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 00f28c8..7786da0 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -211,7 +211,8 @@ namespace FPJ0000 { FCOMMON.Util.MsgE(ex.Message); } - + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + FormattingData(); } private void toolStripButton2_Click(object sender, EventArgs e) @@ -477,7 +478,7 @@ namespace FPJ0000 { if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) continue; - var qty = dr.qty; //파트리스트수량 + var qty = dr.qtyn; //파트리스트수량(N대수량으로 처리) var model = string.IsNullOrEmpty(dr.ItemModel) ? dr.ItemName : dr.ItemModel; //검색 sql 생성 diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 0e0efe4..877ebc9 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -280,92 +280,91 @@ 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 - TkSuQmCC + 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 - dZZIJBL9BohloZ6S1+tQAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9 + WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO + 98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2 + 1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ + QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30 + xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9 + IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T + 8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9 + ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN + yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt + kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh + EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC + WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV + LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII= 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 - RK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKjSURBVDhPvVLfT1JRHL/ruf6GHpplPrRlGw/10IOvvdbc + zIfemk9tmloazBoWoYYow0TYAI0JNzAkvfxacvlhuEpHbBgoyKBf/koDrxDWp3sud0u31mOf7bOzfXc+ + 53M+n3Oo/w6z2QyDwYDR0VFoNJrrVDgcBmEwGMTc3Bz8fj88Hg9mZ2cxPT0Nh8MBm80Gi8UCk8kk7K1U + Ksjn81CpVHEqFArh4OAA5XL5nywUCtDr9R93d3exvLwMpVKZUSgULRTLssIgl8thfn4e2WwWZJbJZOD1 + epFKpeByuYQ9NE0jHo8LN+LFDWIqivL5fIhEIuTKkkAgALvdLiHiiYkJCYmh0+kkRKxWqyX8TMgvl8tr + RTlFMQyDWCwmdJBOp4UOiDMRJxIJ+J1qrLDtmHxmwNLSEnGHTCY7LsqrmJqaQrFYhNvtFpydTqfgbKct + SDJNma2UDW8dzeNjY2OQSqUQZX9gtVq7FxYWkEwmQcTEmZ8hEdZgIzGOSnEF7+3X8C7iRGdn5y9RdhRG + o5E0jZGREQwNDUGnkSNGX0Vpw4XSpwFsr75EdPIm2m+3/v2Aw+BDHotbr5g3P9Ao5e6DfXQBP7ZoLBoa + 8ETa+F3cVgWf68xTHlqtljSN/v5+6FXtyPi7UF43gVu5AfbheexnO7CTnoF34PLPkOLiCVFOUfyzdJN1 + cHDwVl9f35pSIW9d1De8+cYXt7/Whr1kY5WpZj6KCtmAGiFFvVQQEwwPD3fz31L4KNFoFDPGLmTZAZS/ + aAX3vVQTH6FeWLl0C7jPL/DqQe1XVlZXJx5RRW9vL3p6ehBUXdrhNldR3vajtM53sG47xOeoFOLIvx6H + /26NTZQeBfv43KZXVsd5eLp5MgLPcsy9Wo7pOs0xd2o4puMU52s7GfwN2W8wmGlnW+YAAAAASUVORK5C + YII= diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 446cc00..a6267a1 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,24 +30,24 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -149,6 +149,8 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); + this.공유폴더ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -189,6 +191,7 @@ this.toolStripSeparator1, this.toolStripButton1, this.toolStripButton3, + this.toolStripButton4, this.toolStripSeparator5, this.toolStripLabel1, this.tbFind, @@ -252,7 +255,7 @@ this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); this.bindingNavigatorPositionItem.Text = "0"; this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; // @@ -337,8 +340,8 @@ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(87, 22); - this.toolStripButton1.Text = "파트리스트"; + this.toolStripButton1.Size = new System.Drawing.Size(75, 22); + this.toolStripButton1.Text = "부품목록"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // toolStripButton3 @@ -397,8 +400,9 @@ this.toolStripMenuItem2, this.편집ToolStripMenuItem, this.partListToolStripMenuItem, - this.scheduleToolStripMenuItem, this.iOMapToolStripMenuItem, + this.공유폴더ToolStripMenuItem, + this.scheduleToolStripMenuItem, this.toolStripMenuItem3, this.메일발송주소관리ToolStripMenuItem, this.makeRepeatToolStripMenuItem, @@ -407,7 +411,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(305, 382); + this.cm.Size = new System.Drawing.Size(305, 418); // // columnSizeToolStripMenuItem // @@ -544,6 +548,7 @@ this.tam.ProjectsPartTableAdapter = null; this.tam.ProjectsScheduleTableAdapter = null; this.tam.ProjectsTableAdapter = this.ta; + this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // fpSpread1 @@ -614,114 +619,114 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + numberCellType21.DecimalPlaces = 0; + numberCellType21.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType21.MaximumValue = 2147483647D; + numberCellType21.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType21; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType53; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType54; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType55; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType56; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType57; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType58; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType59; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType60; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userhw2"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "전장"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType61; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType62; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType63; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2; + numberCellType22.DecimalPlaces = 0; + numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType22.MaximumValue = 2147483647D; + numberCellType22.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType22; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 59F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; + numberCellType23.MaximumValue = 999999999999999D; + numberCellType23.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType23; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; + numberCellType24.MaximumValue = 999999999999999D; + numberCellType24.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType24; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; + numberCellType25.MaximumValue = 999999999999999D; + numberCellType25.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType25; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType64; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType65; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -1319,6 +1324,22 @@ this.panel3.Size = new System.Drawing.Size(1384, 218); this.panel3.TabIndex = 7; // + // 공유폴더ToolStripMenuItem + // + this.공유폴더ToolStripMenuItem.Name = "공유폴더ToolStripMenuItem"; + this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.공유폴더ToolStripMenuItem.Text = "공유 폴더"; + this.공유폴더ToolStripMenuItem.Click += new System.EventHandler(this.공유폴더ToolStripMenuItem_Click); + // + // toolStripButton4 + // + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(75, 22); + this.toolStripButton4.Text = "공유폴더"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1455,5 +1476,7 @@ private System.Windows.Forms.ToolStripLabel sbCount; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.RichTextBox richTextBox2; + private System.Windows.Forms.ToolStripMenuItem 공유폴더ToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButton4; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index b19a7c8..734151f 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -646,5 +646,60 @@ namespace FPJ0000 { funcDelete(); } + + private void 공유폴더ToolStripMenuItem_Click(object sender, EventArgs e) + { + showfolder(); + } + void showfolder() + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + + var tbPath = dr.path; + + if (tbPath == "") tbPath = "/" + dr.idx.ToString(); + + if (tbPath.StartsWith("\\") == false) + { + if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); + else tbPath = "\\" + tbPath; + } + + var serverpath = @"\\10.131.36.57\Data\Project"; + if (System.IO.Directory.Exists(serverpath) == false) + { + FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + + serverpath); + return; + } + + var path = serverpath + tbPath; + if (System.IO.Directory.Exists(path) == false) + { + try + { + System.IO.Directory.CreateDirectory(path); + + string[] subdir = new string[] { "Source", "Document", "Draw", "Estimate" }; + foreach (var dir in subdir) + System.IO.Directory.CreateDirectory(path + "\\" + dir); + + } + catch (Exception eX) + { + FCOMMON.Util.MsgE("프로젝트 저장소 생성실패\n" + eX.Message); + return; + } + } + + FCOMMON.Util.RunExplorer(path); + } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + showfolder(); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 8017b11..0d9a477 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -211,38 +211,58 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMASURBVDhPY6AYFB9PNQfh/ENAvC/RPGtnjHnqlhjzxA0R + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL/SURBVDhPY6AYFB9PNQfh/ENAvC/RPGtnjHnqlhjzxA0R 5jGrg80jFvmZB8/1Mveb4Wru1e9gDtWGAEXH013r98dzxCPj+TBsD8b2IFxvz+HUYe0K1YYAeQeSXQuP hXAWH0tvAuHCQylNufuSmjJ3xTWlbIlpSlgX0RSzIqgpbJFfk890twV+093qPCY61EG1MzBk70lwTduU xlV4LG1R3oFU08wdCVap22LtUzZGOMWtDnaLXOrvFbzQ18d/pluAU6dNlUevo5dTu/U8qHYGhvStMa4x - O2O4cw8kLc7YHm1bdCz1Rv7R9JsFB5Nv5eyOv52xM/pOysbwu7Hrwu5GLg54GrzI507ALLfXPlPdTrtP - cDzNkLA2wjVpgx9v1u74xalbolyA3viftjW6KnljRFf82rBpsatClkUtD9wUutB3T8AM14t+U12PuXQ7 + O2O4cw8kLc7YHm1bdCz1Rt7R9JsFB5Nv5eyOv52xM/pOyoawu7Hrwu5GLgp4GrzI507ALLfXPlPdTrtP + cDzNkLA2wjVpgx9v1u74xalbolyA3viftjW6KnljRFf82rBpsatClkUtD9wUutB3T8AM14t+U12POXc7 3Hfrs98IDJP/DDHLAl2jF3vwpW6NWpywJswr/2DK/9TNEXMS1oevjFkZsi1qWeCBkIXexwNne5zxmuh8 273f7oJju+Ujx3arzdYNpv8ZQub5uvrPtxdIWBe6JHxJQBAwTP4nbQjfEbcy5BDQ/6dCFvhc8Jvpcdl7 - kuM11w7bB/btllct600fWdYabTStMPjP4DvdzdVzgpNr+GLfHb5TXGvTtsX8j1oRdC1sod8t/1nud32n - uz5w7bd74NBl89Cu2fyhdY3pddMKvYcm5Xrr9Qu1/kODkoEhaL7XPN8Z7kGJ68P/hy/1PR8yD2jrDNer - 7hMdrzl32d6wazG/YVlrfM24TPeqbr7aA708jdVaWaoIA4A2zQPG77zo5YH//WZ7PvaY5PLEuc8e6FfL - RzaNZg9Ny/UeGJXqPtDO0byvmaF0TzNDeZlqiiLCABgIme/z32+G+2avSQ6bXLtsNgJtXm9Vb7zOtFx/ - tUGB1grtXLWl6mkqi1SS5RcqxstiGgBMaf89Jzr+d+6y+W/XbPEf6Oz/JuX6/0H+1c5W+6+epvxfOUnh - v0Kc7H+5aClMA+gMGBgAtQtOd/N9b9kAAAAASUVORK5CYII= + kuM113bbB/btllct600fWdYabTStMPjP4DvdzdVzgpNr+GLfHb5TXGvTtsX8j1oRdC1sod8tv5nud32n + uz5w7Qdq7LJ5aNds/tC6xvS6aYXeQ5NyvfX6hVr/oUHJwBA032ue7wz3oMT14f/Dl/qeD5kHtHWG61X3 + iY7XnLtsb9i1mN+wrDW+Zlyme1U3X/WBXp7Gaq0sVYQBQJvmAeN3XvTywP++sz0fu09yeeLUZw/0q+Uj + m0azh6blug+MSnUfaGdr3tfMULqnmaG8TDVFEWEADITM9/nvN8N9s9ckh02uXTYbgTavt6o3Xmdarr/a + oEBrhXau2lL1NJVFKsnyCxXjZTENAKa0/54THf87d9n8t2u2+A909n+Tcv3/IP9qZ6v9V09T/q+cpPBf + IU72v1y0FKYBdAYMDACYr05nDLds3wAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGiVpa5NWjNaYGAk - IYVKzJpTl5qMioqlrik3c6WstRajstxyk6lpS5vSq73MXra7Nt1aWxnd073fXXR3+VN94HDhPuccHr48 - 1H9jcHxEx60g9Nb30A0u4NTAG2joV4+FsYh+T0zbN7q02PcoCrMrgp6HEVDJ9C/kqs48xwoZEbQ79j3X - S53xtUDv1UI3qsFJVwP5WWuag5AR0ev+SuYD81dAB7pgnrkECjnwhiOXZ9ctMI1EyDwbyuINI1u84dBF - v6ig0iJTVNC7UdYthbJHJvJT1vGQ0JUhEk9DfW5qtaDSUqqQm0rY5pFGtHuaUX5+JwnyDI6FMgX2yTDs - EyE4p0N4+yWBfZ0TpEDZX6qQde1gNffqsNdUjuLWAkjbtmLIF4aV1zjz9wavP8VR0eaDgt6lKjNK2QZn - LSSnC9miprzthtuLiKdWYJtkiNfOfUkB2YLbwMap2noQ8t4SVF3fj2OOGmxp3cRubtq4jd+o3fYBy8kV - OKYY3JnOiBp+yiCRWntZ9VUVdG4NjtqrUawrYPMbM2GelqF3WPr2E3f9mQ0ezHCH5HzCIFvKbjkkHYUo - 0uUh/8SG1TCP9sYCKRjmgnyYFNzkHiKbF8FlqA2+de9Ac+0lYlyB61mEeN0BroAP5ErV6fktZETU088R - TfwAs5zG52gKQSYJao/ei1xJ6u/bhYyI4+b5sRpjIHnYOIuqC34cOLt2L/8IRf0BvHMtbmnkDUcAAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iLylIJXKgt2myz + 2ZqrqWtnARJTc6xaXzRBdJdJ6YiIxipLCHGoaaSR66t9wb7AEQhEULbu6e64KUf+VK/t2W33fp5n7332 + Jv4bg+MjOm8Gobe+h3Z4ESeH3oCkXj0SxiIGx2PqAc/y0sDDKMyuCIwPIiBSmV/IV1NfgBEyIih37Hu+ + lzjt00HvVUPrIXHC1cL/bDQ9g5AR0e/+ys+HFvpABS7DPHcRBPLgDA098+sWmMYi/DwXwuINI1ec4eAF + v6ig1iJTVFG7UdErhdIoE/kJ62RI6MoSSWSgOjuzWlBrKVfIjWVM21grOsbbUHluJx/kGJ4IZQvs02HY + p0Jwzobw9ksS1V1TfIFysFwh69nBkHebsNdUidJTRZC2b8WILwwrp0n67w1ef0qgqt0HBbWrpuKSlGlx + NkKiL2ZKNAXbDbeWkEivwDZN8147++UL+C3YDWys6q0HIO8vQ921fTjqOIwtuk3MZs3GbdxGHbYPiKdW + 4JihcXs2K2L0CY1keu1lVVdqoHWTOGKvR6mmiClszYY5dCPvsPztJ+74sxvcn2MPyfmYRq6UvXJIOotR + oi1A4fENq2EO9fVFvmCUDXJhvuAG+xC5vAjGoTL41r0D8upLxNgC19MI73UH2AIukK/qLs9vISOimXqO + aPIH6HgGn6NpBOkUiD16L/Ilab5nFzIijpkXJhq6A6lD3fOoO+/H/jNr9/KPEMQfqHUtYwtqArUAAAAA SUVORK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZBJTBNhHMV78M7NuwdPoAeg9eDBg4nRm4mJ + 4YIkGi/gwUBCjAeUGJBIJGERDRJUxLIKQoHQEkJKoLQgi7TCdLUblVZgykxn7XSeX8soeDBxeZmX+Wby + /d5/0f23qPGi9ZC1VA7PlR3zDdk7ed7ve3/2pH+gKO8XTxflzc5eOKHhOp17zCCqagaASp6sD89pIYGo + rVyKLJaLPxxbuSdEHVUharTwuoaTgBF9UlUEiNEmcIFmcMFX4ENDUNM0yUpBVVjig8Pv9D45S5J72ODS + cJ3O069nMvIBgduQ8rWC+VyLvaVyJJbvgHbWgd54CHr9PvbXqokrSWdxeIaLWQ0nAYN6Oc3vgHa1YX+1 + AXFrFfi4g1RitOrZd/JnB9nx3IN6QcNJgPGcnJs/IxLzgMLlQIWnIMaeweXqh8lmR9dMEL3z27CsheE0 + XhI1nAS8NkiqwkNh7EjTZsi7Q5B2OiFEGuHceIvxlTi8Xzl82RXh8DOYWv+GMZNR0XCyxA6DmJEZyHsm + SPGeXFUhXAc+UI0BWwybURZLQR62AIcFYmdMRN9cEBpOAlqLBVWmCfwG4nYzhFAtgSvBeW7l2vYlRNj8 + Kcz7UpihWKyERfRYo8cCnhbGpKQ3yfp6MylvF1hPO1iqCexWPfrIzJvbHKyeQzjrjxERHZPuowCqPv8u + 1VBg3HpckNhqOCMc98RIr+LwMVgl0GJQwDKpbvrE4kX3qGquuVimRfxeLebgqQ5L8MEg2UX/QgwvLYFM + e/eE6pzqhL2tlHlXkV+iXf1zfai5ctv+/CYdMLdg8tFlTvv9d+quOF0y3XiNtzy5erSLf5NO9x1jfCdF + 5VlLZAAAAABJRU5ErkJggg== + + + + 17, 17 + 387, 17 @@ -439,10 +459,16 @@ 561, 17 + + 561, 17 + 731, 17 647, 17 + + 731, 17 + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs index dae1619..0e700ab 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartImport.Designer.cs @@ -30,13 +30,13 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectPartImport)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); this.textBox1 = new System.Windows.Forms.TextBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.btView = new System.Windows.Forms.Button(); @@ -97,22 +97,24 @@ this.label9 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); + this.nudQtyN = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); this.itemGroupDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.option1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.noDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.itemSidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.itemNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.itemModelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.itemUnitDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.priceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.qtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemUnitDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.qtyn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.amtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.amtn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.itemManuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.itemSupplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.option2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.itemSupplyidxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); @@ -136,6 +138,7 @@ ((System.ComponentModel.ISupportInitialize)(this.nudQty)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudName)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudQtyN)).BeginInit(); this.SuspendLayout(); // // textBox1 @@ -144,7 +147,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Location = new System.Drawing.Point(92, 30); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(916, 21); + this.textBox1.Size = new System.Drawing.Size(892, 21); this.textBox1.TabIndex = 1; // // linkLabel1 @@ -163,7 +166,7 @@ // this.btView.Dock = System.Windows.Forms.DockStyle.Right; this.btView.ForeColor = System.Drawing.Color.Black; - this.btView.Location = new System.Drawing.Point(918, 23); + this.btView.Location = new System.Drawing.Point(890, 23); this.btView.Name = "btView"; this.btView.Size = new System.Drawing.Size(102, 64); this.btView.TabIndex = 26; @@ -185,23 +188,23 @@ this.itemSidDataGridViewTextBoxColumn, this.itemNameDataGridViewTextBoxColumn, this.itemModelDataGridViewTextBoxColumn, + this.itemUnitDataGridViewTextBoxColumn, this.priceDataGridViewTextBoxColumn, this.qtyDataGridViewTextBoxColumn, - this.itemUnitDataGridViewTextBoxColumn, + this.qtyn, this.amtDataGridViewTextBoxColumn, + this.amtn, this.itemManuDataGridViewTextBoxColumn, this.itemSupplyDataGridViewTextBoxColumn, this.option2, - this.memoDataGridViewTextBoxColumn, - this.itemDataGridViewTextBoxColumn, - this.itemSupplyidxDataGridViewTextBoxColumn}); + this.memoDataGridViewTextBoxColumn}); this.dataGridView1.DataSource = this.bs; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 176); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1022, 460); + this.dataGridView1.Size = new System.Drawing.Size(994, 457); this.dataGridView1.TabIndex = 1; // // bs @@ -230,7 +233,7 @@ this.panel1.ForeColor = System.Drawing.Color.White; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1022, 87); + this.panel1.Size = new System.Drawing.Size(994, 87); this.panel1.TabIndex = 0; // // label16 @@ -240,7 +243,7 @@ this.label16.ForeColor = System.Drawing.Color.WhiteSmoke; this.label16.Location = new System.Drawing.Point(0, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(1022, 23); + this.label16.Size = new System.Drawing.Size(994, 23); this.label16.TabIndex = 52; this.label16.Text = "엑셀 파일 설정"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -355,21 +358,21 @@ this.btDelImp, this.toolStripSeparator2, this.sbSum}); - this.bn.Location = new System.Drawing.Point(0, 636); + this.bn.Location = new System.Drawing.Point(0, 633); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1022, 25); + this.bn.Size = new System.Drawing.Size(994, 28); this.bn.TabIndex = 2; this.bn.Text = "bindingNavigator1"; // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 25); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // @@ -379,7 +382,7 @@ this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 25); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -388,13 +391,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 25); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 28); // // bindingNavigatorPositionItem // @@ -408,7 +411,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 28); // // bindingNavigatorMoveNextItem // @@ -416,7 +419,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 25); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -425,40 +428,40 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 25); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 28); // // progressBar1 // this.progressBar1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(200, 22); + this.progressBar1.Size = new System.Drawing.Size(200, 25); // // btSave // this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(51, 22); + this.btSave.Size = new System.Drawing.Size(51, 25); this.btSave.Text = "저장"; this.btSave.Click += new System.EventHandler(this.toolStripButton1_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 28); // // btDelAll // this.btDelAll.Image = ((System.Drawing.Image)(resources.GetObject("btDelAll.Image"))); this.btDelAll.ImageTransparentColor = System.Drawing.Color.Magenta; this.btDelAll.Name = "btDelAll"; - this.btDelAll.Size = new System.Drawing.Size(135, 22); + this.btDelAll.Size = new System.Drawing.Size(135, 25); this.btDelAll.Text = "기존 목록 모두 삭제"; this.btDelAll.Click += new System.EventHandler(this.btDelAll_Click); // @@ -467,25 +470,28 @@ this.btDelImp.Image = ((System.Drawing.Image)(resources.GetObject("btDelImp.Image"))); this.btDelImp.ImageTransparentColor = System.Drawing.Color.Magenta; this.btDelImp.Name = "btDelImp"; - this.btDelImp.Size = new System.Drawing.Size(147, 22); + this.btDelImp.Size = new System.Drawing.Size(147, 25); this.btDelImp.Text = "가져온 자료 모두 삭제"; this.btDelImp.Click += new System.EventHandler(this.btDelImp_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 28); // // sbSum // + this.sbSum.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.sbSum.Name = "sbSum"; - this.sbSum.Size = new System.Drawing.Size(52, 22); + this.sbSum.Size = new System.Drawing.Size(85, 25); this.sbSum.Text = "합계 : --"; // // panel2 // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.nudQtyN); + this.panel2.Controls.Add(this.label17); this.panel2.Controls.Add(this.nudMidDiv); this.panel2.Controls.Add(this.label6); this.panel2.Controls.Add(this.nudNapKi); @@ -518,7 +524,7 @@ this.panel2.ForeColor = System.Drawing.Color.White; this.panel2.Location = new System.Drawing.Point(0, 87); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1022, 89); + this.panel2.Size = new System.Drawing.Size(994, 89); this.panel2.TabIndex = 3; // // nudMidDiv @@ -546,13 +552,13 @@ // // nudNapKi // - this.nudNapKi.Location = new System.Drawing.Point(453, 58); + this.nudNapKi.Location = new System.Drawing.Point(453, 57); this.nudNapKi.Name = "nudNapKi"; this.nudNapKi.Size = new System.Drawing.Size(45, 21); this.nudNapKi.TabIndex = 23; this.nudNapKi.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudNapKi.Value = new decimal(new int[] { - 15, + 17, 0, 0, 0}); @@ -561,7 +567,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(407, 62); + this.label5.Location = new System.Drawing.Point(407, 61); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(41, 12); this.label5.TabIndex = 22; @@ -592,13 +598,13 @@ // // nudMemo // - this.nudMemo.Location = new System.Drawing.Point(540, 58); + this.nudMemo.Location = new System.Drawing.Point(540, 57); this.nudMemo.Name = "nudMemo"; this.nudMemo.Size = new System.Drawing.Size(45, 21); this.nudMemo.TabIndex = 25; this.nudMemo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudMemo.Value = new decimal(new int[] { - 16, + 18, 0, 0, 0}); @@ -607,7 +613,7 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(506, 62); + this.label21.Location = new System.Drawing.Point(506, 61); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(29, 12); this.label21.TabIndex = 24; @@ -615,13 +621,13 @@ // // nudSupply // - this.nudSupply.Location = new System.Drawing.Point(358, 58); + this.nudSupply.Location = new System.Drawing.Point(358, 57); this.nudSupply.Name = "nudSupply"; this.nudSupply.Size = new System.Drawing.Size(45, 21); this.nudSupply.TabIndex = 21; this.nudSupply.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudSupply.Value = new decimal(new int[] { - 14, + 16, 0, 0, 0}); @@ -630,7 +636,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(311, 62); + this.label19.Location = new System.Drawing.Point(311, 61); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(41, 12); this.label19.TabIndex = 20; @@ -685,13 +691,13 @@ // // nudManu // - this.nudManu.Location = new System.Drawing.Point(261, 58); + this.nudManu.Location = new System.Drawing.Point(261, 57); this.nudManu.Name = "nudManu"; this.nudManu.Size = new System.Drawing.Size(45, 21); this.nudManu.TabIndex = 19; this.nudManu.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudManu.Value = new decimal(new int[] { - 13, + 15, 0, 0, 0}); @@ -700,7 +706,7 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(217, 62); + this.label14.Location = new System.Drawing.Point(217, 61); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(41, 12); this.label14.TabIndex = 18; @@ -708,13 +714,13 @@ // // nudPrice // - this.nudPrice.Location = new System.Drawing.Point(638, 32); + this.nudPrice.Location = new System.Drawing.Point(729, 32); this.nudPrice.Name = "nudPrice"; this.nudPrice.Size = new System.Drawing.Size(45, 21); this.nudPrice.TabIndex = 13; this.nudPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudPrice.Value = new decimal(new int[] { - 7, + 8, 0, 0, 0}); @@ -723,7 +729,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(595, 36); + this.label13.Location = new System.Drawing.Point(693, 36); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(29, 12); this.label13.TabIndex = 12; @@ -731,13 +737,13 @@ // // nudUnit // - this.nudUnit.Location = new System.Drawing.Point(61, 58); + this.nudUnit.Location = new System.Drawing.Point(632, 32); this.nudUnit.Name = "nudUnit"; this.nudUnit.Size = new System.Drawing.Size(45, 21); this.nudUnit.TabIndex = 17; this.nudUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudUnit.Value = new decimal(new int[] { - 11, + 7, 0, 0, 0}); @@ -746,7 +752,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(26, 62); + this.label12.Location = new System.Drawing.Point(597, 36); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(29, 12); this.label12.TabIndex = 16; @@ -754,13 +760,13 @@ // // nudQty // - this.nudQty.Location = new System.Drawing.Point(733, 32); + this.nudQty.Location = new System.Drawing.Point(61, 57); this.nudQty.Name = "nudQty"; this.nudQty.Size = new System.Drawing.Size(45, 21); this.nudQty.TabIndex = 15; this.nudQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudQty.Value = new decimal(new int[] { - 8, + 9, 0, 0, 0}); @@ -769,11 +775,11 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(698, 36); + this.label11.Location = new System.Drawing.Point(10, 61); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(29, 12); + this.label11.Size = new System.Drawing.Size(45, 12); this.label11.TabIndex = 14; - this.label11.Text = "수량"; + this.label11.Text = "수량(1)"; // // nudName // @@ -830,7 +836,7 @@ this.label8.ForeColor = System.Drawing.Color.WhiteSmoke; this.label8.Location = new System.Drawing.Point(0, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(1020, 23); + this.label8.Size = new System.Drawing.Size(992, 23); this.label8.TabIndex = 51; this.label8.Text = "엑셀/DB 연결 정보 설정 ( A열 = 1)"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -839,6 +845,28 @@ // this.ta.ClearBeforeFill = true; // + // nudQtyN + // + this.nudQtyN.Location = new System.Drawing.Point(166, 57); + this.nudQtyN.Name = "nudQtyN"; + this.nudQtyN.Size = new System.Drawing.Size(45, 21); + this.nudQtyN.TabIndex = 53; + this.nudQtyN.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudQtyN.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(115, 61); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(48, 12); + this.label17.TabIndex = 52; + this.label17.Text = "수량(N)"; + // // itemGroupDataGridViewTextBoxColumn // this.itemGroupDataGridViewTextBoxColumn.DataPropertyName = "ItemGroup"; @@ -856,8 +884,8 @@ // noDataGridViewTextBoxColumn // this.noDataGridViewTextBoxColumn.DataPropertyName = "no"; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.noDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.noDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15; this.noDataGridViewTextBoxColumn.HeaderText = "번호"; this.noDataGridViewTextBoxColumn.Name = "noDataGridViewTextBoxColumn"; this.noDataGridViewTextBoxColumn.Width = 54; @@ -883,26 +911,6 @@ this.itemModelDataGridViewTextBoxColumn.Name = "itemModelDataGridViewTextBoxColumn"; this.itemModelDataGridViewTextBoxColumn.Width = 54; // - // priceDataGridViewTextBoxColumn - // - this.priceDataGridViewTextBoxColumn.DataPropertyName = "price"; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.Format = "N0"; - this.priceDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle30; - this.priceDataGridViewTextBoxColumn.HeaderText = "단가"; - this.priceDataGridViewTextBoxColumn.Name = "priceDataGridViewTextBoxColumn"; - this.priceDataGridViewTextBoxColumn.Width = 54; - // - // qtyDataGridViewTextBoxColumn - // - this.qtyDataGridViewTextBoxColumn.DataPropertyName = "qty"; - dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle31.Format = "N0"; - this.qtyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle31; - this.qtyDataGridViewTextBoxColumn.HeaderText = "수량"; - this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn"; - this.qtyDataGridViewTextBoxColumn.Width = 54; - // // itemUnitDataGridViewTextBoxColumn // this.itemUnitDataGridViewTextBoxColumn.DataPropertyName = "ItemUnit"; @@ -910,17 +918,58 @@ this.itemUnitDataGridViewTextBoxColumn.Name = "itemUnitDataGridViewTextBoxColumn"; this.itemUnitDataGridViewTextBoxColumn.Width = 54; // + // priceDataGridViewTextBoxColumn + // + this.priceDataGridViewTextBoxColumn.DataPropertyName = "price"; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle16.Format = "N0"; + this.priceDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle16; + this.priceDataGridViewTextBoxColumn.HeaderText = "단가"; + this.priceDataGridViewTextBoxColumn.Name = "priceDataGridViewTextBoxColumn"; + this.priceDataGridViewTextBoxColumn.Width = 54; + // + // qtyDataGridViewTextBoxColumn + // + this.qtyDataGridViewTextBoxColumn.DataPropertyName = "qty"; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle17.Format = "N0"; + this.qtyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17; + this.qtyDataGridViewTextBoxColumn.HeaderText = "수량(1)"; + this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn"; + this.qtyDataGridViewTextBoxColumn.Width = 70; + // + // qtyn + // + this.qtyn.DataPropertyName = "qtyn"; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.Format = "N0"; + this.qtyn.DefaultCellStyle = dataGridViewCellStyle18; + this.qtyn.HeaderText = "수량(N)"; + this.qtyn.Name = "qtyn"; + this.qtyn.Width = 73; + // // amtDataGridViewTextBoxColumn // this.amtDataGridViewTextBoxColumn.DataPropertyName = "amt"; - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle32.Format = "N0"; - this.amtDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle32; - this.amtDataGridViewTextBoxColumn.HeaderText = "금액"; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle19.Format = "N0"; + this.amtDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19; + this.amtDataGridViewTextBoxColumn.HeaderText = "금액(1)"; this.amtDataGridViewTextBoxColumn.Name = "amtDataGridViewTextBoxColumn"; this.amtDataGridViewTextBoxColumn.ReadOnly = true; - this.amtDataGridViewTextBoxColumn.Width = 54; + this.amtDataGridViewTextBoxColumn.Width = 70; + // + // amtn + // + this.amtn.DataPropertyName = "amtn"; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle20.Format = "N0"; + this.amtn.DefaultCellStyle = dataGridViewCellStyle20; + this.amtn.HeaderText = "금액(N)"; + this.amtn.Name = "amtn"; + this.amtn.Width = 73; // // itemManuDataGridViewTextBoxColumn // @@ -939,8 +988,8 @@ // option2 // this.option2.DataPropertyName = "option2"; - dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.option2.DefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.option2.DefaultCellStyle = dataGridViewCellStyle21; this.option2.HeaderText = "납기일"; this.option2.Name = "option2"; this.option2.Width = 66; @@ -952,31 +1001,11 @@ this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; this.memoDataGridViewTextBoxColumn.Width = 54; // - // itemDataGridViewTextBoxColumn - // - this.itemDataGridViewTextBoxColumn.DataPropertyName = "Item"; - dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.itemDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle34; - this.itemDataGridViewTextBoxColumn.HeaderText = "item(*)"; - this.itemDataGridViewTextBoxColumn.Name = "itemDataGridViewTextBoxColumn"; - this.itemDataGridViewTextBoxColumn.Width = 70; - // - // itemSupplyidxDataGridViewTextBoxColumn - // - this.itemSupplyidxDataGridViewTextBoxColumn.DataPropertyName = "ItemSupplyidx"; - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.itemSupplyidxDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle35; - this.itemSupplyidxDataGridViewTextBoxColumn.HeaderText = "Supply(*)"; - this.itemSupplyidxDataGridViewTextBoxColumn.Name = "itemSupplyidxDataGridViewTextBoxColumn"; - this.itemSupplyidxDataGridViewTextBoxColumn.Width = 85; - // // fProjectPartImport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1022, 661); + this.ClientSize = new System.Drawing.Size(994, 661); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.panel2); this.Controls.Add(this.bn); @@ -1011,6 +1040,7 @@ ((System.ComponentModel.ISupportInitialize)(this.nudQty)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudName)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudQtyN)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1078,21 +1108,23 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.NumericUpDown nudMidDiv; private System.Windows.Forms.Label label6; + private System.Windows.Forms.NumericUpDown nudQtyN; + private System.Windows.Forms.Label label17; private System.Windows.Forms.DataGridViewTextBoxColumn itemGroupDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn option1; private System.Windows.Forms.DataGridViewTextBoxColumn noDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn itemSidDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn itemNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn itemModelDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn itemUnitDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn priceDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn qtyDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemUnitDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn qtyn; private System.Windows.Forms.DataGridViewTextBoxColumn amtDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn amtn; private System.Windows.Forms.DataGridViewTextBoxColumn itemManuDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn itemSupplyDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn option2; private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn itemSupplyidxDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.cs b/SubProject/FPJ0000/Project/fProjectPartImport.cs index 01e01d7..2e215ad 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.cs +++ b/SubProject/FPJ0000/Project/fProjectPartImport.cs @@ -107,7 +107,8 @@ namespace FPJ0000 string 품명 = ""; string 규격 = ""; string 단가 = ""; - string 수량 = ""; + string 수량1 = ""; + string 수량N = ""; string 단위 = ""; string 제조사 = ""; string 공급사 = ""; @@ -134,7 +135,9 @@ namespace FPJ0000 if (nudName.Value > 0) 품명 = sheet.readStr(r, (int)this.nudName.Value - 1).Trim(); if (nudModel.Value > 0) 규격 = sheet.readStr(r, (int)this.nudModel.Value - 1).Trim(); if (nudPrice.Value > 0) 단가 = sheet.readStr(r, (int)this.nudPrice.Value - 1).Replace(",", "").Trim(); - if (nudQty.Value > 0) 수량 = sheet.readStr(r, (int)nudQty.Value - 1).Replace(",", "").Trim(); + if (nudQty.Value > 0) 수량1 = sheet.readStr(r, (int)nudQty.Value - 1).Replace(",", "").Trim(); + if (nudQtyN.Value > 0) 수량N = sheet.readStr(r, (int)nudQtyN.Value - 1).Replace(",", "").Trim(); + if (nudUnit.Value > 0) 단위 = sheet.readStr(r, (int)nudUnit.Value - 1).Trim(); if (nudManu.Value > 0) 제조사 = sheet.readStr(r, (int)nudManu.Value - 1).Trim(); if (nudSupply.Value > 0) 공급사 = sheet.readStr(r, (int)nudSupply.Value - 1).Trim(); @@ -161,8 +164,10 @@ namespace FPJ0000 newdr.ItemName = 품명; newdr.ItemModel = 규격; if (단가 != "") newdr.price = decimal.Parse(단가); - if (수량 != "") newdr.qty = int.Parse(수량); + if (수량1 != "") newdr.qty = int.Parse(수량1); + if (수량N != "") newdr.qtyn = int.Parse(수량N); newdr.amt = newdr.price * newdr.qty; + newdr.amtn = newdr.price * newdr.qtyn; newdr.ItemUnit = 단위; newdr.ItemManu = 제조사; diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.resx b/SubProject/FPJ0000/Project/fProjectPartImport.resx index 6688284..8c0c13f 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.resx +++ b/SubProject/FPJ0000/Project/fProjectPartImport.resx @@ -120,6 +120,12 @@ True + + True + + + True + True @@ -182,46 +188,46 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE1SURBVDhPY/hPIQAbcOn57//T915BwW1rjoFx/oJz//N6 + VqHgsNxeMA03YN3lp/9vv4YYhAtsuQ6h55/9A8aBidVgPtiADZcegzWDFN1/9///qy8IDOKDcPfu1/9/ + /vn/v3rt/f9TD38BuwJuwIrT9wka0L79BdiAkuW3MA0A+fnog///V12GKAZ5BxcGGQByDYoXYAbA/Aey + AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs + 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG + GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJoSURBVDhPrZPtS1NhGIfP3+KKYIEUJVGEUFHkpts6s+nc + 5tuptTMzFmGasjNMM6ixUMMPoZbaq6v2xbQ0I1MSfKEXRc1j5ks7Nak1PWdzW8qvuU4McQZBF/y+3df9 + 8NzP/RD/ndnCQsmM2Wz9SJ9ip6h8fpLK5SfyDewYpbOOZGdIxLL4zBcUqKfNZu57rQPB3hcIjQwhNNgH + oa0VcxYj3mWruWG9Ui2Wr2dN/mSihaVHrVidmkC48zHCLdUIN1zFzwf1WOnvhKfMgsGsVGFAe2R9k1ma + TojIbv5eC1bZUYRvXIav2oZFRymC120I1TAI2s8j2H4f82co9GsOu3vJQwmiThAzNM0sVFixMjocPXG5 + loH3ShEClafXhb9AIei6jbfKZLxKT2ZEnSCmaSPrd91B2NkAn70Y33LS42apmILgKIfHVoKX5D5W1Ali + 0kQFQs9cCNfa4LtkwWZ4tGnwmrOx2FCHbkVSQNQJ4gOVE1h2NiFYZUHgokks38hagwWjHov1dehS7ow1 + GM/TsV57OZarGfDnDNHCuNEp4asow1xZETplibErjOZkMKxGjoCzGb4TGniN5AaZy0wFl0XC33ITfard + eCqTxob4Po9MeJOrds8X5MH/sCk6sAW96reoVYDTRGSNCkJzI8Zy09GRInW3ybfGnnGNYW2qeiAzRZg5 + qYf/bhN+VDHwUDp8MWjhrbRCuNWIccMxtMukwpOUbfG3sT+yYa+PH+SGyP34WloEb821aD6XnEVP2q6I + vJ3bVP5DX8YBSY9yr7Wb3MM+VyXxXbIdfIcike2QS63tR7f8/TP9OwTxC8fb00R80ETOAAAAAElFTkSu + QmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJySURBVDhPrdPrS1NhHAfw51X/R2AQYlFGRJSsDKbueAtb + sFEprTEsU0upCc1lOmUObd62iXdrFandCLrYhcwXvbF0zZmprXDOzoY0RhRtx7791h4w0V4EfeG8OPD7 + nOf3heew/55Ap0MI9ne5gld7Q8G+TjHY0yGK3faQaGty+evr8txG4wY+ujZ+e6sidOeGT3o7AnheABNP + gTfDwOtHkF49wFKPA58M+rN8fHX8tuaMpUGnV3KPAiNXgNsWYMAMXK8BeiuBW02IvryPQLNlxnumWMFZ + PH67VfFl0OmTJujU573AzVqCJqC/Cui6ADj0gLUE6DMh+ngQi/WXfF6dZuUjgfY2tzT2BBjuBJyEYrCb + YDvBlnKgkbC5ELhYQO96RIe64S3Sujln7LO9OYyxh7SqIX7ib1hGsDgOq7VAJWG9CijNoQ0d+HhSE+ac + sUWrJYDRu7TquXVgPlChBsqUQDFhXTpVseLDcXWAc8YWzCYRzwaAhtNrYTnBklygUAA0cuCIDOiox4w6 + T+ScMV+1IYzha4CR0KoTOTxB8Nh+QLUHyNlOFeswo8xcqTB/vnRSutcPXKb1Yx1jq/4J1XsB5S5ASKIK + 2Yi01GAqTTbJOWOz2nzBX1WxEB3qAap0hPbFHxWHuTuwLN+MZa0C32xmzB3NW3AlJwmcx/P+cE7WfPkp + b8Rpo95UITeZ1t2GnxlJiKRuwo+CdHxtrcWc6uDs+NaELM5WxyOXZfqKNL6InW5gWw0kqxGRRgO+NxgQ + thhiGOOJG8v4+PrxyHZnTgsHXNPZaaF3QqroSZeJU2kpIXfKTtfEloRD7sTEv/9M/x7GfgFF6efDnxAV + owAAAABJRU5ErkJggg== @@ -230,6 +236,12 @@ True + + True + + + True + True diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index b2f3713..9c1f10d 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -2264,6 +2264,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnqtybuy; + private global::System.Data.DataColumn columnqtyn; + + private global::System.Data.DataColumn columnamtn; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public ProjectsPartDataTable() { @@ -2505,6 +2509,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn qtynColumn { + get { + return this.columnqtyn; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn amtnColumn { + get { + return this.columnamtn; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2567,7 +2587,9 @@ namespace FPJ0000 { string ItemUnit, bool import, string qtyjago, - int qtybuy) { + int qtybuy, + int qtyn, + decimal amtn) { ProjectsPartRow rowProjectsPartRow = ((ProjectsPartRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2595,7 +2617,9 @@ namespace FPJ0000 { ItemUnit, import, qtyjago, - qtybuy}; + qtybuy, + qtyn, + amtn}; rowProjectsPartRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsPartRow); return rowProjectsPartRow; @@ -2651,6 +2675,8 @@ namespace FPJ0000 { this.columnimport = base.Columns["import"]; this.columnqtyjago = base.Columns["qtyjago"]; this.columnqtybuy = base.Columns["qtybuy"]; + this.columnqtyn = base.Columns["qtyn"]; + this.columnamtn = base.Columns["amtn"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2712,6 +2738,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnqtyjago); this.columnqtybuy = new global::System.Data.DataColumn("qtybuy", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnqtybuy); + this.columnqtyn = new global::System.Data.DataColumn("qtyn", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnqtyn); + this.columnamtn = new global::System.Data.DataColumn("amtn", typeof(decimal), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnamtn); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -6562,6 +6592,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int qtyn { + get { + try { + return ((int)(this[this.tableProjectsPart.qtynColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'ProjectsPart\' 테이블의 \'qtyn\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjectsPart.qtynColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public decimal amtn { + get { + try { + return ((decimal)(this[this.tableProjectsPart.amtnColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'ProjectsPart\' 테이블의 \'amtn\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjectsPart.amtnColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsProjectNull() { @@ -6837,6 +6899,30 @@ namespace FPJ0000 { public void SetqtybuyNull() { this[this.tableProjectsPart.qtybuyColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsqtynNull() { + return this.IsNull(this.tableProjectsPart.qtynColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetqtynNull() { + this[this.tableProjectsPart.qtynColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsamtnNull() { + return this.IsNull(this.tableProjectsPart.amtnColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetamtnNull() { + this[this.tableProjectsPart.amtnColumn] = global::System.Convert.DBNull; + } } /// @@ -10922,6 +11008,8 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects tableMapping.ColumnMappings.Add("import", "import"); tableMapping.ColumnMappings.Add("qtyjago", "qtyjago"); tableMapping.ColumnMappings.Add("qtybuy", "qtybuy"); + tableMapping.ColumnMappings.Add("qtyn", "qtyn"); + tableMapping.ColumnMappings.Add("amtn", "amtn"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -10930,8 +11018,8 @@ SELECT idx, Project, enable, name, address, memo, wuid, wdate, div FROM Projects this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy], [qtyn], [amtn]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy, @qtyn, @amtn); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Item", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10958,14 +11046,16 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtyjago", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qtyjago", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtybuy", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qtybuy", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtyn", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qtyn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@amtn", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "amtn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE ProjectsPart SET Project = @Project, Item = @Item, qty = @qty, price = @price, amt = @amt, jago = @jago, memo = @memo, wuid = @wuid, wdate = @wdate, ItemName = @ItemName, ItemModel = @ItemModel, ItemGroup = @ItemGroup, ItemSid = @ItemSid, ItemSupply = @ItemSupply, ItemManu = @ItemManu, option1 = @option1, option2 = @option2, option3 = @option3, - remark = @remark, ItemSupplyidx = @ItemSupplyidx, no = @no, ItemUnit = @ItemUnit, import = @import, qtyjago = @qtyjago, qtybuy = @qtybuy + remark = @remark, ItemSupplyidx = @ItemSupplyidx, no = @no, ItemUnit = @ItemUnit, import = @import, qtyjago = @qtyjago, qtybuy = @qtybuy, qtyn = @qtyn, amtn = @amtn WHERE (idx = @Original_idx); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy FROM ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, ItemName"; +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn FROM ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, ItemName"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "Item", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -10992,6 +11082,8 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtyjago", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "qtyjago", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtybuy", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "qtybuy", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qtyn", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "qtyn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@amtn", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "amtn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -11010,7 +11102,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, - import, qtyjago, qtybuy + import, qtyjago, qtybuy, qtyn, amtn FROM ProjectsPart WHERE (Project = @prj) ORDER BY Project, no, ItemGroup, option1, ItemName"; @@ -11144,7 +11236,9 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; string ItemUnit, global::System.Nullable import, string qtyjago, - global::System.Nullable qtybuy) { + global::System.Nullable qtybuy, + global::System.Nullable qtyn, + global::System.Nullable amtn) { if ((Project.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(Project.Value)); } @@ -11290,6 +11384,18 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; else { this.Adapter.InsertCommand.Parameters[24].Value = global::System.DBNull.Value; } + if ((qtyn.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[25].Value = ((int)(qtyn.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((amtn.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[26].Value = ((decimal)(amtn.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[26].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -11336,6 +11442,8 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; global::System.Nullable import, string qtyjago, global::System.Nullable qtybuy, + global::System.Nullable qtyn, + global::System.Nullable amtn, int Original_idx, int idx) { if ((Project.HasValue == true)) { @@ -11483,8 +11591,20 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; else { this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(idx)); + if ((qtyn.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(qtyn.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((amtn.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[26].Value = ((decimal)(amtn.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 66558b3..dc07d95 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -422,9 +422,9 @@ WHERE (idx = @Original_idx) - - INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName + + INSERT INTO [ProjectsPart] ([Project], [Item], [qty], [price], [amt], [jago], [memo], [wuid], [wdate], [ItemName], [ItemModel], [ItemGroup], [ItemSid], [ItemSupply], [ItemManu], [option1], [option2], [option3], [remark], [ItemSupplyidx], [no], [ItemUnit], [import], [qtyjago], [qtybuy], [qtyn], [amtn]) VALUES (@Project, @Item, @qty, @price, @amt, @jago, @memo, @wuid, @wdate, @ItemName, @ItemModel, @ItemGroup, @ItemSid, @ItemSupply, @ItemManu, @option1, @option2, @option3, @remark, @ItemSupplyidx, @no, @ItemUnit, @import, @qtyjago, @qtybuy, @qtyn, @amtn); +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn FROM ProjectsPart WHERE (idx = SCOPE_IDENTITY()) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -451,13 +451,15 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + + SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, - import, qtyjago, qtybuy + import, qtyjago, qtybuy, qtyn, amtn FROM ProjectsPart WHERE (Project = @prj) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -471,9 +473,9 @@ ORDER BY Project, no, ItemGroup, option1, ItemName UPDATE ProjectsPart SET Project = @Project, Item = @Item, qty = @qty, price = @price, amt = @amt, jago = @jago, memo = @memo, wuid = @wuid, wdate = @wdate, ItemName = @ItemName, ItemModel = @ItemModel, ItemGroup = @ItemGroup, ItemSid = @ItemSid, ItemSupply = @ItemSupply, ItemManu = @ItemManu, option1 = @option1, option2 = @option2, option3 = @option3, - remark = @remark, ItemSupplyidx = @ItemSupplyidx, no = @no, ItemUnit = @ItemUnit, import = @import, qtyjago = @qtyjago, qtybuy = @qtybuy + remark = @remark, ItemSupplyidx = @ItemSupplyidx, no = @no, ItemUnit = @ItemUnit, import = @import, qtyjago = @qtyjago, qtybuy = @qtybuy, qtyn = @qtyn, amtn = @amtn WHERE (idx = @Original_idx); -SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy FROM ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, ItemName +SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyjago, qtybuy, qtyn, amtn FROM ProjectsPart WHERE (idx = @idx) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -498,8 +500,10 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I - + + + @@ -534,6 +538,8 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I + + @@ -1185,7 +1191,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1378,7 +1384,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1422,7 +1428,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1467,7 +1473,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1574,10 +1580,12 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, + + - + @@ -1688,7 +1696,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1722,7 +1730,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - + @@ -1760,7 +1768,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, - +