diff --git a/EETGW.sln b/EETGW.sln index aa2d219..575265c 100644 --- a/EETGW.sln +++ b/EETGW.sln @@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "Sub\YARTE\YARTE.cs EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arControl", "..\..\_Library\arControl\arControl\arControl.csproj", "{F31C242C-1B15-4518-9733-48558499FE4B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FTPClass", "Sub\arftp\FTPClass.csproj", "{150859D3-1C5D-4E20-B324-F9EBE188D893}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -97,6 +99,12 @@ Global {F31C242C-1B15-4518-9733-48558499FE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU {F31C242C-1B15-4518-9733-48558499FE4B}.Release|Any CPU.Build.0 = Release|Any CPU {F31C242C-1B15-4518-9733-48558499FE4B}.Release|x86.ActiveCfg = Release|Any CPU + {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|Any CPU.Build.0 = Debug|Any CPU + {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|x86.ActiveCfg = Debug|Any CPU + {150859D3-1C5D-4E20-B324-F9EBE188D893}.Release|Any CPU.ActiveCfg = Release|Any CPU + {150859D3-1C5D-4E20-B324-F9EBE188D893}.Release|Any CPU.Build.0 = Release|Any CPU + {150859D3-1C5D-4E20-B324-F9EBE188D893}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -111,6 +119,7 @@ Global {F6F515C6-6628-47C4-8A94-683BDF9FBB9C} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE} = {28105E67-9D33-4627-8E26-FCE67700622F} {F31C242C-1B15-4518-9733-48558499FE4B} = {28105E67-9D33-4627-8E26-FCE67700622F} + {150859D3-1C5D-4E20-B324-F9EBE188D893} = {28105E67-9D33-4627-8E26-FCE67700622F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} diff --git a/Project/History.txt b/Project/History.txt index 81c2955..a67f43a 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,7 @@ * 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인 +190423 chi 프로젝트 편집창에 FTP Explorer 기능 추가 +190417 chi No# => CR/CF# +190416 chi OrderNo 를 구매와 프로젝트에 추가함 190315 chi 주간일지 입력창 크기 키우고 workrap 해제 190305 chi 일반사용자 자동저장되게함 프로젝트편집화면에서 cost n -> o 뒤바껴 있었음 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3417107..484ee69 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("19.04.16.0800")] -[assembly: AssemblyFileVersion("19.04.16.0800")] +[assembly: AssemblyVersion("19.04.23.1300")] +[assembly: AssemblyFileVersion("19.04.23.1300")] diff --git a/Sub/desktop.ini b/Sub/desktop.ini deleted file mode 100644 index abf4107..0000000 --- a/Sub/desktop.ini +++ /dev/null @@ -1,6 +0,0 @@ -[.ShellClassInfo] -IconResource=C:\WINDOWS\System32\SHELL32.dll,27 -[ViewState] -Mode= -Vid= -FolderType=Generic diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index 24207fa..6889c27 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -81,6 +81,12 @@ fBase.cs + + Form + + + fFTPExplorer.cs + Form @@ -104,6 +110,9 @@ fBase.cs + + fFTPExplorer.cs + fLovDateList.cs @@ -118,6 +127,12 @@ + + + {150859d3-1c5d-4e20-b324-f9ebe188d893} + FTPClass + + diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index afae6fe..ee670fe 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -39,5 +39,10 @@ namespace FCOMMON public static string libxlCompany = "Amkor Technology korea, Inc"; public static string libxlKey = "windows-282b2b0800c5e0016bb06a6fafjfd6o8"; public static int camIndex = 0; + public static string ftp_ip = "10.131.36.205"; + public static string ftp_id = "project"; + public static string ftp_pw = "Amkor1234"; + public static int ftp_port = 2121; + public static bool ftp_passive = true; } } diff --git a/SubProject/FCOMMON/fFTPExplorer.Designer.cs b/SubProject/FCOMMON/fFTPExplorer.Designer.cs new file mode 100644 index 0000000..68a037c --- /dev/null +++ b/SubProject/FCOMMON/fFTPExplorer.Designer.cs @@ -0,0 +1,222 @@ +namespace FCOMMON +{ + partial class fFTPExplorer + { + /// + /// 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.components = new System.ComponentModel.Container(); + this.tbpath = new System.Windows.Forms.TextBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btQuery = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.listView1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); + this.uploadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.downLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.progressBar1 = new System.Windows.Forms.ToolStripProgressBar(); + this.lbPath = new System.Windows.Forms.ToolStripStatusLabel(); + this.panel1.SuspendLayout(); + this.cm.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // tbpath + // + this.tbpath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbpath.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbpath.Location = new System.Drawing.Point(49, 11); + this.tbpath.Name = "tbpath"; + this.tbpath.Size = new System.Drawing.Size(429, 22); + this.tbpath.TabIndex = 0; + // + // panel1 + // + this.panel1.Controls.Add(this.btQuery); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.tbpath); + 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(550, 42); + this.panel1.TabIndex = 1; + // + // btQuery + // + this.btQuery.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btQuery.Location = new System.Drawing.Point(483, 11); + this.btQuery.Name = "btQuery"; + this.btQuery.Size = new System.Drawing.Size(55, 22); + this.btQuery.TabIndex = 2; + this.btQuery.Text = "query"; + this.btQuery.UseVisualStyleBackColor = true; + this.btQuery.Click += new System.EventHandler(this.button1_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(11, 16); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 1; + this.label1.Text = "path"; + // + // listView1 + // + this.listView1.AllowDrop = true; + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2, + this.columnHeader3, + this.columnHeader4}); + this.listView1.ContextMenuStrip = this.cm; + this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.listView1.FullRowSelect = true; + this.listView1.Location = new System.Drawing.Point(0, 42); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(550, 308); + this.listView1.TabIndex = 2; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.View = System.Windows.Forms.View.Details; + // + // columnHeader1 + // + this.columnHeader1.Text = "Name"; + this.columnHeader1.Width = 202; + // + // columnHeader2 + // + this.columnHeader2.Text = "Type"; + this.columnHeader2.Width = 108; + // + // columnHeader3 + // + this.columnHeader3.Text = "Size"; + this.columnHeader3.Width = 91; + // + // columnHeader4 + // + this.columnHeader4.Text = "Time"; + this.columnHeader4.Width = 143; + // + // cm + // + this.cm.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.uploadToolStripMenuItem, + this.downLoadToolStripMenuItem}); + this.cm.Name = "contextMenuStrip1"; + this.cm.Size = new System.Drawing.Size(133, 48); + // + // uploadToolStripMenuItem + // + this.uploadToolStripMenuItem.Name = "uploadToolStripMenuItem"; + this.uploadToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.uploadToolStripMenuItem.Text = "Upload"; + this.uploadToolStripMenuItem.Click += new System.EventHandler(this.uploadToolStripMenuItem_Click); + // + // downLoadToolStripMenuItem + // + this.downLoadToolStripMenuItem.Name = "downLoadToolStripMenuItem"; + this.downLoadToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.downLoadToolStripMenuItem.Text = "DownLoad"; + this.downLoadToolStripMenuItem.Click += new System.EventHandler(this.downLoadToolStripMenuItem_Click); + // + // timer1 + // + this.timer1.Interval = 500; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.progressBar1, + this.lbPath}); + this.statusStrip1.Location = new System.Drawing.Point(0, 350); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(550, 22); + this.statusStrip1.TabIndex = 5; + this.statusStrip1.Text = "statusStrip1"; + // + // progressBar1 + // + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(200, 16); + // + // lbPath + // + this.lbPath.Name = "lbPath"; + this.lbPath.Size = new System.Drawing.Size(13, 17); + this.lbPath.Text = ".."; + // + // fFTPExplorer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(550, 372); + this.Controls.Add(this.listView1); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.panel1); + this.Name = "fFTPExplorer"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "fFTPExplorer"; + this.Load += new System.EventHandler(this.@__Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.cm.ResumeLayout(false); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox tbpath; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btQuery; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.Timer timer1; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripProgressBar progressBar1; + private System.Windows.Forms.ToolStripStatusLabel lbPath; + private System.Windows.Forms.ContextMenuStrip cm; + private System.Windows.Forms.ToolStripMenuItem uploadToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem downLoadToolStripMenuItem; + } +} \ No newline at end of file diff --git a/SubProject/FCOMMON/fFTPExplorer.cs b/SubProject/FCOMMON/fFTPExplorer.cs new file mode 100644 index 0000000..9f56693 --- /dev/null +++ b/SubProject/FCOMMON/fFTPExplorer.cs @@ -0,0 +1,216 @@ +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; + +namespace FCOMMON +{ + public partial class fFTPExplorer : Form + { + string homePath = string.Empty; + string curPath = string.Empty; + arUtil.FTPClient ftp; + string fn = "ftpExplorer.ini"; + public fFTPExplorer(string title,string path,string ip,string id,string pw,int port=21,Boolean passvie=true) + { + InitializeComponent(); + this.Text = string.Format("[FTP] {0}",title); + this.KeyPreview = true; + this.KeyDown += (s1, e1) => { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + this.listView1.DoubleClick += listView1_DoubleClick; + this.tbpath.KeyDown += (s1, e1) => { + if (e1.KeyCode == Keys.Enter) + btQuery.PerformClick(); + }; + this.FormClosed += __Closed; + ftp = new arUtil.FTPClient(ip, id, pw, port, passvie); + curPath = path; + homePath = path; + + //홈폴더가 없으면 생성을 한다. + var list = ftp.directoryListSimple(homePath); + if(list.Length == 1) + { + //폴더를 생성해준다. + ftp.createDirectory(homePath); + + //하위폴더 + string[] subdir = new string[] { "Source","Document","Draw"}; + foreach (var dir in subdir) + ftp.createDirectory(ftp.PathCombine(homePath, dir)); + } + + this.listView1.DragDrop += listView1_DragDrop; + this.listView1.DragEnter += listView1_DragEnter; + this.listView1.DragOver += listView1_DragOver; + } + + void listView1_DragOver(object sender, DragEventArgs e) + { + this.Cursor = Cursors.Hand; + } + + void listView1_DragEnter(object sender, DragEventArgs e) + { + e.Effect = DragDropEffects.All; + } + + void listView1_DragDrop(object sender, DragEventArgs e) + { + string[] files = (string[])e.Data.GetData(DataFormats.FileDrop, false); + if (files.Length < 1) return; + string msg = string.Format("{0}건의 파일을 업로드 하시겠습니까?",files.Length); + if (FCOMMON.Util.MsgQ(msg) != System.Windows.Forms.DialogResult.Yes) return; + foreach(var fileName in files) + { + System.IO.FileInfo fi = new System.IO.FileInfo(fileName); + string remote = tbpath.Text + "/" + fi.Name; + ftp.upload(remote, fi.FullName); + } + btQuery.PerformClick(); + } + + void __Closed(object sender, FormClosedEventArgs e) + { + //listview column width + + arUtil.INIHelper ini = new arUtil.INIHelper(fn); + for (int i = 0; i < this.listView1.Columns.Count; i++) + { + var curwidth = this.listView1.Columns[i].Width; + ini.set_Data("colsize", "index_" + i.ToString(), curwidth.ToString()); + } + ini.Flush(); + + //string item = "ftp_lv_col_"; + //for (int i = 0; i < this.listView1.Columns.Count; i++) + //{ + // var curwidth = this.listView1.Columns[i].Width; + // Pub.setting.Xml.set_Data(item + i.ToString(),curwidth.ToString()); + //} + //Pub.setting.Save(); + } + + private void __Load(object sender, EventArgs e) + { + this.tbpath.Text = this.curPath;// Pub.setting.ftp_path; + if (this.tbpath.Text == "") tbpath.Text = "/"; + timer1.Start(); + + //listview column width + string item = "ftp_lv_col_"; + + if (System.IO.File.Exists(fn) == false) return; + arUtil.INIHelper ini = new arUtil.INIHelper(fn); + for (int i = 0; i < this.listView1.Columns.Count; i++) + { + var cwid = ini.get_Data("colsize", "index_" + i.ToString(), "0"); + this.listView1.Columns[i].Width = int.Parse(cwid); + } + btQuery.PerformClick(); + } + + void listView1_DoubleClick(object sender, EventArgs e) + { + var path = listView1.SelectedItems[0].Text; + var newpath = string.Empty; + if (path == "..") + newpath = ftp.getParent(curPath); + else + newpath = ftp.PathCombine(curPath, path); + + search(newpath); + } + + + private void button1_Click(object sender, EventArgs e) + { + if (this.tbpath.Text == "/") this.tbpath.Text = homePath; + search(this.tbpath.Text); + tbpath.Focus(); + tbpath.SelectAll(); + } + + void search(string path) + { + if (path == "") path = "/"; + curPath = path; + tbpath.Text = curPath; + + this.listView1.Items.Clear(); + this.progressBar1.Value = 0; + + + // var list = ftp.directoryListSimple("/201"); + + var ftpdir = ftp.ListDirectoryDetail(path); + if(ftpdir == null) + { + //Util.MsgE(ftp.errorMessage); + return; + } + + this.progressBar1.Maximum = ftpdir.Count; + var OrderData = ftpdir.OrderBy(t => t.FileType).OrderBy(t=>t.Filename); + foreach (var item in OrderData) + { + this.progressBar1.Value += 1; + if (item.Filename == ".") continue; + var lv = listView1.Items.Add(item.Filename); + lv.SubItems.Add(item.FileType.ToString()); + lv.SubItems.Add(item.Size.ToString()); + lv.SubItems.Add(item.FileDateTime.ToString()); + if (item.FileType == arUtil.FTPfileInfo.DirectoryEntryTypes.Directory) lv.ForeColor = Color.Blue; + } + } + + private void timer1_Tick(object sender, EventArgs e) + { + this.lbPath.Text = curPath; + } + + private void uploadToolStripMenuItem_Click(object sender, EventArgs e) + { + OpenFileDialog od = new OpenFileDialog(); + if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + //이파일을 현재 위치에 업로드 한다. + System.IO.FileInfo fi = new System.IO.FileInfo(od.FileName); + string newfile = ftp.PathFileCombine(curPath, fi.Name); + if (!ftp.upload(newfile, od.FileName)) + Util.MsgE("upload error"); + search(curPath); + } + + private void downLoadToolStripMenuItem_Click(object sender, EventArgs e) + { + if (this.listView1.SelectedItems.Count < 1) return; + + //이파일을 현재 위치에 업로드 한다. + var selfile = this.listView1.SelectedItems[0]; + var remotefile = ftp.PathFileCombine(curPath, selfile.Text); + var onlyfilename = remotefile.Substring(remotefile.LastIndexOf("/")+1); + + + SaveFileDialog od = new SaveFileDialog(); + od.Filter = "All files|*.*"; + od.FilterIndex = 1; + od.FileName = onlyfilename; + + if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + + + System.IO.FileInfo fi = new System.IO.FileInfo(od.FileName); + string newfile = ftp.PathFileCombine(curPath, fi.Name); + if (!ftp.download(remotefile,od.FileName)) + Util.MsgE("Download error"); + search(curPath); + } + + } +} diff --git a/SubProject/FCOMMON/fFTPExplorer.resx b/SubProject/FCOMMON/fFTPExplorer.resx new file mode 100644 index 0000000..6ff12c1 --- /dev/null +++ b/SubProject/FCOMMON/fFTPExplorer.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 221, 17 + + + 17, 17 + + + 104, 17 + + \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 547a652..f851256 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -78,7 +78,6 @@ this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -177,8 +176,7 @@ this.toolStripLabel5, this.toolStripLabel2, this.tbFind, - this.btFind, - this.toolStripButton1}); + this.btFind}); this.bn.Location = new System.Drawing.Point(0, 634); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -336,16 +334,6 @@ this.btFind.Text = "toolStripButton2"; this.btFind.Click += new System.EventHandler(this.btFind_Click); // - // toolStripButton1 - // - this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(28, 28); - this.toolStripButton1.Text = "toolStripButton1"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // // cm1 // this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); @@ -693,7 +681,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "공정"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "SC#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "NO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "수령"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "SID#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "품명"; @@ -755,7 +743,7 @@ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "NO#"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 44F; this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; @@ -985,7 +973,6 @@ private System.Windows.Forms.ToolStripMenuItem ㅕCustomDataCopyToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; - private System.Windows.Forms.ToolStripButton toolStripButton1; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 215be1e..3109a57 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -217,21 +217,6 @@ hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== - - - - - 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== diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index 24f0ca4..c49b2c7 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -79,6 +79,7 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.tbOrderNo = new System.Windows.Forms.TextBox(); this.cbManuProc = new System.Windows.Forms.ComboBox(); this.cbEQModel = new System.Windows.Forms.ComboBox(); this.cbEQManu = new System.Windows.Forms.ComboBox(); @@ -90,7 +91,6 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.tbOrderNo = new System.Windows.Forms.TextBox(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -297,6 +297,16 @@ label4.TabIndex = 18; label4.Text = "제조공정"; // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(36, 190); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(60, 20); + label5.TabIndex = 20; + label5.Text = "CR/CF#"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(104, 125); @@ -688,6 +698,15 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; // + // tbOrderNo + // + this.tbOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.tbOrderNo.Location = new System.Drawing.Point(104, 187); + this.tbOrderNo.Margin = new System.Windows.Forms.Padding(4); + this.tbOrderNo.Name = "tbOrderNo"; + this.tbOrderNo.Size = new System.Drawing.Size(286, 27); + this.tbOrderNo.TabIndex = 21; + // // cbManuProc // this.cbManuProc.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -789,25 +808,6 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // tbOrderNo - // - this.tbOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.tbOrderNo.Location = new System.Drawing.Point(104, 187); - this.tbOrderNo.Margin = new System.Windows.Forms.Padding(4); - this.tbOrderNo.Name = "tbOrderNo"; - this.tbOrderNo.Size = new System.Drawing.Size(286, 27); - this.tbOrderNo.TabIndex = 21; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(6, 190); - label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(90, 20); - label5.TabIndex = 20; - label5.Text = "Order No #."; - // // fPurchase_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index 12a3031..7d701fd 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -171,11 +171,14 @@ False + + False + 490, 17 - - False + + 490, 17 17, 17 diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 8f6b3dc..a3e8726 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -6273,11 +6273,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string path { get { - try { - return ((string)(this[this.tableProjects.pathColumn])); + if (this.IspathNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'path\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableProjects.pathColumn])); } } set { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index b5a7926..eed340d 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1472,7 +1472,7 @@ WHERE (pidx = @pidx) - + @@ -1613,7 +1613,7 @@ WHERE (pidx = @pidx) - + @@ -1637,7 +1637,7 @@ WHERE (pidx = @pidx) - + @@ -1681,7 +1681,7 @@ WHERE (pidx = @pidx) - + @@ -1726,7 +1726,7 @@ WHERE (pidx = @pidx) - + @@ -1790,7 +1790,7 @@ WHERE (pidx = @pidx) - + @@ -1880,7 +1880,7 @@ WHERE (pidx = @pidx) - + @@ -1914,7 +1914,7 @@ WHERE (pidx = @pidx) - + @@ -1952,7 +1952,7 @@ WHERE (pidx = @pidx) - + @@ -2016,7 +2016,7 @@ WHERE (pidx = @pidx) - + @@ -2106,7 +2106,7 @@ WHERE (pidx = @pidx) - + @@ -2140,7 +2140,7 @@ WHERE (pidx = @pidx) - + diff --git a/SubProject/FPJ0000/fProjectData.Designer.cs b/SubProject/FPJ0000/fProjectData.Designer.cs index f196002..904611c 100644 --- a/SubProject/FPJ0000/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/fProjectData.Designer.cs @@ -47,13 +47,14 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label7; System.Windows.Forms.Label label4; - System.Windows.Forms.Label label5; System.Windows.Forms.Label label6; System.Windows.Forms.Label label8; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); System.Windows.Forms.Label label9; - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbIdx = new System.Windows.Forms.TextBox(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); this.nameTextBox = new System.Windows.Forms.TextBox(); this.reqstaffTextBox = new System.Windows.Forms.TextBox(); this.sdateTextBox = new System.Windows.Forms.TextBox(); @@ -85,6 +86,11 @@ this.btPath = new System.Windows.Forms.ToolStripButton(); this.btSendMail = new System.Windows.Forms.ToolStripButton(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.bsWeek = new System.Windows.Forms.BindingSource(this.components); this.cmbProcess = new System.Windows.Forms.ComboBox(); this.cmbState = new System.Windows.Forms.ComboBox(); this.textBox1 = new System.Windows.Forms.TextBox(); @@ -92,6 +98,7 @@ this.cmbPart = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); this.panel1 = new System.Windows.Forms.Panel(); + this.textBox4 = new System.Windows.Forms.TextBox(); this.tbPath = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.arLabel2 = new arCtl.arLabel(); @@ -119,19 +126,12 @@ this.btwEdit = new System.Windows.Forms.ToolStripButton(); this.btwDel = new System.Windows.Forms.ToolStripButton(); this.arLabel7 = new arCtl.arLabel(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.bsWeek = new System.Windows.Forms.BindingSource(this.components); - this.dsPRJ = new FPJ0000.dsPRJ(); - this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.bsSchedule = new System.Windows.Forms.BindingSource(this.components); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taSchedule = new FPJ0000.dsPRJTableAdapters.ProjectsScheduleTableAdapter(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); sdateLabel = new System.Windows.Forms.Label(); @@ -150,13 +150,15 @@ label3 = new System.Windows.Forms.Label(); label7 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); - label5 = new System.Windows.Forms.Label(); label6 = new System.Windows.Forms.Label(); label8 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).BeginInit(); this.panel7.SuspendLayout(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); @@ -166,9 +168,6 @@ this.arPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).BeginInit(); this.SuspendLayout(); // @@ -302,7 +301,7 @@ // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(415, 61); + label2.Location = new System.Drawing.Point(377, 61); label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; label2.Size = new System.Drawing.Size(29, 12); @@ -312,7 +311,7 @@ // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(420, 89); + label3.Location = new System.Drawing.Point(382, 89); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(24, 12); @@ -337,15 +336,6 @@ label4.TabIndex = 6; label4.Text = "비고"; // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(32, 118); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(53, 12); - label5.TabIndex = 10; - label5.Text = "공유파일"; - // // label6 // label6.AutoSize = true; @@ -365,16 +355,36 @@ label8.TabIndex = 87; label8.Text = "전장"; // + // label9 + // + label9.AutoSize = true; + label9.Location = new System.Drawing.Point(356, 118); + label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(50, 12); + label9.TabIndex = 12; + label9.Text = "CR/CF#"; + // // tbIdx // this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); - this.tbIdx.Location = new System.Drawing.Point(452, 85); + this.tbIdx.Location = new System.Drawing.Point(413, 85); this.tbIdx.Name = "tbIdx"; this.tbIdx.ReadOnly = true; - this.tbIdx.Size = new System.Drawing.Size(88, 21); + this.tbIdx.Size = new System.Drawing.Size(127, 21); this.tbIdx.TabIndex = 9; this.tbIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // bs + // + this.bs.DataMember = "Projects"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // nameTextBox // this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); @@ -502,7 +512,7 @@ this.assetTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "asset", true)); this.assetTextBox.Location = new System.Drawing.Point(93, 57); this.assetTextBox.Name = "assetTextBox"; - this.assetTextBox.Size = new System.Drawing.Size(315, 21); + this.assetTextBox.Size = new System.Drawing.Size(256, 21); this.assetTextBox.TabIndex = 3; // // bn @@ -688,6 +698,46 @@ this.dataGridView1.TabIndex = 0; this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "div"; + this.dataGridViewTextBoxColumn1.HeaderText = "*"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Visible = false; + this.dataGridViewTextBoxColumn1.Width = 36; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate"; + this.dataGridViewTextBoxColumn2.HeaderText = "등록일"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + this.dataGridViewTextBoxColumn2.Width = 72; + // + // dataGridViewTextBoxColumn10 + // + this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewTextBoxColumn10.HeaderText = "비고"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + // + // dataGridViewCheckBoxColumn2 + // + this.dataGridViewCheckBoxColumn2.DataPropertyName = "mailsend"; + this.dataGridViewCheckBoxColumn2.HeaderText = "M"; + this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; + this.dataGridViewCheckBoxColumn2.ReadOnly = true; + this.dataGridViewCheckBoxColumn2.Width = 26; + // + // bsWeek + // + this.bsWeek.DataMember = "ProjectsHistory"; + this.bsWeek.DataSource = this.dsPRJ; + // // cmbProcess // this.cmbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -708,10 +758,10 @@ this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbState.FormattingEnabled = true; - this.cmbState.Location = new System.Drawing.Point(452, 57); + this.cmbState.Location = new System.Drawing.Point(413, 57); this.cmbState.Margin = new System.Windows.Forms.Padding(4); this.cmbState.Name = "cmbState"; - this.cmbState.Size = new System.Drawing.Size(88, 20); + this.cmbState.Size = new System.Drawing.Size(127, 20); this.cmbState.TabIndex = 5; // // textBox1 @@ -800,10 +850,10 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(label9); this.panel1.Controls.Add(this.textBox4); this.panel1.Controls.Add(this.tbPath); - this.panel1.Controls.Add(label5); this.panel1.Controls.Add(this.textBox2); this.panel1.Controls.Add(label4); this.panel1.Controls.Add(this.cmbState); @@ -820,12 +870,21 @@ this.panel1.Size = new System.Drawing.Size(547, 145); this.panel1.TabIndex = 86; // + // textBox4 + // + this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "orderno", true)); + this.textBox4.Location = new System.Drawing.Point(413, 114); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(127, 21); + this.textBox4.TabIndex = 13; + this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // tbPath // - this.tbPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); + this.tbPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "path", true)); this.tbPath.Location = new System.Drawing.Point(93, 114); this.tbPath.Name = "tbPath"; - this.tbPath.Size = new System.Drawing.Size(315, 21); + this.tbPath.Size = new System.Drawing.Size(256, 21); this.tbPath.TabIndex = 11; // // textBox2 @@ -834,7 +893,7 @@ this.textBox2.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.textBox2.Location = new System.Drawing.Point(93, 85); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(315, 21); + this.textBox2.Size = new System.Drawing.Size(256, 21); this.textBox2.TabIndex = 7; // // arLabel2 @@ -1359,75 +1418,6 @@ this.arLabel7.TextShadow = true; this.arLabel7.TextVisible = true; // - // label9 - // - label9.AutoSize = true; - label9.Location = new System.Drawing.Point(423, 118); - label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label9.Name = "label9"; - label9.Size = new System.Drawing.Size(21, 12); - label9.TabIndex = 12; - label9.Text = "No"; - // - // textBox4 - // - this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "orderno", true)); - this.textBox4.Location = new System.Drawing.Point(452, 114); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(88, 21); - this.textBox4.TabIndex = 13; - this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "div"; - this.dataGridViewTextBoxColumn1.HeaderText = "*"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Visible = false; - this.dataGridViewTextBoxColumn1.Width = 36; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate"; - this.dataGridViewTextBoxColumn2.HeaderText = "등록일"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.ReadOnly = true; - this.dataGridViewTextBoxColumn2.Width = 72; - // - // dataGridViewTextBoxColumn10 - // - this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle5; - this.dataGridViewTextBoxColumn10.HeaderText = "비고"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; - // - // dataGridViewCheckBoxColumn2 - // - this.dataGridViewCheckBoxColumn2.DataPropertyName = "mailsend"; - this.dataGridViewCheckBoxColumn2.HeaderText = "M"; - this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; - this.dataGridViewCheckBoxColumn2.ReadOnly = true; - this.dataGridViewCheckBoxColumn2.Width = 26; - // - // bsWeek - // - this.bsWeek.DataMember = "ProjectsHistory"; - this.bsWeek.DataSource = this.dsPRJ; - // - // dsPRJ - // - this.dsPRJ.DataSetName = "dsPRJ"; - this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bs - // - this.bs.DataMember = "Projects"; - this.bs.DataSource = this.dsPRJ; - // // ta // this.ta.ClearBeforeFill = true; @@ -1461,6 +1451,17 @@ // this.taSchedule.ClearBeforeFill = true; // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(32, 119); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(53, 12); + this.linkLabel1.TabIndex = 87; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "공유폴더"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1480,10 +1481,13 @@ this.Name = "fProjectData"; this.Text = "프로젝트 정보 추가/편집"; this.Load += new System.EventHandler(this.fProjectData_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).EndInit(); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); this.panel1.ResumeLayout(false); @@ -1501,9 +1505,6 @@ ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit(); this.bindingNavigator1.ResumeLayout(false); this.bindingNavigator1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1591,5 +1592,6 @@ private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.ToolStripButton btwEdit; private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectData.cs b/SubProject/FPJ0000/fProjectData.cs index fa5269d..91a2330 100644 --- a/SubProject/FPJ0000/fProjectData.cs +++ b/SubProject/FPJ0000/fProjectData.cs @@ -209,6 +209,18 @@ namespace FPJ0000 btwEdit.PerformClick(); } + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + if (tbPath.Text == "") tbPath.Text = "/" + tbIdx.Text; + var f = new FCOMMON.fFTPExplorer(nameTextBox.Text, tbPath.Text, + FCOMMON.info.ftp_ip, + FCOMMON.info.ftp_id, + FCOMMON.info.ftp_pw, + FCOMMON.info.ftp_port, + FCOMMON.info.ftp_passive); + f.ShowDialog(); + } + } } diff --git a/SubProject/FPJ0000/fProjectData.resx b/SubProject/FPJ0000/fProjectData.resx index 5bce862..891f254 100644 --- a/SubProject/FPJ0000/fProjectData.resx +++ b/SubProject/FPJ0000/fProjectData.resx @@ -171,18 +171,24 @@ False - - False - False False + + False + 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -323,18 +329,15 @@ 449, 17 - - False - - - 773, 17 - - - 773, 17 - 449, 17 + + 773, 17 + + + 773, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -414,9 +417,6 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - 17, 17 - 164, 17 diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index 992e522..cd8e236 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -46,6 +46,7 @@ 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 textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = 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(); @@ -102,6 +103,9 @@ this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.cmbSort = new System.Windows.Forms.ToolStripComboBox(); this.label1 = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel4 = new System.Windows.Forms.Panel(); @@ -131,9 +135,6 @@ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); - this.cmbSort = new System.Windows.Forms.ToolStripComboBox(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -459,11 +460,15 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.JobReport1TableAdapter = null; this.tam.JobReportTableAdapter = null; + this.tam.ProjectsHistory1TableAdapter = null; this.tam.ProjectsHistoryTableAdapter = null; this.tam.ProjectsIOMapTableAdapter = null; this.tam.ProjectsMailListTableAdapter = null; + this.tam.ProjectsPart1TableAdapter = null; this.tam.ProjectsPartTableAdapter = null; + this.tam.ProjectsSchedule1TableAdapter = null; this.tam.ProjectsScheduleTableAdapter = null; this.tam.ProjectsTableAdapter = this.ta; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; @@ -641,6 +646,34 @@ this.btViewDel.Size = new System.Drawing.Size(99, 22); this.btViewDel.Text = "삭제자료표시"; // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel5 + // + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel5.Text = "정렬"; + // + // cmbSort + // + this.cmbSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbSort.Items.AddRange(new object[] { + "---", + "Origin Cost", + "Input Cost", + "Effect Cost", + "Asset No", + "Project", + "Champion", + "Requestor", + "Process"}); + this.cmbSort.Name = "cmbSort"; + this.cmbSort.Size = new System.Drawing.Size(75, 25); + this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged); + // // label1 // this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true)); @@ -980,7 +1013,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 16; + this.fpSpread1_Sheet1.ColumnCount = 17; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -1013,11 +1046,14 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Effect\r\n($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Remark"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Remark"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "H/W"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "전장"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "S/W"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).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; @@ -1118,40 +1154,17 @@ 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).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "CR/CF#"; + 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).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); - // - // toolStripLabel5 - // - this.toolStripLabel5.Name = "toolStripLabel5"; - this.toolStripLabel5.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel5.Text = "정렬"; - // - // cmbSort - // - this.cmbSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbSort.Items.AddRange(new object[] { - "---", - "Origin Cost", - "Input Cost", - "Effect Cost", - "Asset No", - "Project", - "Champion", - "Requestor", - "Process"}); - this.cmbSort.Name = "cmbSort"; - this.cmbSort.Size = new System.Drawing.Size(75, 25); - this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged); - // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1272,9 +1285,9 @@ private System.Windows.Forms.Label sbSumE; private System.Windows.Forms.ToolStripLabel toolStripLabel4; private System.Windows.Forms.ToolStripComboBox cmbYearE; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripLabel toolStripLabel5; private System.Windows.Forms.ToolStripComboBox cmbSort; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file