pm 용 구매 업데이트 기능 추가

Project/Dialog/fDashboard.Designer.cs

@@ -0,0 +1,63 @@
+namespace Project.Dialog
+{
+    partial class fDashboard
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.label1.ForeColor = System.Drawing.Color.DimGray;
+            this.label1.Location = new System.Drawing.Point(0, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(800, 450);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "요약 화면 구성 중 입니다.\r\n\r\n업무일지는 \"관리->업무일지->목록\" 을 사용하세요";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label1.Click += new System.EventHandler(this.label1_Click);
+            // 
+            // fDashboard
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.label1);
+            this.Name = "fDashboard";
+            this.Text = "요약";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+    }
+}

Project/Dialog/fDashboard.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Project.Dialog
+{
+    public partial class fDashboard : Form
+    {
+        public fDashboard()
+        {
+            InitializeComponent();
+        }
+
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

Project/Dialog/fDashboard.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Project/Dialog/fLogin.Designer.cs

@@ -40,6 +40,7 @@
             this.tbPW = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
             this.btLogin = new System.Windows.Forms.Button();
+            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -58,6 +59,7 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244)))));
+            this.panel1.Controls.Add(this.linkLabel1);
             this.panel1.Controls.Add(this.label4);
             this.panel1.Controls.Add(this.cmbDept);
             this.panel1.Controls.Add(this.label3);
@@ -168,6 +170,18 @@
             this.btLogin.UseVisualStyleBackColor = true;
             this.btLogin.Click += new System.EventHandler(this.button1_Click);
             // 
+            // linkLabel1
+            // 
+            this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkLabel1.AutoSize = true;
+            this.linkLabel1.Location = new System.Drawing.Point(806, 334);
+            this.linkLabel1.Name = "linkLabel1";
+            this.linkLabel1.Size = new System.Drawing.Size(70, 23);
+            this.linkLabel1.TabIndex = 11;
+            this.linkLabel1.TabStop = true;
+            this.linkLabel1.Text = "신규가입";
+            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            // 
             // fLogin
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -203,5 +217,6 @@
         private System.Windows.Forms.ComboBox cmbDept;
         private System.Windows.Forms.Label label3;
 		private System.Windows.Forms.Label label4;
-	}
+        private System.Windows.Forms.LinkLabel linkLabel1;
+    }
 }

Project/Dialog/fLogin.cs

@@ -409,5 +409,23 @@ namespace Project.Dialog
             label4.Text = $"문의) 관리:{admin},개발:{dev}";
 
         }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            if(System.Diagnostics.Debugger.IsAttached==false)
+            {
+                Util.MsgE("이 기능은 준비중 입니다");
+                return;
+            }
+
+            var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow;
+            var dlg = FCOMMON.Util.MsgQ($"현재 선택된 그룹[{this.cmbDept.Text}]의 사용자를 추가할까요?\n" +
+                "추가된 사용자는 담당자로부터 승인 완료되어야 접속이 가능 합니다\n" +
+                "사용자 추가 후 그룹담당자에게 문의 하시기 바랍니다");
+            if (dlg != DialogResult.Yes) return;
+            var f = new _Common.fAddNewUser(cmbDept.Text, string.Empty,0);//.fUserInfo();
+
+            f.ShowDialog();
+        }
     }
 }

Project/Dialog/fLogin.resx

@@ -121,7 +121,7 @@
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
-        rgAAG64BjF1z+AAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAeaSURBVHhe7Vrr
+        rQAAG60BIeRSlQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAeaSURBVHhe7Vrr
         bxRVFK9+8ItRY/Qf8BE1auIravykRpjdlvcbFCMkxsREfACKxmCqobszW55CUikgL5ECkoLQIkTjB9md
         2W6rQmm7te1SmijvtpQ3FMZzZs+F6fYMULZ3d7adX/ILZM+555z768w9985MngcPHoao1fcpochwRTNC
         PlWvBDYD21PYpGh6BfyroW9+oXEvDR+cKCw071S0yGifGtkGolwEmn0kjDHKgaMwFoUdBDDNO/zByBQQ

Project/EETGW.csproj

@@ -273,6 +273,12 @@
     <Compile Include="Dev\fDisableItem.Designer.cs">
       <DependentUpon>fDisableItem.cs</DependentUpon>
     </Compile>
+    <Compile Include="Dialog\fDashboard.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialog\fDashboard.Designer.cs">
+      <DependentUpon>fDashboard.cs</DependentUpon>
+    </Compile>
     <Compile Include="Dialog\fDebug.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -546,6 +552,9 @@
     <EmbeddedResource Include="Dev\fDisableItem.resx">
       <DependentUpon>fDisableItem.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Dialog\fDashboard.resx">
+      <DependentUpon>fDashboard.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Dialog\fDebug.resx">
       <DependentUpon>fDebug.cs</DependentUpon>
     </EmbeddedResource>

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.09.18.1450")]
+[assembly: AssemblyVersion("23.10.15.2033")]
-[assembly: AssemblyFileVersion("23.09.18.1450")]
+[assembly: AssemblyFileVersion("23.10.15.2033")]

Project/_Common/fAddNewUser.cs

@@ -13,12 +13,13 @@ namespace Project._Common
     {
         string p_dept = string.Empty;
         string p_id = string.Empty;
-
+        short deflevel = 1;
-        public fAddNewUser(string dept, string id)
+        public fAddNewUser(string dept, string id, short _deflevel = 1)
         {
             InitializeComponent();
             p_dept = dept;
             p_id = id;
+            this.deflevel = _deflevel;
 
             this.tbDept.Text = dept;
             this.StartPosition = FormStartPosition.CenterScreen;
@@ -74,9 +75,24 @@ namespace Project._Common
         private void fUserInfo_Load(object sender, EventArgs e)
         {
             int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account));
-            chkExceptHoly.Enabled = curLevel > 4;
+       
-            chkJobReport.Enabled = curLevel > 4;
+            if(this.deflevel < 1)
-            chkUseState.Enabled = curLevel > 4;
+            {
+                chkExceptHoly.Visible = false;
+                chkJobReport.Visible = false; 
+                chkUseState.Visible = false;
+
+                chkExceptHoly.Checked = false;
+                chkJobReport.Checked = false; ;
+                chkUseState.Checked = false;
+            }
+            else
+            {
+                chkExceptHoly.Enabled = curLevel > 4;
+                chkJobReport.Enabled = curLevel > 4;
+                chkUseState.Enabled = curLevel > 4;
+            }
+          
         }
         private void button1_Click(object sender, EventArgs e)
         {
@@ -144,9 +160,15 @@ namespace Project._Common
             {
                 drGuser.Process = this.tbProcess.Text.Trim();
                 drGuser.state = this.tbState.Text.Trim();
-                drGuser.useJobReport = chkJobReport.Checked;
+
-                drGuser.useUserState = chkUseState.Checked;
+                if(deflevel > 0)
-                drGuser.exceptHoly = chkExceptHoly.Checked;
+                {
+                    drGuser.useJobReport = chkJobReport.Checked;
+                    drGuser.useUserState = chkUseState.Checked;
+                    drGuser.exceptHoly = chkExceptHoly.Checked;
+                }
+         
+                FCOMMON.Util.MsgI($"이미 존재하는 사용자 정보입니다\n"+"기존 정보가 업데이트 됩니다");
             }
             else
             {
@@ -161,7 +183,7 @@ namespace Project._Common
                 drGuser.wuid = FCOMMON.info.Login.no;
                 drGuser.wdate = DateTime.Now;
                 drGuser.gcode = gcode;
-                drGuser.level = 1;
+                drGuser.level = this.deflevel;
                 drGuser.uid = this.tbId.Text.Trim();
                 drGuser.state = this.tbState.Text.Trim();
                 drGuser.Process = this.tbProcess.Text.Trim();
@@ -182,7 +204,7 @@ namespace Project._Common
                 drUser.wuid = FCOMMON.info.Login.no;
                 drUser.wdate = DateTime.Now;
                 drUser.gcode = gcode;
-                drUser.level = 1;
+                drUser.level = this.deflevel;
                 drUser.id = tbId.Text.Trim();
                 drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0
 
@@ -202,7 +224,7 @@ namespace Project._Common
 
             else
             {
-                if(string.IsNullOrEmpty(drUser.password))
+                if(string.IsNullOrEmpty(drUser.password) || newpassword.isEmpty()==false)
                     drUser.password =   newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
 
                 drUser.name = tbNameK.Text.Trim();
@@ -267,7 +289,6 @@ namespace Project._Common
                     return;
                 }
 
-
                 newpassword = Pub.MakePasswordEnc(f.newpassword);
                 Util.MsgI($"암호가 변경되었습니다.[저장] 버튼을 누르면 적용 됩니다");
             }

Project/_Common/fUserList.Designer.cs

@@ -62,7 +62,7 @@
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.tbProcess = new System.Windows.Forms.ToolStripTextBox();
             this.btRef = new System.Windows.Forms.ToolStripButton();
-            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.tbFind = new System.Windows.Forms.TextBox();
             this.ta = new Project.dsMSSQLTableAdapters.vGroupUserTableAdapter();
             this.arDatagridView1 = new arCtl.arDatagridView();
             this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -168,6 +168,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -346,6 +347,7 @@
             // tbProcess
             // 
             this.tbProcess.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbProcess.Name = "tbProcess";
             this.tbProcess.Size = new System.Drawing.Size(100, 25);
             this.tbProcess.Text = "%";
@@ -360,14 +362,15 @@
             this.btRef.Text = "새로고침(&R)";
             this.btRef.Click += new System.EventHandler(this.btRef_Click);
             // 
-            // textBox1
+            // tbFind
             // 
-            this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
+            this.tbFind.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.textBox1.Location = new System.Drawing.Point(0, 651);
+            this.tbFind.Location = new System.Drawing.Point(0, 629);
-            this.textBox1.Name = "textBox1";
+            this.tbFind.Name = "tbFind";
-            this.textBox1.Size = new System.Drawing.Size(1234, 21);
+            this.tbFind.Size = new System.Drawing.Size(1234, 43);
-            this.textBox1.TabIndex = 3;
+            this.tbFind.TabIndex = 3;
+            this.tbFind.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // ta
             // 
@@ -384,7 +387,8 @@
             this.arDatagridView1.AllowUserToDeleteRows = false;
             this.arDatagridView1.AutoGenerateColumns = false;
             this.arDatagridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.arDatagridView1.ColumnHeadersHeight = 35;
+            this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.idDataGridViewTextBoxColumn,
             this.nameDataGridViewTextBoxColumn,
@@ -408,7 +412,7 @@
             this.arDatagridView1.ReadOnly = true;
             this.arDatagridView1.RowTemplate.Height = 23;
             this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.arDatagridView1.Size = new System.Drawing.Size(1234, 626);
+            this.arDatagridView1.Size = new System.Drawing.Size(1234, 604);
             this.arDatagridView1.TabIndex = 6;
             // 
             // idDataGridViewTextBoxColumn
@@ -522,7 +526,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1234, 711);
             this.Controls.Add(this.arDatagridView1);
-            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.tbFind);
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.bn);
             this.Name = "fUserList";
@@ -570,7 +574,7 @@
         private System.Windows.Forms.ToolStripComboBox cmbdept;
         private System.Windows.Forms.ToolStripButton btRef;
         private System.Windows.Forms.ToolStripMenuItem autoResizeColumnToolStripMenuItem;
-        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.TextBox tbFind;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
         private System.Windows.Forms.ToolStripLabel toolStripLabel2;
         private System.Windows.Forms.ToolStripTextBox tbProcess;

Project/_Common/fUserList.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -16,7 +17,41 @@ namespace Project._Common
             InitializeComponent();
             this.dsMSSQL.Users.TableNewRow += Users_TableNewRow;
             this.FormClosed += __Closed;
-
+            this.KeyDown += (s1, e1) =>
+            {
+                if (e1.KeyCode == Keys.Escape) this.Close();
+            };
+            this.tbFind.KeyDown += (s1, e1) =>
+            {
+                if (e1.KeyCode == Keys.Enter) SearchKey();
+            };
+        }
+        void SearchKey()
+        {
+            var txt = tbFind.Text.Trim();
+            if (txt.isEmpty())
+            {
+                bs.Filter = "";
+                tbFind.BackColor = Color.White;
+            }
+            else
+            {
+                var cols = new string[] { "id", "name", "email", "tel" };
+                var filter = string.Join(" like '%{0}%' or ", cols) + " like '%{0}%'";
+                filter = string.Format(filter, txt);
+                try
+                {
+                    bs.Filter = filter;
+                    tbFind.BackColor = Color.Lime;
+                }
+                catch (Exception ex)
+                {
+                    bs.Filter = "";
+                    tbFind.BackColor = Color.Tomato;
+                }
+            }
+            tbFind.Focus();
+            tbFind.SelectAll();
         }
 
         void __Closed(object sender, FormClosedEventArgs e)

Project/_Common/fUserList.resx

@@ -130,7 +130,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -141,7 +141,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -150,7 +150,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -159,7 +159,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -170,7 +170,7 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -239,6 +239,9 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>252, 17</value>
   </metadata>
@@ -263,4 +266,7 @@
   <metadata name="nameE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="nameE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

Project/fMain.Designer.cs

@@ -96,6 +96,7 @@
             this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
             this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.휴가사용현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.연차현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.근로명부ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripSeparator();
             this.근태입력오류확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -152,7 +153,7 @@
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
-            this.연차현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.대쉬보드ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -277,19 +278,20 @@
             this.commonToolStripMenuItem.Name = "commonToolStripMenuItem";
             this.commonToolStripMenuItem.Size = new System.Drawing.Size(93, 23);
             this.commonToolStripMenuItem.Text = "공용정보";
+            this.commonToolStripMenuItem.Click += new System.EventHandler(this.commonToolStripMenuItem_Click);
             // 
             // codesToolStripMenuItem
             // 
             this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image")));
             this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
-            this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.codesToolStripMenuItem.Text = "공용코드";
             this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
             // 
             // itemsToolStripMenuItem
             // 
             this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
-            this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.itemsToolStripMenuItem.Text = "품목정보";
             this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
             // 
@@ -302,7 +304,7 @@
             this.toolStripMenuItem12,
             this.그룹정보ToolStripMenuItem});
             this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
-            this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.userInfoToolStripMenuItem.Text = "사용자";
             // 
             // userAccountToolStripMenuItem
@@ -341,14 +343,14 @@
             // customerToolStripMenuItem
             // 
             this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
-            this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.customerToolStripMenuItem.Text = "업체정보";
             this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
             // 
             // mn_kuntae
             // 
             this.mn_kuntae.Name = "mn_kuntae";
-            this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
+            this.mn_kuntae.Size = new System.Drawing.Size(180, 24);
             this.mn_kuntae.Text = "월별 근무표";
             this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click);
             // 
@@ -356,7 +358,7 @@
             // 
             this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image")));
             this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem";
-            this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.메일양식ToolStripMenuItem.Text = "메일 양식";
             this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click);
             // 
@@ -701,6 +703,13 @@
             this.휴가사용현황ToolStripMenuItem.Text = "휴가이력 현황";
             this.휴가사용현황ToolStripMenuItem.Click += new System.EventHandler(this.휴가사용현황ToolStripMenuItem_Click);
             // 
+            // 연차현황ToolStripMenuItem
+            // 
+            this.연차현황ToolStripMenuItem.Name = "연차현황ToolStripMenuItem";
+            this.연차현황ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
+            this.연차현황ToolStripMenuItem.Text = "연차 현황";
+            this.연차현황ToolStripMenuItem.Click += new System.EventHandler(this.연차현황ToolStripMenuItem_Click);
+            // 
             // 근로명부ToolStripMenuItem
             // 
             this.근로명부ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
@@ -844,7 +853,8 @@
             // 기타ToolStripMenuItem
             // 
             this.기타ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.품목검색ToolStripMenuItem});
+            this.품목검색ToolStripMenuItem,
+            this.대쉬보드ToolStripMenuItem});
             this.기타ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("기타ToolStripMenuItem.Image")));
             this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem";
             this.기타ToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
@@ -1188,12 +1198,12 @@
             this.toolStripButton3.ToolTipText = "휴가신청";
             this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
             // 
-            // 연차현황ToolStripMenuItem
+            // 대쉬보드ToolStripMenuItem
             // 
-            this.연차현황ToolStripMenuItem.Name = "연차현황ToolStripMenuItem";
+            this.대쉬보드ToolStripMenuItem.Name = "대쉬보드ToolStripMenuItem";
-            this.연차현황ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
+            this.대쉬보드ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
-            this.연차현황ToolStripMenuItem.Text = "연차 현황";
+            this.대쉬보드ToolStripMenuItem.Text = "대쉬보드";
-            this.연차현황ToolStripMenuItem.Click += new System.EventHandler(this.연차현황ToolStripMenuItem_Click);
+            this.대쉬보드ToolStripMenuItem.Click += new System.EventHandler(this.대쉬보드ToolStripMenuItem_Click);
             // 
             // fMain
             // 
@@ -1350,6 +1360,7 @@
         private System.Windows.Forms.ToolStripMenuItem 휴가REMINDToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 개인별근태집계표ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 연차현황ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 대쉬보드ToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -233,37 +233,38 @@ namespace Project
             var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
 
 
+            this.Menu_Dashboard();
             // Menu_Note();
 
-            //시작폼 확인
+            ////시작폼 확인
-            if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true)
+            //if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true)
-            {
+            //{
-                menu_nrpurchase();
+            //    menu_nrpurchase();
-            }
+            //}
-            else if (Pub.setting.startForm == eFormList.업무일지 && menu_dailyhistoryVisible == true)
+            //else if (Pub.setting.startForm == eFormList.업무일지 && menu_dailyhistoryVisible == true)
-            {
+            //{
-                menu_work_report();
+            //    menu_work_report();
-            }
+            //}
-            else if (Pub.setting.startForm == eFormList.프로젝트관리 && menu_projectVisible == true)
+            //else if (Pub.setting.startForm == eFormList.프로젝트관리 && menu_projectVisible == true)
-            {
+            //{
-                menu_projecT_list();
+            //    menu_projecT_list();
-            }
+            //}
-            else if (Pub.setting.startForm == eFormList.재고관리 && menu_jagoVisible == true)
+            //else if (Pub.setting.startForm == eFormList.재고관리 && menu_jagoVisible == true)
-            {
+            //{
-                Menu_Inventory();
+            //    Menu_Inventory();
-            }
+            //}
-            else if (Pub.setting.startForm == eFormList.재고현황 && menu_jagoVisible == true)
+            //else if (Pub.setting.startForm == eFormList.재고현황 && menu_jagoVisible == true)
-            {
+            //{
-                Menu_InventoryList();
+            //    Menu_InventoryList();
-            }
+            //}
-            else if(Pub.setting.startForm == eFormList.품목입고)
+            //else if(Pub.setting.startForm == eFormList.품목입고)
-            {
+            //{
-                menu_itemin();
+            //    menu_itemin();
-            }
+            //}
-            else if (Pub.setting.startForm == eFormList.근태입력)
+            //else if (Pub.setting.startForm == eFormList.근태입력)
-            {
+            //{
-                Menu_WorkTable();
+            //    Menu_WorkTable();
-            }
+            //}
 
         }
         void Menu_WorkTable()
@@ -1463,5 +1464,22 @@ namespace Project
             if (!ShowForm(formkey))
                 AddForm(formkey, new FBS0000.fyeonchastate());
         }
+
+        private void commonToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        void Menu_Dashboard()
+        {
+            string formkey = "DASHBOARD";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new Dialog.fDashboard());
+        }
+
+        private void 대쉬보드ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Menu_Dashboard();
+        }
     }
 }

Project/fMain.resx

@@ -153,6 +153,83 @@
         Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA
         kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV
         Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw==
+</value>
+  </data>
+  <data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O
+        fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
+        oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
+        RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
+</value>
+  </data>
+  <data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
+        AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
+        QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
+        OoWKdGiDBgEBADs=
+</value>
+  </data>
+  <data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
+        e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
+        oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
+        ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
+        Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
+</value>
+  </data>
+  <data name="기타ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt
+        Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ
+        8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW
+        GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R
+        v3gHemD5QK4HtBMSEyRplOTBgAA7
+</value>
+  </data>
+  <data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
+        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
+        JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
+        jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
+        Ow==
+</value>
+  </data>
+  <data name="btDev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG
+        Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ
+        kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO
+        EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa
+        vQU5DIar2KFgxYEHBgQAOw==
+</value>
+  </data>
+  <data name="버젼확인ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c
+        hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg
+        USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP
+        GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE
+        DQ8eBAjwYKZhhQQPFoRMuXJAADs=
+</value>
+  </data>
+  <data name="설명서ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB
+        MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA
+        oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG
+        IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB
+        D4UNMwz8ISAAOw==
 </value>
   </data>
   <data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -173,15 +250,6 @@
         gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
         SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
         CyQdKlaIsLHjggEBADs=
-</value>
-  </data>
-  <data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O
-        fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
-        oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
-        RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
 </value>
   </data>
   <data name="mn_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -297,74 +365,6 @@
         h58L4755nzwWACmRSEixWEynl0gQtXWDq9efcWesTLPb7RZmkg1AikQiUigU0uklEoREZl63mEkW430F
         g0EHv2mdHpgsyzvNJMvHQ/n9fofX69XJ7HK5bGaSrfBQPNXBzU92nQFgfwCJli/+LKS33wAAAABJRU5E
         rkJggg==
-</value>
-  </data>
-  <data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
-        AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
-        QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
-        OoWKdGiDBgEBADs=
-</value>
-  </data>
-  <data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
-        e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
-        oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
-        ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
-        Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
-</value>
-  </data>
-  <data name="기타ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt
-        Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ
-        8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW
-        GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R
-        v3gHemD5QK4HtBMSEyRplOTBgAA7
-</value>
-  </data>
-  <data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
-        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
-        JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
-        jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
-        Ow==
-</value>
-  </data>
-  <data name="btDev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG
-        Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ
-        kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO
-        EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa
-        vQU5DIar2KFgxYEHBgQAOw==
-</value>
-  </data>
-  <data name="버젼확인ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c
-        hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg
-        USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP
-        GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE
-        DQ8eBAjwYKZhhQQPFoRMuXJAADs=
-</value>
-  </data>
-  <data name="설명서ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB
-        MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA
-        oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG
-        IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB
-        D4UNMwz8ISAAOw==
 </value>
   </data>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -452,14 +452,14 @@
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
         h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
-        /U7m/E+5XP8/92TF/3lzYj/UzMv/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
+        /U7m/E+5XP8/92TF/3lzYj/UzM3/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
-        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8Ptbr9vV7o9blnWyHc
+        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8Ptrr+vV7o9blnWyHc
         gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
         v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
         LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
-        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bRgd7fQPo/MoaKnQGr
+        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bhgd7fQPo/MoaKnQGr
-        2d+jAdUG1LhtIjtQcP6jxfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
+        2d+jAdUG1LhtIjtQcP7DRfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
-        BQDln6riTfUzDgAAAABJRU5ErkJggg==
+        BQDX/6rZxdf1ogAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FCM0000/Inventory/fInventory.Designer.cs

@@ -529,6 +529,7 @@
             this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.arDatagridView1.Size = new System.Drawing.Size(1107, 568);
             this.arDatagridView1.TabIndex = 4;
+            this.arDatagridView1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError);
             // 
             // pdateDataGridViewTextBoxColumn
             // 

SubProject/FCM0000/Inventory/fInventory.cs

@@ -497,5 +497,10 @@ namespace FCM0000
         {
             updateplace();
         }
+
+        private void arDatagridView1_DataError(object sender, DataGridViewDataErrorEventArgs e)
+        {
+
+        }
     }
 }

SubProject/FCM0000/Item/fItemAdd.cs

@@ -14,11 +14,15 @@ namespace FCM0000.Item
     public partial class fItemAdd : FCOMMON.fBase
     {
         public int newIDX = -1;
-        public fItemAdd()
+        public string newSID = string.Empty;
+        public fItemAdd(string sidname)
         {
             InitializeComponent();
             Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
-
+            this.ControlBox = true;
+            this.MaximizeBox = true;
+            this.MinimizeBox = false;
+            tbSid.Text = sidname;
             foreach (Control ctl in this.Controls)
             {
                 if (ctl.GetType() == typeof(TextBox) || ctl.GetType() == typeof(ComboBox))
@@ -46,6 +50,11 @@ namespace FCM0000.Item
             {
                 this.Location = new Point(0, 0);
             }
+            this.Show();
+            Application.DoEvents();
+
+            if (tbSid.Text.isEmpty()) tbSid.Focus();
+            else tbName.Focus();
         }
 
         private void btOK_Click(object sender, EventArgs e)
@@ -151,6 +160,10 @@ namespace FCM0000.Item
                 else
                 {
                     newIDX = (int)(ta.ReadIDX(FCOMMON.info.Login.gcode, pumName, pumModel));
+                    if (tbSid.Text.Length == 9 && tbSid.Text.StartsWith("10"))
+                        newSID = tbSid.Text.Trim();
+                    else newSID = string.Empty;
+
                     DialogResult = System.Windows.Forms.DialogResult.OK;
                 }
             }

SubProject/FCM0000/Item/fItems.Designer.cs

@@ -86,6 +86,7 @@
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.panel1 = new System.Windows.Forms.Panel();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.memoTextBox = new System.Windows.Forms.TextBox();
@@ -119,7 +120,6 @@
             this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter();
             this.bsStaff = new System.Windows.Forms.BindingSource(this.components);
             this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -127,12 +127,12 @@
             this.cm1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.panIMage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.toolStrip2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -485,7 +485,7 @@
             this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton2.Name = "toolStripButton2";
             this.toolStripButton2.Size = new System.Drawing.Size(104, 34);
-            this.toolStripButton2.Text = "새고로침(&R)";
+            this.toolStripButton2.Text = "새로고침(&R)";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
             // 
             // toolStripButton1
@@ -511,6 +511,143 @@
             this.fpSpread1.Size = new System.Drawing.Size(877, 623);
             this.fpSpread1.TabIndex = 3;
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            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 = 14;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "숨김";
+            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 = "품명";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SID#";
+            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 = "단가($)";
+            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, 13).Value = "공급처";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F;
+            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;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
+            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
+            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 62F;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "disable";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Label = "숨김";
+            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).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Storage";
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소";
+            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).Width = 79F;
+            this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "cate";
+            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Label = "분류";
+            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "name";
+            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명";
+            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid";
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID#";
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "model";
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "모델명";
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F;
+            currencyCellType1.DecimalPlaces = 0;
+            currencyCellType1.MaximumValue = new decimal(new int[] {
+            10000000,
+            0,
+            0,
+            0});
+            currencyCellType1.MinimumValue = new decimal(new int[] {
+            10000000,
+            0,
+            0,
+            -2147483648});
+            currencyCellType1.NegativeRed = true;
+            currencyCellType1.NullDisplay = "--";
+            currencyCellType1.Separator = ",";
+            currencyCellType1.ShowSeparator = true;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = currencyCellType1;
+            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 123F;
+            numberCellType2.DecimalPlaces = 2;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "priceD";
+            this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue;
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가($)";
+            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).Width = 94F;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "manu";
+            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "제조사";
+            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F;
+            numberCellType3.MaximumValue = 999999999999999D;
+            numberCellType3.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "scale";
+            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 84F;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "unit";
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위";
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "supply";
+            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "supplyname";
+            this.fpSpread1_Sheet1.Columns.Get(12).Visible = false;
+            comboBoxCellType1.AllowEditorVerticalAlign = true;
+            comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right;
+            comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = comboBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "supplyidx";
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "공급처";
+            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "supply";
+            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
+            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;
+            // 
             // panel1
             // 
             this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -793,143 +930,6 @@
             // 
             this.taStaff.ClearBeforeFill = true;
             // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            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 = 14;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "숨김";
-            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 = "품명";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SID#";
-            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 = "단가($)";
-            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, 13).Value = "공급처";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F;
-            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;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 62F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "disable";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "숨김";
-            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).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Storage";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소";
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 79F;
-            this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "cate";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "분류";
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "name";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명";
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID#";
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "model";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "모델명";
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F;
-            currencyCellType1.DecimalPlaces = 0;
-            currencyCellType1.MaximumValue = new decimal(new int[] {
-            10000000,
-            0,
-            0,
-            0});
-            currencyCellType1.MinimumValue = new decimal(new int[] {
-            10000000,
-            0,
-            0,
-            -2147483648});
-            currencyCellType1.NegativeRed = true;
-            currencyCellType1.NullDisplay = "--";
-            currencyCellType1.Separator = ",";
-            currencyCellType1.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = currencyCellType1;
-            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 123F;
-            numberCellType2.DecimalPlaces = 2;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "priceD";
-            this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue;
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가($)";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Width = 94F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "manu";
-            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "제조사";
-            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F;
-            numberCellType3.MaximumValue = 999999999999999D;
-            numberCellType3.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "scale";
-            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 84F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "unit";
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위";
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "supply";
-            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "supplyname";
-            this.fpSpread1_Sheet1.Columns.Get(12).Visible = false;
-            comboBoxCellType1.AllowEditorVerticalAlign = true;
-            comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
-            comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
-            comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right;
-            comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = comboBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "supplyidx";
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "공급처";
-            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "supply";
-            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
-            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;
-            // 
             // fItems
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -952,6 +952,7 @@
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.panIMage.ResumeLayout(false);
@@ -960,7 +961,6 @@
             this.toolStrip2.ResumeLayout(false);
             this.toolStrip2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

SubProject/FCM0000/Item/fItems.cs

@@ -90,6 +90,9 @@ namespace FCM0000
                 this.ta.FillDupCheck(this.dsMSSQL.Items, FCOMMON.info.Login.gcode, cateSearch);
 
             FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
+
+            tbFind.Text = string.Empty;
+            tbFind.BackColor = Color.White;
         }
 
         void Items_TableNewRow(object sender, DataTableNewRowEventArgs e)
@@ -129,6 +132,7 @@ namespace FCM0000
                 tbSearch.Focus();
                 return;
             }
+         
             refreshData();
         }
 

SubProject/FCM0000/Item/fItems.resx

@@ -159,7 +159,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -170,7 +170,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -179,7 +179,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -188,7 +188,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -222,20 +222,20 @@
   <data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALzSURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgviv4H
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgviv4H
-        o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloSzd7i6XioRCd7d9ACO0EFBuJtQHE3yCRMja00wTYwa6A9sv
+        o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloZRud5dLvYRCd7c8gJFuIaDcTMqLCT5BImbd00wTYwa6A9sv
-        +TLZ2TPflzln5uyWGYGnluDRF2b35dfN3bdghGf8ynjc6ek5yATEJ35RkUITmZVYcm1zfPG3BiM8e3Lz
+        +TLZ2TPflzln5uxWmIHHtvDhZ1bvxZetvTdghGf8ynzc6uvbz4SER0FBFiMTuZWkkt8cX/ylwQjPPn2e
-        TEf0MULoAF6yfzS2hav8A6qsZn5uffmlaTtRzWS3vIKceNsWqcJL9w4mIN2PpL6tkIx2YlieXbay4j0s
+        6Uo8RAjtw0v2juaOaE1wSJEUdW3ry09N246Kmt/y81L6dUe8Bi/dPZiQeDc++W2FZLQdo9Lssp0V7mAJ
-        QQ+TN3KdU+eWSOLFGE4u/Ghk97BzqCmklySql5B26prDQSpW02JU0tktOHBYUh98gjxAEqOlX1AkLFkc
+        elj88asxZW6JJF6K0czCj2Z2FzuHmkJ6SaJGCWmnrjkcpFI1LUU5m9+CA4cljSHAS0MkMVoGeVnEkqXx
-        z0ztx8Px9CpJiJZw1XTf85qGj5c+pbKbJCFa9k2ubdQ0eC9i6d2BWjpvjy+uE4VoGf++riF7VzWW3h21
+        xNJ5NJpSV0lCtISrZvie1zW9v/Ahs7ZJEqLlwFR+o67Jfx5L7wzU1n1zfHGdKETL1Pd1DTl7arH0zqi3
-        5g/l3GR2gyRES9hxraX1ApbeHQi5j0FtSEK07E1klql6OfRekhAtfZIiYEl9gPsHvZckppfKYvaPtV14
+        vqscmFrbIAnREnZcb2s/h6V3BkLeI1AbkhAt+9O5ZapeDr2XJETLgCjzWNIY4P5B7yWJGaW8mP9t7+Tv
-        iCX1ATqOR9pf5/KJ8gR158otOGT29Q/3K3NE0WLkkgur1L36kc12pKmd4/nEVy0YS2mR5DxRfCfC14np
+        Y0ljgI7jE/fWuQKCNEHdufQFB6yBwdFBeY4oWoqxzMIqda9+4HAcaumMcVz6qxZOTmrxzDxRfDvC14np
-        Eu5iOX2AE23y90m8/FUT1bTGJ6a1Rh8X9/AJGXovyahAqCmk1+ThKrGcPiDGdzq303hUns6bwmj2coOQ
+        4W9jOWOAE20JDoic9FUTFFXj0jNacyCW8nFpCXovyahIqCmk1+KLVWM5Y0BM4KS+01RCmimYwmj1x4Yh
-        AagVHDivpIhwReB+wh8IjGE5swQ9GQ4SfU0trWfsrDAWVWbypoI8ozUF+CHSHYQ5aDLI2VUN457/uZC9
+        A1ArOHB+URbgisD9hD8QGKNSbgl6Mhwk+pra2k85WX4sIWcLpryU1VpC3AjpDsIcNBnk7qmFcdf/XMjZ
-        86y9U1DFgqk6o1nZ6BhyOE7gEONRZ/OfdwSFKSFnCKZgbu2IpCADOMR41DsDV5zBwem8YX6nac3BClOQ
+        fdrZzStC0VTJanY2MYZcrmM4xHw0OIJnXWF+mtcNwRTM7V3xScgADjEfje7QJXd4eKZgWNipqrlYfhoy
-        ARxiPN64uq+5QrF0wRToDEmTyNp2DocYjzpXxw1X7/D8f6bp3OerHIcYj+fv3KdaQrG5f01bw7HMS3vw
+        gEPMxytP7xVPJKkWTYHuiDiF7B1ncIj5aPB0XfP0j87/Z6rqn69KHGI+nr7xnmiLJOf+NW2PJnPPneHL
-        Kg4pDV4xnsrQyOh2wdST2zl6z1bg16XDA7f7MBPgR3tGPm+7e4dm65vZm/hV6QHmyOKvQLbASTxVYpSV
+        OKQ8eMH4qiMfP/0pmvr0naO3bBV+XT7c83oPMiHuc59u7u0fmW1sZa/jV+UHmCNbsAo5QsfxVJlRUfEX
-        /QX6FFoSwKXPwAAAAABJRU5ErkJggg==
+        RWVZ//5ppeoAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -282,25 +282,25 @@
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQmSURBVEhLtVftT1NXHL7xJfNPcDMmGhXnvk9N9mFfjRoR
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQmSURBVEhLtVfrT1NnHD6ZLvon6JYlLt7mvutM/LCvixoR
-        xVQmFEurVDflxUoHSC5WRdoLtNMiMtYJA1rdRA0ihWIDjLa01AmoGRaUFqbMLRsFfPnmap/LOfQK1dFx
+        xVQUiqVV6hWFSpVLDlRF2gO00yIy1gEDWm+4BZVKoQGkLS1VLrqMMsQWtqFbJgWmfnO1z+F96RGqo+Ps
-        9yQnvcnvOb+n5+X3cphYsWfPj4t3HL/x0e6C1k27Clo/i89vWfk5276EmMWFhG2Lk5W6uMMV/fYs08BI
+        Sd70JL/n/T19L7/Ly8SKXbuuLdp28sePduY1f7Ejr3lTXM7dT75k2xYTs7iQsC1rZCUu7lB5v/2EaWDk
-        psk3zlb7/jnZMBbKqXrwKklj30qo4kDCtq+Sf+O1fP3D0N+65mCIs07MGaev/xH6QtO2nUxZOKQ6p0pV
+        uGlwnK3y/VPQMBbKqvzpVaLGvplQxYGEbVsh/9prOfX90HNdUzDEWSfmjLM//BHao2nZSqYsHFKdU6Wq
-        M/iEs0YXpGO2sFTbZc+42B+YPZKLHaO7C6zxhDYXOMM0nauysH7spVAAK86xjEweqbzvOmTstSgMPVUK
+        +eU3zhpdkI7ZwlJtpz39cn9g9kgqcozuzLPGEdpc4AxTda6K/Pqxl0IBrDjLMjJ5tOKR66Cx16IwdFcq
-        g8d0wOBuTGRvbyTTmS8r+luF8zBU1YFnKZwzhVCiA6JFjcOv6SRd80RIXfPoaVqpp1JS1BZHaO/EXOFg
+        DB7TfoO7MYFt3UCmM4fL+5uF8zBU1YFnyZwzmVCiA6KFjcOv6SRd00RIXfP499QST4WksGUNob0Tc4WD
-        SFrS3UjM0YHtFa5Ue2s8lH7O25nMda4mlH9FtBVn1z98mVrsPEoobwMXafpMI6Jyfc+1LUeaPyCUeYEK
+        IWlxVyMxRwe2V7hS7Z3xUNoFb0cS1/Epofwroq04o973MqXIeYxQ3gYu0vSZRkTl+u6bXx1tWkIo8wIV
-        qy2BYHHT+Iy4qnpgNOoCFAb3ZXqRsL3p5+90xCoKQBhnmlzcJVcae11UGD4VZd5aQpvGPo19PUKGknCm
+        VlsCwaLb4zPiquqB0agLUBjcV+hFwvamXbzfHqsoAGGcaVJRp1xp7HVRYfhUlHprCW0aezX2tQgZSsKZ
-        sWyvEPvOOjqSOedefO/UdGyAL+pXVT38LEljW8cTARnn4mic4ldW5rlITDEjXm1dRT55KPSe7yMhGfYd
+        xrK9Quw972hP4py78b1d074OvqhfVfWTZ4ka22qeCMg4F0fjFL+yUs9lYooZcWrrCvLJQ6H3fBcJybDv
-        TkTExDDISPRf5Zv9U7uE/2qBQCTkmP2T1P+h8j4bb0DcIg1Sw9GKPidvEBFfXbjnpv6hxef2bXk3V+TW
+        cCIiJoZBRqL/Ksfsn9oh/FcLBCIhy+yfpP4PlvXZeAPiFmmQGo6V9zl5g4g4cumhm/qHFp/bt2Tf+vh0
-        DE9Qg9J49zLhiwblubtXqP/cGv8EigyTwNo2n2wYnEkYaXpvJeGLBvik/lFcEvJsmxmUt8IG3/8qfMDQ
+        zZMJalAae64QvmhQXui5Sv2frvFPoMgw8axtY0HD4EzCSNV7KwhfNMAn9Y/iEp9t28igvOU3+P5X4f2G
-        8y31X3jV9zqhoPlTfquFh59u9Iq/1eW9P1H/KKlbVU3LmYMH7ywVXi5cBMIXDcLLlV310I8LzRuUF3pv
+        7m+o//wbvtfxeU3r+a0WHn6a0Sv+Vpf1Xqf+UVI3q24vYw4cuP+h8HLhIhC+aBBeroxKnx8XmjcoL/W2
-        U0OOOTApZjglse0f55tHpqj/wxV9bcQUPvwSd4kwyBH0xMRjdlKIBfIyz3fC5CTlnFpiYpjEE/b1x2of
+        UkOWOTApZjglsm2f5ZhHpqj/Q+V9LcQUPvxid7EwyBH0xMRjdlKIBfJSz7fC5CTlnFpiYpiEXPvazNrh
-        /0n/FdJc4pmfP4EN6Q9pkCfGCLRM6lrf79Rvdt3jvxKLWtYS8zTkeo8FiZySwkXCmXS2Q3q8bmgMiZ/Q
+        P+m/QppLOHfvc9iQ/pAGeWKMQMukrh18Sv1m1A3/lVB4dxUxT0Ou91iQyCkpXCSciefbpSfrhsaQ+Alt
-        5o1wklgGHxGfQVS7OmKOQKKzr8m69OtvVBglTW0OBPEdqzBEZXp3I0or9Xfs0sCoJNyREsrbSNU6lIUN
+        3ggniaXwEfEZRLWrI+YIJDr7yhNVP/9KhVHS1OZAEN+xCkNUpnc3orRSf5lVA6OScEdKKG8jRetQ5jf4
-        /ueUTEcswthepfEXh1CUvfrohbSkK4NQoiO1tPtm5KLNX1iisW2Ql3pMOFPhkaGNSuUc7692KdpOCc5U
+        /6ZkOmIRxvYqjQ8cQlH2xuMX0uLOdEKJjpSSrluRizZ/YYnGtk5e4jHhTIVHhjYqhXO8v9olazskOFOh
-        KIohFEZjhwYPjR4aPmV53xXE6QlzYIreXjqwUojOxG00oPVECxqtNUXLSmgMWlm0tEKBuSMYUoXPNEXX
+        KIZQGI0dGjw0emj4lGV9VxGnuebAFL29dGClEJ2J22hA64kWNFpripaV0Bi0smhphQJzRzCkCp9psq7z
-        lUmmLRzvE8aKETIyfU/9Oy/SfwWeK3i24PmCSoPcm2EaCCD77ee6tZJT9jWEKi5QxPFQw4MNlS0hz/oh
+        OJm2cLxPGCtGyMj03fXvvEj/FXiu4NmC5wsqDXJvumkggOy3j+vSSs7YVxKquEARx0MNDzZUtvhs63KW
-        y7KLiHmeYJg3K9Pzwe23JNkAAAAASUVORK5CYII=
+        ZT8g5nmCYd4A3cPztue5qtUAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -355,8 +355,8 @@
         v8ORvMOeuMMSK6IP35JOp+nq6lLiLC8v093dzfj4ONXV1Ugmk4m1tTWy2awiYBGVZbLj5R3WeBFTtKA4
         bG9vVxrq8Xhoa2tjeHiYqqoqJIPBgJg9h4eHmIM5jNEi1k0BQR4Quy16xcrKCq2trUSjUWZmZmhpaVGm
         oVarkeRs09PTirVA+p0QucIQFdlFH2yRK174U4h5o9FoCAQCSvbGxkbMZjMqlQpJzuN0OpW5Tk1NKXbl
-        Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HGWlZX9FHYem5ubn5qampRq9fX11NbWUllZ+VRe
+        Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HGWlpb+FHYem5ubn5qampRq9fX11NbWUllZ+VRe
-        Xv4o3jyWlpb+RUlJiYy3ynf+h0uSfgPG6NG/cSKM/gAAAABJRU5ErkJggg==
+        Xv5YVlb2KN79RUlJiYy3ynf+h0uSfgPEsdG8SMl3KAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="taPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FCM0000/Item/fLovItem.cs

@@ -29,6 +29,7 @@ namespace FCM0000
         public fLovItem(string search_)
         {
             InitializeComponent();
+            btAdd.Enabled = false;
             Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
 
             fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
@@ -63,6 +64,7 @@ namespace FCM0000
             this.Show();
             Application.DoEvents();
 
+            
             refreshData(this.tbFind.Text);
 
             if (this.bs.Count > 0) fpSpread1.Focus();
@@ -92,6 +94,7 @@ namespace FCM0000
                 //this.taPMP.Fill(this.dSPMP.SPMaster, "%" + search + "%");
                 //this.arDatagridView1.AutoResizeColumns();
                 searchOk = true;
+                btAdd.Enabled = true;
             }
         }
 
@@ -241,8 +244,10 @@ namespace FCM0000
                 return;
             }
             else refreshData(search);
+            
             tbFind.SelectAll();
             tbFind.Focus();
+            btAdd.Enabled = true;
         }
 
         private void btAdd_Click(object sender, EventArgs e)
@@ -254,7 +259,10 @@ namespace FCM0000
                 tbFind.SelectAll();
                 return;
             }
-            var f = new Item.fItemAdd();
+            var sid = string.Empty;
+            if (tbFind.Text.Length == 9 && tbFind.Text.StartsWith("10")) sid = tbFind.Text.Trim();
+            
+            var f = new Item.fItemAdd(sid);
             if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
                 itemName = f.tbName.Text.Trim();

SubProject/FCM0000/fCode.Designer.cs

@@ -55,6 +55,7 @@
             this.title가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.s가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btAddNew = new System.Windows.Forms.ToolStripButton();
+            this.btCancle = new System.Windows.Forms.ToolStripButton();
             this.commonDataGridView = new System.Windows.Forms.DataGridView();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -63,7 +64,7 @@
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ta = new FCM0000.dsMSSQLTableAdapters.CommonTableAdapter();
             this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
-            this.btCancle = new System.Windows.Forms.ToolStripButton();
+            this.tbFind = new System.Windows.Forms.TextBox();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
@@ -291,6 +292,16 @@
             this.btAddNew.Text = "누락 항목 추가";
             this.btAddNew.Click += new System.EventHandler(this.toolStripButton2_Click);
             // 
+            // btCancle
+            // 
+            this.btCancle.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.btCancle.Image = ((System.Drawing.Image)(resources.GetObject("btCancle.Image")));
+            this.btCancle.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btCancle.Name = "btCancle";
+            this.btCancle.Size = new System.Drawing.Size(79, 22);
+            this.btCancle.Text = "선택 취소";
+            this.btCancle.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            // 
             // commonDataGridView
             // 
             this.commonDataGridView.AutoGenerateColumns = false;
@@ -318,7 +329,7 @@
             this.commonDataGridView.Location = new System.Drawing.Point(0, 48);
             this.commonDataGridView.Name = "commonDataGridView";
             this.commonDataGridView.RowTemplate.Height = 23;
-            this.commonDataGridView.Size = new System.Drawing.Size(817, 645);
+            this.commonDataGridView.Size = new System.Drawing.Size(817, 606);
             this.commonDataGridView.TabIndex = 3;
             this.commonDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.commonDataGridView_CellContentClick);
             this.commonDataGridView.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.commonDataGridView_CellDoubleClick);
@@ -378,15 +389,18 @@
             this.tam.StaffTableAdapter = null;
             this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             // 
-            // btCancle
+            // tbFind
             // 
-            this.btCancle.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.tbFind.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.btCancle.Image = ((System.Drawing.Image)(resources.GetObject("btCancle.Image")));
+            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btCancle.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tbFind.Location = new System.Drawing.Point(0, 654);
-            this.btCancle.Name = "btCancle";
+            this.tbFind.Name = "tbFind";
-            this.btCancle.Size = new System.Drawing.Size(79, 22);
+            this.tbFind.Size = new System.Drawing.Size(817, 39);
-            this.btCancle.Text = "선택 취소";
+            this.tbFind.TabIndex = 4;
-            this.btCancle.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            this.tbFind.Text = "(검색어를 입력하세요)";
+            this.tbFind.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbFind.TextChanged += new System.EventHandler(this.tbFind_TextChanged);
+            this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
             // 
             // fCode
             // 
@@ -394,6 +408,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(817, 718);
             this.Controls.Add(this.commonDataGridView);
+            this.Controls.Add(this.tbFind);
             this.Controls.Add(this.bn);
             this.Controls.Add(this.panel1);
             this.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -450,5 +465,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.ToolStripButton btCancle;
+        private System.Windows.Forms.TextBox tbFind;
     }
 }

SubProject/FCM0000/fCode.cs

@@ -1,4 +1,5 @@
 using FCOMMON;
+using NetOffice.OutlookApi;
 using System;
 using System.Data;
 using System.Drawing;
@@ -11,7 +12,7 @@ namespace FCM0000
     {
         string defaultgubun = "";
         string defafilter = "";
-        public fCode(string gubun = "",string filter="")
+        public fCode(string gubun = "", string filter = "")
         {
             InitializeComponent();
             this.defaultgubun = gubun;
@@ -19,6 +20,8 @@ namespace FCM0000
             Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
             this.dsMSSQL.Common.TableNewRow += Common_TableNewRow;
             if (FCOMMON.info.Login.level >= 9) toolStripButton1.Visible = true;
+            this.KeyPreview = true;
+            this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); };
         }
 
         void Common_TableNewRow(object sender, DataTableNewRowEventArgs e)
@@ -37,7 +40,8 @@ namespace FCM0000
 
         private void __Load(object sender, EventArgs e)
         {
-            if(this.defaultgubun.isEmpty()==false)
+            tbFind.Text = string.Empty;
+            if (this.defaultgubun.isEmpty() == false)
             {
                 commonDataGridView.AllowUserToAddRows = false;
                 commonDataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
@@ -50,7 +54,7 @@ namespace FCM0000
 
 
             this.Show();
-            Application.DoEvents();
+            System.Windows.Forms.Application.DoEvents();
 
             if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
             if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
@@ -77,7 +81,7 @@ namespace FCM0000
                         break;
                     }
                 }
-                if(idx > -1)
+                if (idx > -1)
                 {
                     this.cmbList.SelectedIndex = idx;
                     this.cmbList.Enabled = false;
@@ -112,7 +116,7 @@ namespace FCM0000
                 this.bs.Filter = this.defafilter;
                 this.dsMSSQL.Common.AcceptChanges();
             }
-            catch (Exception ex)
+            catch (System.Exception ex)
             {
                 FCOMMON.Util.MsgE("Query Error\n\n" + ex.Message);
             }
@@ -294,5 +298,39 @@ namespace FCM0000
             this.SelectedTitle = string.Empty;
             this.DialogResult = DialogResult.OK;
         }
+
+        private void tbFind_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void tbFind_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+                search();
+        }
+        void search()
+        {
+            var text = tbFind.Text.Trim();
+            if (text.isEmpty() == false)
+            {
+                try
+                {
+                    var filter = "code like '%{0}%' or memo like '%{0}%'";
+                    bs.Filter = filter.Replace("{0}", text);
+                    tbFind.BackColor = Color.Lime;
+                }
+                catch (System.Exception ex)
+                {
+                    tbFind.BackColor = Color.Tomato;
+                }
+            }
+            else
+            {
+                bs.Filter = "";
+                tbFind.BackColor = Color.White;
+            }
+            tbFind.SelectAll();
+        }
     }
 }

SubProject/FCM0000/fCode.resx

@@ -124,7 +124,7 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -142,7 +142,7 @@
   <data name="btDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -154,7 +154,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -165,7 +165,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -174,7 +174,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -183,7 +183,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -194,7 +194,7 @@
   <data name="btSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        wAAADsABataJCQAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>

SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs

@@ -51,19 +51,20 @@
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
@@ -132,9 +133,9 @@
             this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
             this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
-            this.tbManager = new System.Windows.Forms.ToolStripTextBox();
+            this.cmbManager = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
-            this.tbAdmin = new System.Windows.Forms.ToolStripTextBox();
+            this.cmbAdmin = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@@ -299,8 +300,8 @@
             this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image")));
             this.btAdd.Name = "btAdd";
             this.btAdd.RightToLeftAutoMirrorImage = true;
-            this.btAdd.Size = new System.Drawing.Size(67, 23);
+            this.btAdd.Size = new System.Drawing.Size(91, 23);
-            this.btAdd.Text = "추가(&A)";
+            this.btAdd.Text = "구매입력(&A)";
             this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
             // 
             // btCopy
@@ -627,9 +628,9 @@
             this.toolStripLabel3,
             this.tbRequest,
             this.toolStripLabel6,
-            this.tbManager,
+            this.cmbManager,
             this.toolStripLabel7,
-            this.tbAdmin,
+            this.cmbAdmin,
             this.toolStripSeparator4,
             this.btSearch,
             this.toolStripSeparator5,
@@ -741,13 +742,11 @@
             this.toolStripLabel6.Size = new System.Drawing.Size(55, 34);
             this.toolStripLabel6.Text = "구매담당";
             // 
-            // tbManager
+            // cmbManager
             // 
-            this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.cmbManager.Name = "cmbManager";
-            this.tbManager.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.cmbManager.Size = new System.Drawing.Size(75, 37);
-            this.tbManager.Name = "tbManager";
+            this.cmbManager.Text = "65";
-            this.tbManager.Size = new System.Drawing.Size(70, 37);
-            this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // toolStripLabel7
             // 
@@ -755,13 +754,11 @@
             this.toolStripLabel7.Size = new System.Drawing.Size(55, 34);
             this.toolStripLabel7.Text = "구매승인";
             // 
-            // tbAdmin
+            // cmbAdmin
             // 
-            this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.cmbAdmin.Name = "cmbAdmin";
-            this.tbAdmin.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.cmbAdmin.Size = new System.Drawing.Size(75, 37);
-            this.tbAdmin.Name = "tbAdmin";
+            this.cmbAdmin.Text = "66";
-            this.tbAdmin.Size = new System.Drawing.Size(70, 37);
-            this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // toolStripSeparator4
             // 
@@ -892,13 +889,13 @@
             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 = 38;
+            this.fpSpread1_Sheet1.ColumnCount = 39;
             this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
             this.fpSpread1_Sheet1.ActiveRowIndex = -1;
             this.fpSpread1_Sheet1.AutoGenerateColumns = false;
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "요청\r\n검사";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "구매\r\n검사";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "등록일";
+            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 = "Storage";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정";
@@ -918,22 +915,23 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "수량\r\n(요청)";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "수량\r\n(구매)";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "단위";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "단가($)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "단가\r\n(해외)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "단가";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "통화";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "합계금액";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "단가";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "공급업체";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "합계금액";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "공급업체";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "프로젝트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "프로젝트";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "비고\r\n(요청자)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "입고예정";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "비고\r\n(요청자)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "입고일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "입고예정";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "입고수량";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "입고일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "PO#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "입고수량";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).Value = "비고\r\n(담당자)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).Value = "PO#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "구매담당";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "비고\r\n(담당자)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "구매승인";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "구매담당";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "삭제됨";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "구매승인";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).Value = "삭제됨";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
             this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1";
@@ -948,7 +946,7 @@
             this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "등록일";
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "구매신청일";
             this.fpSpread1_Sheet1.Columns.Get(2).Tag = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F;
@@ -1084,8 +1082,14 @@
             this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType4;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "pumpriceD";
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(22).Label = "단가($)";
+            this.fpSpread1_Sheet1.Columns.Get(22).Label = "단가\r\n(해외)";
             this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "currency";
+            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).Label = "통화";
+            this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).Width = 33F;
             numberCellType5.DecimalPlaces = 0;
             numberCellType5.MaximumValue = 9999999999999.99D;
             numberCellType5.MinimumValue = -9999999999999.99D;
@@ -1094,12 +1098,12 @@
             numberCellType5.Separator = ",";
             numberCellType5.ShowSeparator = true;
             numberCellType5.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "pumprice";
+            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "pumprice";
-            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(23).Label = "단가";
+            this.fpSpread1_Sheet1.Columns.Get(24).Label = "단가";
-            this.fpSpread1_Sheet1.Columns.Get(23).Tag = "pumprice";
+            this.fpSpread1_Sheet1.Columns.Get(24).Tag = "pumprice";
-            this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F;
             numberCellType6.DecimalPlaces = 0;
             numberCellType6.MaximumValue = 9999999999999.99D;
             numberCellType6.MinimumValue = -9999999999999.99D;
@@ -1108,102 +1112,102 @@
             numberCellType6.Separator = ",";
             numberCellType6.ShowSeparator = true;
             numberCellType6.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "pumamt";
+            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "pumamt";
-            this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(24).Label = "합계금액";
+            this.fpSpread1_Sheet1.Columns.Get(25).Label = "합계금액";
-            this.fpSpread1_Sheet1.Columns.Get(24).Tag = "pumamt";
+            this.fpSpread1_Sheet1.Columns.Get(25).Tag = "pumamt";
-            this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType16;
-            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "supply";
-            this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(25).Label = "공급업체";
-            this.fpSpread1_Sheet1.Columns.Get(25).Tag = "supply";
             this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(26).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "supply";
+            this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(26).Label = "공급업체";
+            this.fpSpread1_Sheet1.Columns.Get(26).Tag = "supply";
+            this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(27).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(26).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "supplyidx";
+            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "supplyidx";
-            this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(26).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(27).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(26).Visible = false;
+            this.fpSpread1_Sheet1.Columns.Get(27).Visible = false;
-            this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "project";
-            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(27).Label = "프로젝트";
             this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(28).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "project";
+            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(28).Label = "프로젝트";
+            this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(29).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             numberCellType8.DecimalPlaces = 0;
             numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
             numberCellType8.MaximumValue = 2147483647D;
             numberCellType8.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "projectidx";
+            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "projectidx";
-            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(29).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(28).Tag = "projectidx";
+            this.fpSpread1_Sheet1.Columns.Get(29).Tag = "projectidx";
-            this.fpSpread1_Sheet1.Columns.Get(28).Visible = false;
+            this.fpSpread1_Sheet1.Columns.Get(29).Visible = false;
-            this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "bigo";
-            this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(29).Label = "비고\r\n(요청자)";
-            this.fpSpread1_Sheet1.Columns.Get(29).Tag = "bigo";
-            this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19;
-            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "bigo";
-            this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(30).Label = "입고예정";
+            this.fpSpread1_Sheet1.Columns.Get(30).Label = "비고\r\n(요청자)";
+            this.fpSpread1_Sheet1.Columns.Get(30).Tag = "bigo";
+            this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20;
-            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(31).Label = "입고일";
+            this.fpSpread1_Sheet1.Columns.Get(31).Label = "입고예정";
-            this.fpSpread1_Sheet1.Columns.Get(31).Tag = "indate";
             this.fpSpread1_Sheet1.Columns.Get(31).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(32).Label = "입고일";
+            this.fpSpread1_Sheet1.Columns.Get(32).Tag = "indate";
+            this.fpSpread1_Sheet1.Columns.Get(32).Width = 51F;
             numberCellType9.DecimalPlaces = 0;
             numberCellType9.NegativeRed = true;
             numberCellType9.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = numberCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "inqty";
+            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "inqty";
-            this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).Label = "입고수량";
-            this.fpSpread1_Sheet1.Columns.Get(32).Tag = "inqty";
-            this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).Label = "PO#";
+            this.fpSpread1_Sheet1.Columns.Get(33).Label = "입고수량";
-            this.fpSpread1_Sheet1.Columns.Get(33).Tag = "po";
+            this.fpSpread1_Sheet1.Columns.Get(33).Tag = "inqty";
+            this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(33).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType22;
-            this.fpSpread1_Sheet1.Columns.Get(34).DataField = "chkremark";
+            this.fpSpread1_Sheet1.Columns.Get(34).DataField = "po";
-            this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(34).Label = "비고\r\n(담당자)";
+            this.fpSpread1_Sheet1.Columns.Get(34).Label = "PO#";
-            this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(34).Tag = "po";
+            this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType23;
-            this.fpSpread1_Sheet1.Columns.Get(35).DataField = "purchase_manager";
+            this.fpSpread1_Sheet1.Columns.Get(35).DataField = "chkremark";
-            this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(35).Label = "구매담당";
+            this.fpSpread1_Sheet1.Columns.Get(35).Label = "비고\r\n(담당자)";
             this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType24;
-            this.fpSpread1_Sheet1.Columns.Get(36).DataField = "purchase_admin";
+            this.fpSpread1_Sheet1.Columns.Get(36).DataField = "purchase_manager";
             this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(36).Label = "구매승인";
+            this.fpSpread1_Sheet1.Columns.Get(36).Label = "구매담당";
             this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType24;
-            this.fpSpread1_Sheet1.Columns.Get(37).DataField = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(37).DataField = "purchase_admin";
-            this.fpSpread1_Sheet1.Columns.Get(37).Label = "삭제됨";
+            this.fpSpread1_Sheet1.Columns.Get(37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(37).Tag = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(37).Label = "구매승인";
-            this.fpSpread1_Sheet1.Columns.Get(37).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(38).DataField = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(38).Label = "삭제됨";
+            this.fpSpread1_Sheet1.Columns.Get(38).Tag = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(38).Width = 51F;
             this.fpSpread1_Sheet1.DataAutoCellTypes = false;
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
             this.fpSpread1_Sheet1.DataSource = this.bs;
@@ -1322,8 +1326,8 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.ToolStripLabel toolStripLabel6;
         private System.Windows.Forms.ToolStripLabel toolStripLabel7;
-        private System.Windows.Forms.ToolStripTextBox tbManager;
+        private System.Windows.Forms.ToolStripComboBox cmbManager;
-        private System.Windows.Forms.ToolStripTextBox tbAdmin;
+        private System.Windows.Forms.ToolStripComboBox cmbAdmin;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FEQ0000/Purchase/fPurchaseNR.cs

@@ -13,6 +13,7 @@ using Outlook = NetOffice.OutlookApi;
 using NetOffice.OutlookApi.Enums;
 using FEQ0000.Purchase;
 using FCOMMON;
+using NetOffice.OfficeApi;
 
 namespace FEQ0000
 {
@@ -110,6 +111,7 @@ namespace FEQ0000
             this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
             this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
 
+
             //state list
             var stList = FCOMMON.DBM.getCodeList("04");
             this.cmbState.Items.Clear();
@@ -118,7 +120,24 @@ namespace FEQ0000
                 cmbState.Items.Add(item.Value);
             cmbState.Items.Add("<=Received");
             this.cmbState.SelectedIndex = 0;    //all기본 - 양진원
-            //this.cmbCr.SelectedIndex = 1;
+                                                //this.cmbCr.SelectedIndex = 1;
+
+            //구매-담당
+            stList = FCOMMON.DBM.getCodeList("65");
+            this.cmbManager.Items.Clear();
+            cmbManager.Items.Add("-- 전체 --");
+            foreach (var item in stList)
+                cmbManager.Items.Add(item.Value);
+            this.cmbManager.SelectedIndex = 0;
+
+            //구매-승인
+            stList = FCOMMON.DBM.getCodeList("66");
+            this.cmbAdmin.Items.Clear();
+            cmbAdmin.Items.Add("-- 전체 --");
+            foreach (var item in stList)
+                cmbAdmin.Items.Add(item.Value);
+            this.cmbAdmin.SelectedIndex = 0;
+
 
             //일반사용자의경우에는 상태를 변경하지 못한다.
             int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase));
@@ -198,13 +217,13 @@ namespace FEQ0000
                     cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)";
                 }
 
-                if (tbManager.Text.isEmpty() == false)
+                if (cmbManager.SelectedIndex != 0 && cmbManager.Text.isEmpty() == false)
                 {
-                    cmd.CommandText += $" and purchase_manager like '%{tbManager.Text.Replace("'", "''")}%'";
+                    cmd.CommandText += $" and purchase_manager like '%{cmbManager.Text.Replace("'", "''")}%'";
                 }
-                if (tbAdmin.Text.isEmpty() == false)
+                if (cmbAdmin.SelectedIndex != 0 && cmbAdmin.Text.isEmpty() == false)
                 {
-                    cmd.CommandText += $" and purchase_admin like '%{tbAdmin.Text.Replace("'", "''")}%'";
+                    cmd.CommandText += $" and purchase_admin like '%{cmbAdmin.Text.Replace("'", "''")}%'";
                 }
 
                 if (cmbState.SelectedIndex != 0)
@@ -449,12 +468,14 @@ namespace FEQ0000
             else
                 newdr.request = FCOMMON.info.Login.no;
 
-            var t1 = DBM.getCodeByCode("65", "01");
+            var t1 = DBM.getCodeList("65");
-            var t2 = DBM.getCodeByCode("66", "01");
+            var t2 = DBM.getCodeList("66");
-            newdr.purchase_manager = t1.title;
+            if (t1.Count == 1)
-            newdr.purchase_admin = t2.title;
+                newdr.purchase_manager = t1.First().Value;
+            if (t2.Count == 1)
+                newdr.purchase_admin = t2.First().Value;
 
-        repeat:
+            repeat:
 
             bool repeat = false;
             DialogResult dlg;
@@ -831,6 +852,12 @@ namespace FEQ0000
             newdr.wdate = DateTime.Now;
             newdr.wuid = FCOMMON.info.Login.no;
             newdr.state = "---";
+            if (newdr.sid.Length != 9 && newdr.sid.StartsWith("10") == false)
+                newdr.sid = string.Empty;
+
+            newdr.bigo = string.Empty;
+            newdr.bigo2 = string.Empty;
+
             newdr.request = FCOMMON.info.Login.no;
             newdr.receive = "";// FCOMMON.info.Login.nameK;
             newdr.sc = string.Empty;
@@ -1069,8 +1096,18 @@ namespace FEQ0000
 
         private void 견적서폴더열기ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
+
-            FCOMMON.Util.RunExplorer(path);
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "02");
+            if (datapath.isEmpty())
+            {
+                FCOMMON.Util.MsgE("견적서 기본폴더 공용코드 55-02 값을 입력하세요");
+                return;
+            }
+            string path = System.IO.Path.Combine(datapath, DateTime.Now.Year.ToString("0000") + "년");// "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
+            if (System.IO.Directory.Exists(path) == false)
+                FCOMMON.Util.RunExplorer(datapath);
+            else
+                FCOMMON.Util.RunExplorer(path);
         }
 
         private void 엑셀에서가져오기ToolStripMenuItem_Click(object sender, EventArgs e)

SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs

@@ -49,7 +49,6 @@
             System.Windows.Forms.Label label6;
             System.Windows.Forms.Label label7;
             System.Windows.Forms.Label label8;
-            System.Windows.Forms.Label label9;
             System.Windows.Forms.Label label10;
             System.Windows.Forms.Label label11;
             System.Windows.Forms.Label label12;
@@ -58,6 +57,8 @@
             System.Windows.Forms.Label label15;
             System.Windows.Forms.Label label16;
             System.Windows.Forms.Label label17;
+            System.Windows.Forms.Label label9;
+            System.Windows.Forms.Label label18;
             this.tbSC = new System.Windows.Forms.TextBox();
             this.tbSID = new System.Windows.Forms.TextBox();
             this.tbPumName = new System.Windows.Forms.TextBox();
@@ -84,6 +85,7 @@
             this.chkExp = new System.Windows.Forms.CheckBox();
             this.btSaveAdd = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cmbCurrency = new System.Windows.Forms.ComboBox();
             this.tbQtyReal = new System.Windows.Forms.TextBox();
             this.tbBigoChk = new System.Windows.Forms.TextBox();
             this.chk2 = new System.Windows.Forms.CheckBox();
@@ -95,26 +97,27 @@
             this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.tbCostCenter = new System.Windows.Forms.ComboBox();
+            this.tbLineCode = new System.Windows.Forms.ComboBox();
+            this.tbManager = new System.Windows.Forms.ComboBox();
+            this.tbAdmin = new System.Windows.Forms.ComboBox();
             this.btEQModel = new System.Windows.Forms.Button();
             this.btEQManu = new System.Windows.Forms.Button();
-            this.btManuProc = new System.Windows.Forms.Button();
             this.btProcess = new System.Windows.Forms.Button();
-            this.tbLineCode = new System.Windows.Forms.TextBox();
+            this.btManuProc = new System.Windows.Forms.Button();
-            this.tbCostCenter = new System.Windows.Forms.TextBox();
-            this.tbInQty = new System.Windows.Forms.TextBox();
             this.button7 = new System.Windows.Forms.Button();
+            this.tbInQty = new System.Windows.Forms.TextBox();
             this.button6 = new System.Windows.Forms.Button();
             this.button5 = new System.Windows.Forms.Button();
             this.button4 = new System.Windows.Forms.Button();
             this.tbOrderNo = new System.Windows.Forms.TextBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.cmbRemark = new System.Windows.Forms.ComboBox();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.tbAdmin = new System.Windows.Forms.TextBox();
-            this.tbManager = new System.Windows.Forms.TextBox();
             processLabel = new System.Windows.Forms.Label();
             receiveLabel = new System.Windows.Forms.Label();
             scLabel = new System.Windows.Forms.Label();
@@ -134,7 +137,6 @@
             label6 = new System.Windows.Forms.Label();
             label7 = new System.Windows.Forms.Label();
             label8 = new System.Windows.Forms.Label();
-            label9 = new System.Windows.Forms.Label();
             label10 = new System.Windows.Forms.Label();
             label11 = new System.Windows.Forms.Label();
             label12 = new System.Windows.Forms.Label();
@@ -143,6 +145,8 @@
             label15 = new System.Windows.Forms.Label();
             label16 = new System.Windows.Forms.Label();
             label17 = new System.Windows.Forms.Label();
+            label9 = new System.Windows.Forms.Label();
+            label18 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -153,7 +157,7 @@
             // processLabel
             // 
             processLabel.AutoSize = true;
-            processLabel.Location = new System.Drawing.Point(58, 163);
+            processLabel.Location = new System.Drawing.Point(66, 402);
             processLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             processLabel.Name = "processLabel";
             processLabel.Size = new System.Drawing.Size(39, 20);
@@ -164,7 +168,7 @@
             // receiveLabel
             // 
             receiveLabel.AutoSize = true;
-            receiveLabel.Location = new System.Drawing.Point(43, 99);
+            receiveLabel.Location = new System.Drawing.Point(51, 338);
             receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             receiveLabel.Name = "receiveLabel";
             receiveLabel.Size = new System.Drawing.Size(54, 20);
@@ -174,7 +178,7 @@
             // scLabel
             // 
             scLabel.AutoSize = true;
-            scLabel.Location = new System.Drawing.Point(70, 195);
+            scLabel.Location = new System.Drawing.Point(78, 434);
             scLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             scLabel.Name = "scLabel";
             scLabel.Size = new System.Drawing.Size(27, 20);
@@ -214,12 +218,12 @@
             // pumpriceLabel
             // 
             pumpriceLabel.AutoSize = true;
-            pumpriceLabel.Location = new System.Drawing.Point(47, 176);
+            pumpriceLabel.Location = new System.Drawing.Point(7, 176);
             pumpriceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumpriceLabel.Name = "pumpriceLabel";
-            pumpriceLabel.Size = new System.Drawing.Size(39, 20);
+            pumpriceLabel.Size = new System.Drawing.Size(79, 20);
             pumpriceLabel.TabIndex = 16;
-            pumpriceLabel.Text = "단가";
+            pumpriceLabel.Text = "단가(국내)";
             // 
             // pumamtLabel
             // 
@@ -234,7 +238,7 @@
             // assetLabel
             // 
             assetLabel.AutoSize = true;
-            assetLabel.Location = new System.Drawing.Point(28, 357);
+            assetLabel.Location = new System.Drawing.Point(36, 94);
             assetLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             assetLabel.Name = "assetLabel";
             assetLabel.Size = new System.Drawing.Size(69, 20);
@@ -244,7 +248,7 @@
             // poLabel
             // 
             poLabel.AutoSize = true;
-            poLabel.Location = new System.Drawing.Point(67, 227);
+            poLabel.Location = new System.Drawing.Point(75, 466);
             poLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             poLabel.Name = "poLabel";
             poLabel.Size = new System.Drawing.Size(30, 20);
@@ -257,9 +261,9 @@
             deptLabel.Location = new System.Drawing.Point(4, 368);
             deptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             deptLabel.Name = "deptLabel";
-            deptLabel.Size = new System.Drawing.Size(84, 20);
+            deptLabel.Size = new System.Drawing.Size(84, 40);
             deptLabel.TabIndex = 34;
-            deptLabel.Text = "요청자비고";
+            deptLabel.Text = "요청자비고\r\n(구매사유)";
             this.toolTip1.SetToolTip(deptLabel, resources.GetString("deptLabel.ToolTip"));
             // 
             // label1
@@ -275,7 +279,7 @@
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new System.Drawing.Point(13, 322);
+            label2.Location = new System.Drawing.Point(21, 59);
             label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label2.Name = "label2";
             label2.Size = new System.Drawing.Size(84, 20);
@@ -285,7 +289,7 @@
             // label4
             // 
             label4.AutoSize = true;
-            label4.Location = new System.Drawing.Point(28, 291);
+            label4.Location = new System.Drawing.Point(36, 28);
             label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label4.Name = "label4";
             label4.Size = new System.Drawing.Size(69, 20);
@@ -295,12 +299,14 @@
             // label5
             // 
             label5.AutoSize = true;
-            label5.Location = new System.Drawing.Point(38, 259);
+            label5.ForeColor = System.Drawing.Color.Red;
+            label5.Location = new System.Drawing.Point(72, -5);
             label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label5.Name = "label5";
             label5.Size = new System.Drawing.Size(59, 20);
             label5.TabIndex = 14;
             label5.Text = "SCR/CF";
+            label5.Visible = false;
             // 
             // label3
             // 
@@ -338,24 +344,12 @@
             // 
             label8.AutoSize = true;
             label8.ForeColor = System.Drawing.Color.Blue;
-            label8.Location = new System.Drawing.Point(29, 206);
+            label8.Location = new System.Drawing.Point(7, 206);
             label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label8.Name = "label8";
-            label8.Size = new System.Drawing.Size(57, 20);
+            label8.Size = new System.Drawing.Size(79, 20);
             label8.TabIndex = 18;
-            label8.Text = "단가($)";
+            label8.Text = "단가(해외)";
-            // 
-            // label9
-            // 
-            label9.AutoSize = true;
-            label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label9.ForeColor = System.Drawing.Color.Blue;
-            label9.Location = new System.Drawing.Point(285, 210);
-            label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label9.Name = "label9";
-            label9.Size = new System.Drawing.Size(163, 15);
-            label9.TabIndex = 20;
-            label9.Text = "해외물품은 좌측 단가를 입력";
             // 
             // label10
             // 
@@ -370,7 +364,7 @@
             // label11
             // 
             label11.AutoSize = true;
-            label11.Location = new System.Drawing.Point(28, 131);
+            label11.Location = new System.Drawing.Point(36, 370);
             label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label11.Name = "label11";
             label11.Size = new System.Drawing.Size(69, 20);
@@ -380,17 +374,17 @@
             // label12
             // 
             label12.AutoSize = true;
-            label12.Location = new System.Drawing.Point(19, 419);
+            label12.Location = new System.Drawing.Point(68, 155);
             label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label12.Name = "label12";
-            label12.Size = new System.Drawing.Size(78, 20);
+            label12.Size = new System.Drawing.Size(37, 20);
             label12.TabIndex = 24;
-            label12.Text = "Line Code";
+            label12.Text = "Line";
             // 
             // label13
             // 
             label13.AutoSize = true;
-            label13.Location = new System.Drawing.Point(8, 387);
+            label13.Location = new System.Drawing.Point(16, 124);
             label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label13.Name = "label13";
             label13.Size = new System.Drawing.Size(89, 20);
@@ -400,7 +394,7 @@
             // label14
             // 
             label14.AutoSize = true;
-            label14.Location = new System.Drawing.Point(4, 461);
+            label14.Location = new System.Drawing.Point(4, 497);
             label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label14.Name = "label14";
             label14.Size = new System.Drawing.Size(84, 20);
@@ -418,9 +412,41 @@
             label15.TabIndex = 14;
             label15.Text = "실 구매 수량";
             // 
+            // label16
+            // 
+            label16.AutoSize = true;
+            label16.Location = new System.Drawing.Point(10, 218);
+            label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label16.Name = "label16";
+            label16.Size = new System.Drawing.Size(99, 20);
+            label16.TabIndex = 44;
+            label16.Text = "구매승인자명";
+            // 
+            // label17
+            // 
+            label17.AutoSize = true;
+            label17.Location = new System.Drawing.Point(10, 185);
+            label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label17.Name = "label17";
+            label17.Size = new System.Drawing.Size(99, 20);
+            label17.TabIndex = 42;
+            label17.Text = "구매담당자명";
+            // 
+            // label9
+            // 
+            label9.AutoSize = true;
+            label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            label9.ForeColor = System.Drawing.Color.Blue;
+            label9.Location = new System.Drawing.Point(371, 200);
+            label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label9.Name = "label9";
+            label9.Size = new System.Drawing.Size(99, 30);
+            label9.TabIndex = 20;
+            label9.Text = "해외물품은\r\n좌측 단가를 입력";
+            // 
             // tbSC
             // 
-            this.tbSC.Location = new System.Drawing.Point(104, 191);
+            this.tbSC.Location = new System.Drawing.Point(112, 430);
             this.tbSC.Margin = new System.Windows.Forms.Padding(4);
             this.tbSC.Name = "tbSC";
             this.tbSC.Size = new System.Drawing.Size(286, 27);
@@ -451,7 +477,6 @@
             // 
             // tbPumModel
             // 
-            this.tbPumModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbPumModel.ImeMode = System.Windows.Forms.ImeMode.Alpha;
             this.tbPumModel.Location = new System.Drawing.Point(93, 109);
             this.tbPumModel.Margin = new System.Windows.Forms.Padding(4);
@@ -549,7 +574,7 @@
             // 
             // tbPO
             // 
-            this.tbPO.Location = new System.Drawing.Point(104, 223);
+            this.tbPO.Location = new System.Drawing.Point(112, 462);
             this.tbPO.Margin = new System.Windows.Forms.Padding(4);
             this.tbPO.Name = "tbPO";
             this.tbPO.Size = new System.Drawing.Size(286, 27);
@@ -557,8 +582,9 @@
             // 
             // tbBigo
             // 
+            this.tbBigo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbBigo.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbBigo.Location = new System.Drawing.Point(93, 364);
+            this.tbBigo.Location = new System.Drawing.Point(93, 400);
             this.tbBigo.Margin = new System.Windows.Forms.Padding(4);
             this.tbBigo.MaxLength = 500;
             this.tbBigo.Multiline = true;
@@ -618,7 +644,7 @@
             this.cmbReceive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbReceive.FormattingEnabled = true;
             this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.cmbReceive.Location = new System.Drawing.Point(104, 93);
+            this.cmbReceive.Location = new System.Drawing.Point(112, 332);
             this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
             this.cmbReceive.Name = "cmbReceive";
             this.cmbReceive.Size = new System.Drawing.Size(286, 28);
@@ -638,7 +664,7 @@
             // 
             // dtInDate
             // 
-            this.dtInDate.Location = new System.Drawing.Point(104, 58);
+            this.dtInDate.Location = new System.Drawing.Point(112, 297);
             this.dtInDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtInDate.Name = "dtInDate";
             this.dtInDate.Size = new System.Drawing.Size(286, 27);
@@ -648,7 +674,7 @@
             // chkInDate
             // 
             this.chkInDate.AutoSize = true;
-            this.chkInDate.Location = new System.Drawing.Point(24, 60);
+            this.chkInDate.Location = new System.Drawing.Point(32, 299);
             this.chkInDate.Margin = new System.Windows.Forms.Padding(4);
             this.chkInDate.Name = "chkInDate";
             this.chkInDate.Size = new System.Drawing.Size(73, 24);
@@ -660,7 +686,7 @@
             // 
             // dtExpDate
             // 
-            this.dtExpDate.Location = new System.Drawing.Point(104, 26);
+            this.dtExpDate.Location = new System.Drawing.Point(112, 265);
             this.dtExpDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtExpDate.Name = "dtExpDate";
             this.dtExpDate.Size = new System.Drawing.Size(286, 27);
@@ -670,7 +696,7 @@
             // chkExp
             // 
             this.chkExp.AutoSize = true;
-            this.chkExp.Location = new System.Drawing.Point(24, 30);
+            this.chkExp.Location = new System.Drawing.Point(32, 269);
             this.chkExp.Margin = new System.Windows.Forms.Padding(4);
             this.chkExp.Name = "chkExp";
             this.chkExp.Size = new System.Drawing.Size(73, 24);
@@ -693,6 +719,9 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(label18);
+            this.groupBox1.Controls.Add(this.cmbRemark);
+            this.groupBox1.Controls.Add(this.cmbCurrency);
             this.groupBox1.Controls.Add(this.tbQtyReal);
             this.groupBox1.Controls.Add(label15);
             this.groupBox1.Controls.Add(this.tbBigoChk);
@@ -743,6 +772,18 @@
             this.groupBox1.Text = "필수입력";
             this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
             // 
+            // cmbCurrency
+            // 
+            this.cmbCurrency.FormattingEnabled = true;
+            this.cmbCurrency.Items.AddRange(new object[] {
+            "USD"});
+            this.cmbCurrency.Location = new System.Drawing.Point(274, 202);
+            this.cmbCurrency.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbCurrency.Name = "cmbCurrency";
+            this.cmbCurrency.Size = new System.Drawing.Size(89, 28);
+            this.cmbCurrency.TabIndex = 50;
+            this.cmbCurrency.Text = "USD";
+            // 
             // tbQtyReal
             // 
             this.tbQtyReal.Location = new System.Drawing.Point(339, 140);
@@ -756,7 +797,7 @@
             // tbBigoChk
             // 
             this.tbBigoChk.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbBigoChk.Location = new System.Drawing.Point(93, 457);
+            this.tbBigoChk.Location = new System.Drawing.Point(93, 493);
             this.tbBigoChk.Margin = new System.Windows.Forms.Padding(4);
             this.tbBigoChk.MaxLength = 500;
             this.tbBigoChk.Multiline = true;
@@ -770,7 +811,7 @@
             // 
             this.chk2.AutoSize = true;
             this.chk2.Enabled = false;
-            this.chk2.Location = new System.Drawing.Point(201, 552);
+            this.chk2.Location = new System.Drawing.Point(201, 588);
             this.chk2.Name = "chk2";
             this.chk2.Size = new System.Drawing.Size(133, 24);
             this.chk2.TabIndex = 39;
@@ -781,7 +822,7 @@
             // 
             this.chk1.AutoSize = true;
             this.chk1.Enabled = false;
-            this.chk1.Location = new System.Drawing.Point(94, 552);
+            this.chk1.Location = new System.Drawing.Point(94, 588);
             this.chk1.Name = "chk1";
             this.chk1.Size = new System.Drawing.Size(103, 24);
             this.chk1.TabIndex = 38;
@@ -801,7 +842,6 @@
             // 
             // tbStorage
             // 
-            this.tbStorage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.tbStorage.Location = new System.Drawing.Point(370, 234);
             this.tbStorage.Margin = new System.Windows.Forms.Padding(4);
             this.tbStorage.Name = "tbStorage";
@@ -846,48 +886,48 @@
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(80, 27);
             this.button1.TabIndex = 6;
-            this.button1.Text = "품명";
+            this.button1.Text = "통합검색";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click_1);
             // 
             // groupBox2
             // 
             this.groupBox2.BackColor = System.Drawing.Color.Gainsboro;
+            this.groupBox2.Controls.Add(this.tbCostCenter);
+            this.groupBox2.Controls.Add(this.tbLineCode);
+            this.groupBox2.Controls.Add(this.tbManager);
             this.groupBox2.Controls.Add(this.tbAdmin);
             this.groupBox2.Controls.Add(label16);
-            this.groupBox2.Controls.Add(this.tbManager);
             this.groupBox2.Controls.Add(label17);
             this.groupBox2.Controls.Add(this.btEQModel);
-            this.groupBox2.Controls.Add(this.btEQManu);
-            this.groupBox2.Controls.Add(this.btManuProc);
-            this.groupBox2.Controls.Add(this.btProcess);
-            this.groupBox2.Controls.Add(this.tbLineCode);
-            this.groupBox2.Controls.Add(label12);
-            this.groupBox2.Controls.Add(this.tbCostCenter);
-            this.groupBox2.Controls.Add(label13);
-            this.groupBox2.Controls.Add(this.tbInQty);
-            this.groupBox2.Controls.Add(label11);
-            this.groupBox2.Controls.Add(this.button7);
-            this.groupBox2.Controls.Add(this.button6);
-            this.groupBox2.Controls.Add(this.button5);
-            this.groupBox2.Controls.Add(this.button4);
-            this.groupBox2.Controls.Add(this.tbOrderNo);
-            this.groupBox2.Controls.Add(label5);
-            this.groupBox2.Controls.Add(label4);
-            this.groupBox2.Controls.Add(this.chkExp);
-            this.groupBox2.Controls.Add(label2);
-            this.groupBox2.Controls.Add(this.chkInDate);
             this.groupBox2.Controls.Add(this.dtExpDate);
-            this.groupBox2.Controls.Add(this.dtInDate);
-            this.groupBox2.Controls.Add(this.pictureBox1);
-            this.groupBox2.Controls.Add(this.tbPO);
-            this.groupBox2.Controls.Add(poLabel);
-            this.groupBox2.Controls.Add(this.tbSC);
-            this.groupBox2.Controls.Add(scLabel);
-            this.groupBox2.Controls.Add(receiveLabel);
-            this.groupBox2.Controls.Add(assetLabel);
-            this.groupBox2.Controls.Add(this.cmbReceive);
             this.groupBox2.Controls.Add(processLabel);
+            this.groupBox2.Controls.Add(this.btEQManu);
+            this.groupBox2.Controls.Add(this.btProcess);
+            this.groupBox2.Controls.Add(this.btManuProc);
+            this.groupBox2.Controls.Add(this.cmbReceive);
+            this.groupBox2.Controls.Add(receiveLabel);
+            this.groupBox2.Controls.Add(label12);
+            this.groupBox2.Controls.Add(scLabel);
+            this.groupBox2.Controls.Add(this.tbSC);
+            this.groupBox2.Controls.Add(label13);
+            this.groupBox2.Controls.Add(poLabel);
+            this.groupBox2.Controls.Add(this.button7);
+            this.groupBox2.Controls.Add(this.tbInQty);
+            this.groupBox2.Controls.Add(this.button6);
+            this.groupBox2.Controls.Add(this.tbPO);
+            this.groupBox2.Controls.Add(this.button5);
+            this.groupBox2.Controls.Add(label11);
+            this.groupBox2.Controls.Add(this.button4);
+            this.groupBox2.Controls.Add(this.dtInDate);
+            this.groupBox2.Controls.Add(this.tbOrderNo);
+            this.groupBox2.Controls.Add(this.chkInDate);
+            this.groupBox2.Controls.Add(label5);
+            this.groupBox2.Controls.Add(this.chkExp);
+            this.groupBox2.Controls.Add(label4);
+            this.groupBox2.Controls.Add(label2);
+            this.groupBox2.Controls.Add(this.pictureBox1);
+            this.groupBox2.Controls.Add(assetLabel);
             this.groupBox2.Location = new System.Drawing.Point(512, 7);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox2.Name = "groupBox2";
@@ -897,9 +937,52 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "추가정보";
             // 
+            // tbCostCenter
+            // 
+            this.tbCostCenter.FormattingEnabled = true;
+            this.tbCostCenter.ImeMode = System.Windows.Forms.ImeMode.Alpha;
+            this.tbCostCenter.Location = new System.Drawing.Point(112, 120);
+            this.tbCostCenter.Margin = new System.Windows.Forms.Padding(4);
+            this.tbCostCenter.Name = "tbCostCenter";
+            this.tbCostCenter.Size = new System.Drawing.Size(286, 28);
+            this.tbCostCenter.TabIndex = 49;
+            this.tbCostCenter.Text = "68";
+            // 
+            // tbLineCode
+            // 
+            this.tbLineCode.FormattingEnabled = true;
+            this.tbLineCode.Location = new System.Drawing.Point(112, 151);
+            this.tbLineCode.Margin = new System.Windows.Forms.Padding(4);
+            this.tbLineCode.Name = "tbLineCode";
+            this.tbLineCode.Size = new System.Drawing.Size(286, 28);
+            this.tbLineCode.TabIndex = 48;
+            this.tbLineCode.Text = "67";
+            // 
+            // tbManager
+            // 
+            this.tbManager.FormattingEnabled = true;
+            this.tbManager.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbManager.Location = new System.Drawing.Point(112, 182);
+            this.tbManager.Margin = new System.Windows.Forms.Padding(4);
+            this.tbManager.Name = "tbManager";
+            this.tbManager.Size = new System.Drawing.Size(286, 28);
+            this.tbManager.TabIndex = 47;
+            this.tbManager.Text = "65";
+            // 
+            // tbAdmin
+            // 
+            this.tbAdmin.FormattingEnabled = true;
+            this.tbAdmin.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbAdmin.Location = new System.Drawing.Point(112, 214);
+            this.tbAdmin.Margin = new System.Windows.Forms.Padding(4);
+            this.tbAdmin.Name = "tbAdmin";
+            this.tbAdmin.Size = new System.Drawing.Size(286, 28);
+            this.tbAdmin.TabIndex = 46;
+            this.tbAdmin.Text = "66";
+            // 
             // btEQModel
             // 
-            this.btEQModel.Location = new System.Drawing.Point(104, 353);
+            this.btEQModel.Location = new System.Drawing.Point(112, 90);
             this.btEQModel.Name = "btEQModel";
             this.btEQModel.Size = new System.Drawing.Size(286, 28);
             this.btEQModel.TabIndex = 21;
@@ -910,7 +993,7 @@
             // 
             // btEQManu
             // 
-            this.btEQManu.Location = new System.Drawing.Point(104, 319);
+            this.btEQManu.Location = new System.Drawing.Point(112, 56);
             this.btEQManu.Name = "btEQManu";
             this.btEQManu.Size = new System.Drawing.Size(286, 28);
             this.btEQManu.TabIndex = 19;
@@ -919,20 +1002,9 @@
             this.btEQManu.UseVisualStyleBackColor = true;
             this.btEQManu.Click += new System.EventHandler(this.btProcess_Click);
             // 
-            // btManuProc
-            // 
-            this.btManuProc.Location = new System.Drawing.Point(104, 286);
-            this.btManuProc.Name = "btManuProc";
-            this.btManuProc.Size = new System.Drawing.Size(286, 28);
-            this.btManuProc.TabIndex = 17;
-            this.btManuProc.Tag = "08";
-            this.btManuProc.Text = "공용코드 08";
-            this.btManuProc.UseVisualStyleBackColor = true;
-            this.btManuProc.Click += new System.EventHandler(this.btProcess_Click);
-            // 
             // btProcess
             // 
-            this.btProcess.Location = new System.Drawing.Point(104, 158);
+            this.btProcess.Location = new System.Drawing.Point(112, 397);
             this.btProcess.Name = "btProcess";
             this.btProcess.Size = new System.Drawing.Size(286, 28);
             this.btProcess.TabIndex = 9;
@@ -942,30 +1014,16 @@
             this.btProcess.UseVisualStyleBackColor = true;
             this.btProcess.Click += new System.EventHandler(this.btProcess_Click);
             // 
-            // tbLineCode
+            // btManuProc
             // 
-            this.tbLineCode.Location = new System.Drawing.Point(104, 418);
+            this.btManuProc.Location = new System.Drawing.Point(112, 23);
-            this.tbLineCode.Margin = new System.Windows.Forms.Padding(4);
+            this.btManuProc.Name = "btManuProc";
-            this.tbLineCode.Name = "tbLineCode";
+            this.btManuProc.Size = new System.Drawing.Size(286, 28);
-            this.tbLineCode.Size = new System.Drawing.Size(286, 27);
+            this.btManuProc.TabIndex = 17;
-            this.tbLineCode.TabIndex = 25;
+            this.btManuProc.Tag = "08";
-            // 
+            this.btManuProc.Text = "공용코드 08";
-            // tbCostCenter
+            this.btManuProc.UseVisualStyleBackColor = true;
-            // 
+            this.btManuProc.Click += new System.EventHandler(this.btProcess_Click);
-            this.tbCostCenter.Location = new System.Drawing.Point(104, 386);
-            this.tbCostCenter.Margin = new System.Windows.Forms.Padding(4);
-            this.tbCostCenter.Name = "tbCostCenter";
-            this.tbCostCenter.Size = new System.Drawing.Size(286, 27);
-            this.tbCostCenter.TabIndex = 23;
-            // 
-            // tbInQty
-            // 
-            this.tbInQty.Location = new System.Drawing.Point(104, 126);
-            this.tbInQty.Margin = new System.Windows.Forms.Padding(4);
-            this.tbInQty.Name = "tbInQty";
-            this.tbInQty.Size = new System.Drawing.Size(286, 27);
-            this.tbInQty.TabIndex = 7;
-            this.tbInQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // button7
             // 
@@ -977,6 +1035,15 @@
             this.button7.UseVisualStyleBackColor = true;
             this.button7.Click += new System.EventHandler(this.button7_Click);
             // 
+            // tbInQty
+            // 
+            this.tbInQty.Location = new System.Drawing.Point(112, 365);
+            this.tbInQty.Margin = new System.Windows.Forms.Padding(4);
+            this.tbInQty.Name = "tbInQty";
+            this.tbInQty.Size = new System.Drawing.Size(286, 27);
+            this.tbInQty.TabIndex = 7;
+            this.tbInQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // button6
             // 
             this.button6.Location = new System.Drawing.Point(4, 583);
@@ -1010,11 +1077,13 @@
             // 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, 255);
+            this.tbOrderNo.ForeColor = System.Drawing.Color.Red;
+            this.tbOrderNo.Location = new System.Drawing.Point(138, -9);
             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 = 15;
+            this.tbOrderNo.Visible = false;
             // 
             // pictureBox1
             // 
@@ -1027,6 +1096,21 @@
             this.pictureBox1.TabStop = false;
             this.pictureBox1.Tag = "A";
             // 
+            // timer1
+            // 
+            this.timer1.Interval = 250;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // cmbRemark
+            // 
+            this.cmbRemark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbRemark.FormattingEnabled = true;
+            this.cmbRemark.Location = new System.Drawing.Point(94, 368);
+            this.cmbRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbRemark.Name = "cmbRemark";
+            this.cmbRemark.Size = new System.Drawing.Size(380, 28);
+            this.cmbRemark.TabIndex = 50;
+            // 
             // dsPurchase
             // 
             this.dsPurchase.DataSetName = "dsPurchase";
@@ -1041,52 +1125,21 @@
             // 
             this.purchaseTableAdapter.ClearBeforeFill = true;
             // 
-            // timer1
+            // label18
             // 
-            this.timer1.Interval = 250;
+            label18.AutoSize = true;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            label18.Location = new System.Drawing.Point(277, 177);
-            // 
+            label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            // tbAdmin
+            label18.Name = "label18";
-            // 
+            label18.Size = new System.Drawing.Size(20, 20);
-            this.tbAdmin.Location = new System.Drawing.Point(104, 479);
+            label18.TabIndex = 51;
-            this.tbAdmin.Margin = new System.Windows.Forms.Padding(4);
+            label18.Text = "\\";
-            this.tbAdmin.Name = "tbAdmin";
-            this.tbAdmin.Size = new System.Drawing.Size(286, 27);
-            this.tbAdmin.TabIndex = 45;
-            // 
-            // label16
-            // 
-            label16.AutoSize = true;
-            label16.Location = new System.Drawing.Point(2, 482);
-            label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label16.Name = "label16";
-            label16.Size = new System.Drawing.Size(99, 20);
-            label16.TabIndex = 44;
-            label16.Text = "구매승인자명";
-            // 
-            // tbManager
-            // 
-            this.tbManager.Location = new System.Drawing.Point(104, 450);
-            this.tbManager.Margin = new System.Windows.Forms.Padding(4);
-            this.tbManager.Name = "tbManager";
-            this.tbManager.Size = new System.Drawing.Size(286, 27);
-            this.tbManager.TabIndex = 43;
-            // 
-            // label17
-            // 
-            label17.AutoSize = true;
-            label17.Location = new System.Drawing.Point(2, 454);
-            label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label17.Name = "label17";
-            label17.Size = new System.Drawing.Size(99, 20);
-            label17.TabIndex = 42;
-            label17.Text = "구매담당자명";
             // 
             // fPurchase_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(928, 821);
+            this.ClientSize = new System.Drawing.Size(929, 821);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.btSaveAdd);
@@ -1161,15 +1214,17 @@
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.CheckBox chk2;
         private System.Windows.Forms.CheckBox chk1;
-        private System.Windows.Forms.TextBox tbLineCode;
-        private System.Windows.Forms.TextBox tbCostCenter;
         private System.Windows.Forms.Button btProcess;
         private System.Windows.Forms.Button btManuProc;
         private System.Windows.Forms.Button btEQManu;
         private System.Windows.Forms.Button btEQModel;
         private System.Windows.Forms.TextBox tbBigoChk;
         private System.Windows.Forms.TextBox tbQtyReal;
-        private System.Windows.Forms.TextBox tbAdmin;
+        private System.Windows.Forms.ComboBox tbAdmin;
-        private System.Windows.Forms.TextBox tbManager;
+        private System.Windows.Forms.ComboBox tbCostCenter;
+        private System.Windows.Forms.ComboBox tbLineCode;
+        private System.Windows.Forms.ComboBox tbManager;
+        private System.Windows.Forms.ComboBox cmbCurrency;
+        private System.Windows.Forms.ComboBox cmbRemark;
     }
 }

SubProject/FEQ0000/Purchase/fPurchase_Add.cs

@@ -53,8 +53,6 @@ namespace FEQ0000
             }
         }
 
-
-
         Boolean advInput = false;
         private void __Load(object sender, EventArgs e)
         {
@@ -67,6 +65,55 @@ namespace FEQ0000
             this.cmbState.ValueMember = "Value";
             this.cmbState.DataSource = stateList;
 
+            //costcenter
+            var LstCost = FCOMMON.DBM.getCodeTable("68");
+            this.tbCostCenter.DisplayMember = "Value";
+            this.tbCostCenter.ValueMember = "Value";
+            this.tbCostCenter.DataSource = LstCost;
+
+            //line
+            var LstLine = FCOMMON.DBM.getCodeTable("67");
+            this.tbLineCode.DisplayMember = "Value";
+            this.tbLineCode.ValueMember = "Value";
+            this.tbLineCode.DataSource = LstLine;
+
+            //구매-담당
+            var LstMan = FCOMMON.DBM.getCodeTable("65");
+            this.tbManager.DisplayMember = "Value";
+            this.tbManager.ValueMember = "Value";
+            this.tbManager.DataSource = LstMan;
+
+            //구매-승인
+            var LstAdm = FCOMMON.DBM.getCodeTable("66");
+            this.tbAdmin.DisplayMember = "Value";
+            this.tbAdmin.ValueMember = "Value";
+            this.tbAdmin.DataSource = LstAdm;
+
+            //통화
+            var LstCur = FCOMMON.DBM.getCodeTable("69");
+            this.cmbCurrency.DisplayMember = "Value";
+            this.cmbCurrency.ValueMember = "Value";
+            this.cmbCurrency.DataSource = LstCur;
+
+
+            //구매자비고
+            var LstRemark = FCOMMON.DBM.getCodeList("70");
+            this.cmbRemark.Items.Clear();
+            this.cmbRemark.Items.Add("-- 선택 안함 --");
+            foreach (var item in LstRemark)
+            {
+                cmbRemark.Items.Add(item.Value);
+            }
+            this.cmbRemark.SelectedIndexChanged += (s1, e1) =>
+            {
+                if (cmbRemark.SelectedIndex > 0)
+                {
+                    tbBigo.Text = cmbRemark.Text.Trim() + tbBigo.Text.Trim();
+                }
+            };
+            cmbRemark.SelectedIndex = 0;
+
+
             //담당자목록
             var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10");
             foreach (var user in userList)
@@ -156,8 +203,7 @@ namespace FEQ0000
             }
             else btEQModel.Text = dr.asset;  //제조모델명
 
-
+            cmbCurrency.Text = dr.currency;
-
             tbPumName.Text = dr.pumname;
             tbPumName.Tag = tbPumName.Text;
 
@@ -373,7 +419,8 @@ namespace FEQ0000
                     this.tbSID.Tag = f.SID;
                     this.tbPumUnit.Text = f.itemUnit; //181214
                     this.tbStorage.Text = f.Storage;
-                    this.tbPumModel.Enabled = false;
+                    this.tbPumModel.Enabled = this.tbPumModel.Text.isEmpty();
+                    
                     this.tbPumUnit.Enabled = false;
                     if (tbSID.Text != "") tbSID.Enabled = false;
                     else tbSID.Enabled = true;
@@ -400,7 +447,8 @@ namespace FEQ0000
                     if (oimage != null) oimage.Dispose();
                 }
             }
-            this.tbQtyReq.Focus();
+            if (tbPumModel.Enabled) tbPumModel.Focus();
+            else this.tbQtyReq.Focus();
         }
         void Lov_Project(string search, Boolean allowAll)
         {
@@ -513,12 +561,12 @@ namespace FEQ0000
                 return false;
             }
 
-            if (tbPumModel.Text == "")
+            //if (tbPumModel.Text == "")
-            {
+            //{
-                FCOMMON.Util.MsgE("제품 규격을 입력하세요.");
+            //    FCOMMON.Util.MsgE("제품 규격을 입력하세요.");
-                tbPumModel.Focus();
+            //    tbPumModel.Focus();
-                return false;
+            //    return false;
-            }
+            //}
 
             if (tbQtyReq.Text == "")
             {
@@ -567,15 +615,14 @@ namespace FEQ0000
                         return false;
                     }
                 }
-
             }
+
             if (tbStorage.Text.Equals("SPR"))
             {
                 if (FCOMMON.Util.MsgQ("SPR 항목입니다. 저장할까요?") != DialogResult.Yes)
                     return false;
             }
 
-
             if (chkInDate.Checked)
             {
                 if (int.TryParse(tbInQty.Text.Replace(",", ""), out int qty) == false)
@@ -590,7 +637,7 @@ namespace FEQ0000
             }
 
             var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00");
-            if (overtime.TotalSeconds > 0)
+            if (overtime.TotalSeconds > 0 && FCOMMON.info.Login.gcode != "K4PM")
             {
                 if (advInput == true && this.btProcess.Text.Trim() == "")
                 {
@@ -655,16 +702,14 @@ namespace FEQ0000
                     }
                 }
 
-                //if (bsModel.Count > 0 && this.cbEQModel.SelectedIndex == -1)
+            }
-                //{
-                //    FCOMMON.Util.MsgE("장비 모델을 선택하세요.\n\n" +
-                //        "선택 대상이 없는 경우 문의 바랍니다.\n\n" +
-                //        "BongSeok Jung(T.7191)\n" +
-                //        "BongSeok.Jung@amkor.co.kr");
-                //    cbEQModel.Focus();
-                //    return false;
-                //}
 
+            //프로젝트명이 업다면 사유가 반드시 입력되어ㅑㅇ 하낟.
+            if (tbProject.Text.isEmpty() && tbBigo.Text.isEmpty())
+            {
+                Util.MsgE("구매자 비고(=구매사유)를 입력하세요\n프로젝트가 없다면 사유가 입력되어야 합니다");
+                tbBigo.Focus();
+                return false;
             }
 
             //if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Added)
@@ -720,7 +765,7 @@ namespace FEQ0000
             //요청 구매 수량이 다를경우 비고 입력이 필요함
             if (vqtyreal > 0 && vqtyreq > 0 && vqtyreq != vqtyreal)
             {
-                if(tbBigoChk.Text.isEmpty())
+                if (tbBigoChk.Text.isEmpty())
                 {
                     Util.MsgE("구매 요청/실 수량이 서로 다릅니다\n구매자 비고에 해당 사유를 입력하세요");
                     tbBigoChk.Focus();
@@ -731,7 +776,7 @@ namespace FEQ0000
             dr.pumqty = vqtyreal;// int.Parse(tbPumQty.Text);
             dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text);
             dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text);
-
+            dr.currency = cmbCurrency.Text.Trim();
 
             if (decimal.TryParse(tbPumPriceD.Text, out decimal priced))
             {
@@ -776,7 +821,7 @@ namespace FEQ0000
             dr.costcenter = tbCostCenter.Text;
             dr.linecode = tbLineCode.Text;
 
-            dr.purchase_manager= tbManager.Text;
+            dr.purchase_manager = tbManager.Text;
             dr.purchase_admin = tbAdmin.Text;
 
             if (tbSupplyIndex.Text == "") dr.SetsupplyidxNull();

SubProject/FEQ0000/Purchase/fPurchase_Add.resx

@@ -193,9 +193,6 @@
   <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
@@ -221,6 +218,15 @@
   <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="label16.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label17.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <data name="tbBigo.ToolTip" xml:space="preserve">
     <value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
 * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)
@@ -228,6 +234,9 @@
 * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등)
 * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등)</value>
   </data>
+  <metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <data name="tbBigoChk.ToolTip" xml:space="preserve">
     <value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
 * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)
@@ -235,11 +244,8 @@
 * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등)
 * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등)</value>
   </data>
-  <metadata name="label16.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>False</value>
+    <value>587, 17</value>
-  </metadata>
-  <metadata name="label17.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
   </metadata>
   <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
@@ -250,9 +256,6 @@
   <metadata name="purchaseTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>313, 17</value>
   </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>587, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>58</value>
   </metadata>

SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs

@@ -134,6 +134,10 @@
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
             this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
+            this.tbManager = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
+            this.tbAdmin = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@@ -147,10 +151,6 @@
             this.label1 = new System.Windows.Forms.Label();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
             this.label2 = new System.Windows.Forms.Label();
-            this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
-            this.tbManager = new System.Windows.Forms.ToolStripTextBox();
-            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
-            this.tbAdmin = new System.Windows.Forms.ToolStripTextBox();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -263,6 +263,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -301,8 +302,8 @@
             this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image")));
             this.btAdd.Name = "btAdd";
             this.btAdd.RightToLeftAutoMirrorImage = true;
-            this.btAdd.Size = new System.Drawing.Size(67, 23);
+            this.btAdd.Size = new System.Drawing.Size(91, 23);
-            this.btAdd.Text = "추가(&A)";
+            this.btAdd.Text = "구매입력(&A)";
             this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
             // 
             // btCopy
@@ -380,6 +381,7 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 26);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -677,6 +679,7 @@
             // dtSD
             // 
             this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtSD.Name = "dtSD";
             this.dtSD.Size = new System.Drawing.Size(75, 37);
             this.dtSD.Text = "1982-11-23";
@@ -693,6 +696,7 @@
             // dtED
             // 
             this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtED.Name = "dtED";
             this.dtED.Size = new System.Drawing.Size(75, 37);
             this.dtED.Text = "1982-11-23";
@@ -749,11 +753,40 @@
             // tbRequest
             // 
             this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbRequest.Name = "tbRequest";
             this.tbRequest.Size = new System.Drawing.Size(70, 37);
             this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown);
             // 
+            // toolStripLabel6
+            // 
+            this.toolStripLabel6.Name = "toolStripLabel6";
+            this.toolStripLabel6.Size = new System.Drawing.Size(55, 34);
+            this.toolStripLabel6.Text = "구매담당";
+            // 
+            // tbManager
+            // 
+            this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbManager.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.tbManager.Name = "tbManager";
+            this.tbManager.Size = new System.Drawing.Size(70, 37);
+            this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // toolStripLabel7
+            // 
+            this.toolStripLabel7.Name = "toolStripLabel7";
+            this.toolStripLabel7.Size = new System.Drawing.Size(55, 34);
+            this.toolStripLabel7.Text = "구매승인";
+            // 
+            // tbAdmin
+            // 
+            this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbAdmin.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.tbAdmin.Name = "tbAdmin";
+            this.tbAdmin.Size = new System.Drawing.Size(70, 37);
+            this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
@@ -862,7 +895,6 @@
             this.fpSpread1.Size = new System.Drawing.Size(1226, 569);
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 7;
-            this.fpSpread1.SetViewportLeftColumn(0, 0, 7);
             // 
             // label2
             // 
@@ -876,32 +908,6 @@
             this.label2.Text = "--";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // toolStripLabel6
-            // 
-            this.toolStripLabel6.Name = "toolStripLabel6";
-            this.toolStripLabel6.Size = new System.Drawing.Size(55, 34);
-            this.toolStripLabel6.Text = "구매담당";
-            // 
-            // tbManager
-            // 
-            this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbManager.Name = "tbManager";
-            this.tbManager.Size = new System.Drawing.Size(70, 37);
-            this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // toolStripLabel7
-            // 
-            this.toolStripLabel7.Name = "toolStripLabel7";
-            this.toolStripLabel7.Size = new System.Drawing.Size(55, 34);
-            this.toolStripLabel7.Text = "구매승인";
-            // 
-            // tbAdmin
-            // 
-            this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbAdmin.Name = "tbAdmin";
-            this.tbAdmin.Size = new System.Drawing.Size(70, 37);
-            this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
             // fpSpread1_Sheet1
             // 
             this.fpSpread1_Sheet1.Reset();
@@ -918,7 +924,7 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "구매검사";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "등록일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "구매신청일";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "상태";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;

SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx

@@ -136,7 +136,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -147,7 +147,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -156,7 +156,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -165,7 +165,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -176,7 +176,7 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -211,7 +211,7 @@
   <data name="btDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs

@@ -90,8 +90,10 @@
             this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.tbAdmin = new System.Windows.Forms.TextBox();
             this.button7 = new System.Windows.Forms.Button();
             this.tbInRemar = new System.Windows.Forms.TextBox();
+            this.tbManager = new System.Windows.Forms.TextBox();
             this.tbInQty = new System.Windows.Forms.TextBox();
             this.tbOrderNo = new System.Windows.Forms.TextBox();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
@@ -102,8 +104,6 @@
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
-            this.tbAdmin = new System.Windows.Forms.TextBox();
-            this.tbManager = new System.Windows.Forms.TextBox();
             receiveLabel = new System.Windows.Forms.Label();
             scLabel = new System.Windows.Forms.Label();
             sidLabel = new System.Windows.Forms.Label();
@@ -359,6 +359,26 @@
             label13.TabIndex = 14;
             label13.Text = "실 구매수량";
             // 
+            // label14
+            // 
+            label14.AutoSize = true;
+            label14.Location = new System.Drawing.Point(2, 367);
+            label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label14.Name = "label14";
+            label14.Size = new System.Drawing.Size(99, 20);
+            label14.TabIndex = 40;
+            label14.Text = "구매승인자명";
+            // 
+            // label15
+            // 
+            label15.AutoSize = true;
+            label15.Location = new System.Drawing.Point(2, 339);
+            label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label15.Name = "label15";
+            label15.Size = new System.Drawing.Size(99, 20);
+            label15.TabIndex = 38;
+            label15.Text = "구매담당자명";
+            // 
             // tbSC
             // 
             this.tbSC.Location = new System.Drawing.Point(104, 61);
@@ -391,7 +411,6 @@
             // 
             // tbPumModel
             // 
-            this.tbPumModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbPumModel.ImeMode = System.Windows.Forms.ImeMode.Alpha;
             this.tbPumModel.Location = new System.Drawing.Point(93, 117);
             this.tbPumModel.Margin = new System.Windows.Forms.Padding(4);
@@ -803,6 +822,14 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "추가정보";
             // 
+            // tbAdmin
+            // 
+            this.tbAdmin.Location = new System.Drawing.Point(104, 364);
+            this.tbAdmin.Margin = new System.Windows.Forms.Padding(4);
+            this.tbAdmin.Name = "tbAdmin";
+            this.tbAdmin.Size = new System.Drawing.Size(286, 27);
+            this.tbAdmin.TabIndex = 41;
+            // 
             // button7
             // 
             this.button7.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -824,6 +851,14 @@
             this.tbInRemar.TabIndex = 15;
             this.tbInRemar.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
             // 
+            // tbManager
+            // 
+            this.tbManager.Location = new System.Drawing.Point(104, 335);
+            this.tbManager.Margin = new System.Windows.Forms.Padding(4);
+            this.tbManager.Name = "tbManager";
+            this.tbManager.Size = new System.Drawing.Size(286, 27);
+            this.tbManager.TabIndex = 39;
+            // 
             // tbInQty
             // 
             this.tbInQty.Location = new System.Drawing.Point(104, 226);
@@ -895,42 +930,6 @@
             // 
             this.purchaseTableAdapter.ClearBeforeFill = true;
             // 
-            // tbAdmin
-            // 
-            this.tbAdmin.Location = new System.Drawing.Point(104, 364);
-            this.tbAdmin.Margin = new System.Windows.Forms.Padding(4);
-            this.tbAdmin.Name = "tbAdmin";
-            this.tbAdmin.Size = new System.Drawing.Size(286, 27);
-            this.tbAdmin.TabIndex = 41;
-            // 
-            // label14
-            // 
-            label14.AutoSize = true;
-            label14.Location = new System.Drawing.Point(2, 367);
-            label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label14.Name = "label14";
-            label14.Size = new System.Drawing.Size(99, 20);
-            label14.TabIndex = 40;
-            label14.Text = "구매승인자명";
-            // 
-            // tbManager
-            // 
-            this.tbManager.Location = new System.Drawing.Point(104, 335);
-            this.tbManager.Margin = new System.Windows.Forms.Padding(4);
-            this.tbManager.Name = "tbManager";
-            this.tbManager.Size = new System.Drawing.Size(286, 27);
-            this.tbManager.TabIndex = 39;
-            // 
-            // label15
-            // 
-            label15.AutoSize = true;
-            label15.Location = new System.Drawing.Point(2, 339);
-            label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label15.Name = "label15";
-            label15.Size = new System.Drawing.Size(99, 20);
-            label15.TabIndex = 38;
-            label15.Text = "구매담당자명";
-            // 
             // fPurchaseCR_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs

@@ -555,12 +555,12 @@ namespace FEQ0000
                 return false;
             }
 
-            if (tbPumModel.Text == "")
+            //if (tbPumModel.Text == "")
-            {
+            //{
-                FCOMMON.Util.MsgE("제품 규격을 입력하세요.");
+            //    FCOMMON.Util.MsgE("제품 규격을 입력하세요.");
-                tbPumModel.Focus();
+            //    tbPumModel.Focus();
-                return false;
+            //    return false;
-            }
+            //}
             if (tbQtyReq.Text == "")
             {
                 FCOMMON.Util.MsgE("수량(요청)을 입력하세요.");

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx

@@ -200,6 +200,12 @@
   <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <data name="tbBigo.ToolTip" xml:space="preserve">
     <value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
 * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)
@@ -207,12 +213,6 @@
 * 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등)
 * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등)</value>
   </data>
-  <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <data name="tbBigoChk.ToolTip" xml:space="preserve">
     <value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
 * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)
@@ -232,12 +232,6 @@
   <metadata name="purchaseTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>313, 17</value>
   </metadata>
-  <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>58</value>
   </metadata>

SubProject/FEQ0000/dsPurchase.cs

@@ -6,3 +6,10 @@
     {
     }
 }
+
+namespace FEQ0000.dsPurchaseTableAdapters {
+    
+    
+    public partial class EETGW_PurchaseCRTableAdapter {
+    }
+}

SubProject/FEQ0000/dsPurchase.xsd

@@ -12,7 +12,7 @@
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)))</CommandText>
+                    <CommandText>DELETE FROM [Purchase] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -100,13 +100,15 @@
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_purchase_admin" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_currency" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin);
+                    <CommandText>INSERT INTO [Purchase] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin], [currency]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin, @currency);
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -153,6 +155,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@chkremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="chkremark" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -160,7 +163,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, 
                pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, 
-               winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin
+               winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency
 FROM     Purchase
 WHERE  (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
 ORDER BY pdate DESC, idx DESC</CommandText>
@@ -171,8 +174,8 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)));
+                    <CommandText>UPDATE [Purchase] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin, [currency] = @currency WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)));
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency FROM Purchase WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -219,6 +222,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@chkremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="chkremark" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -305,6 +309,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_purchase_admin" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_currency" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Purchase" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -360,6 +366,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
               <Mapping SourceColumn="chkremark" DataSetColumn="chkremark" />
               <Mapping SourceColumn="purchase_manager" DataSetColumn="purchase_manager" />
               <Mapping SourceColumn="purchase_admin" DataSetColumn="purchase_admin" />
+              <Mapping SourceColumn="currency" DataSetColumn="currency" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CoutImport" Modifier="Public" Name="CoutImport" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CoutImport">
@@ -399,7 +406,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByDateExceptCR" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByDateExceptCR" GeneratorSourceName="FillByDateExceptCR" GetMethodModifier="Public" GetMethodName="GetByDateExceptCR" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByDateExceptCR" UserSourceName="FillByDateExceptCR">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC</CommandText>
+                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(orderno, '') = '') AND (state IN ('PO', 'Received')) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -411,7 +418,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetByIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByIdx" UserSourceName="FillByIdx">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx)</CommandText>
+                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (idx = @idx)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Purchase" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -421,7 +428,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDate" GeneratorSourceName="FillDate" GetMethodModifier="Public" GetMethodName="GetDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDate" UserSourceName="FillDate">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC</CommandText>
+                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -437,7 +444,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_PurchaseCR" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [EETGW_PurchaseCR] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)))</CommandText>
+                    <CommandText>DELETE FROM [EETGW_PurchaseCR] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -525,13 +532,15 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_purchase_admin" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_currency" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin);
+                    <CommandText>INSERT INTO [EETGW_PurchaseCR] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin], [currency]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin, @currency);
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency FROM EETGW_PurchaseCR WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -578,6 +587,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@chkremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="chkremark" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -585,7 +595,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, 
                pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, 
-               winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin
+               winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency
 FROM     EETGW_PurchaseCR
 WHERE  (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
 ORDER BY pdate DESC, idx DESC</CommandText>
@@ -596,8 +606,8 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)));
+                    <CommandText>UPDATE [EETGW_PurchaseCR] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin, [currency] = @currency WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)));
-SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
+SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency FROM EETGW_PurchaseCR WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -644,6 +654,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@chkremark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="chkremark" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -730,6 +741,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_manager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_manager" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_purchase_admin" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_purchase_admin" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="purchase_admin" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_currency" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_currency" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="currency" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_PurchaseCR" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -785,6 +798,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN
               <Mapping SourceColumn="chkremark" DataSetColumn="chkremark" />
               <Mapping SourceColumn="purchase_manager" DataSetColumn="purchase_manager" />
               <Mapping SourceColumn="purchase_admin" DataSetColumn="purchase_admin" />
+              <Mapping SourceColumn="currency" DataSetColumn="currency" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CoutImport" Modifier="Public" Name="CoutImport" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CoutImport">
@@ -825,7 +839,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_PurchaseCR" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetByIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByIdx" UserSourceName="FillByIdx">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx)</CommandText>
+                    <CommandText>SELECT asset, bigo, chk1, chk2, chkremark, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseCR WHERE (idx = @idx)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_PurchaseCR" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -837,7 +851,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT  asset, bigo, dept, edate, gcode, idx, import, indate, inqty, isdel, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, 
                pumscale, pumunit, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, state, supply, supplyidx, wdate, wuid, inremark, 
-               winuid, windate, chk1, chk2, pumqtyReq, chkremark, costcenter, linecode, purchase_manager, purchase_admin
+               winuid, windate, chk1, chk2, pumqtyReq, chkremark, costcenter, linecode, purchase_manager, purchase_admin, currency
 FROM     EETGW_PurchaseCR
 WHERE  (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state IN ('PO', 'Received'))
 ORDER BY pdate DESC, idx DESC</CommandText>
@@ -1173,6 +1187,13 @@ ORDER BY source DESC, request, wdate DESC</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="currency" msprop:Generator_ColumnPropNameInTable="currencyColumn" msprop:nullValue="USD" msprop:Generator_ColumnPropNameInRow="currency" msprop:Generator_UserColumnName="currency" msprop:Generator_ColumnVarNameInTable="columncurrency" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -1406,20 +1427,27 @@ ORDER BY source DESC, request, wdate DESC</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="purchase_manager" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="purchase_managerColumn" msprop:Generator_ColumnVarNameInTable="columnpurchase_manager" msprop:Generator_UserColumnName="purchase_manager" msprop:Generator_ColumnPropNameInRow="purchase_manager" minOccurs="0">
+              <xs:element name="purchase_manager" msprop:Generator_ColumnPropNameInTable="purchase_managerColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="purchase_manager" msprop:Generator_UserColumnName="purchase_manager" msprop:Generator_ColumnVarNameInTable="columnpurchase_manager" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="purchase_admin" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="purchase_adminColumn" msprop:Generator_ColumnVarNameInTable="columnpurchase_admin" msprop:Generator_UserColumnName="purchase_admin" msprop:Generator_ColumnPropNameInRow="purchase_admin" minOccurs="0">
+              <xs:element name="purchase_admin" msprop:Generator_ColumnPropNameInTable="purchase_adminColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="purchase_admin" msprop:Generator_UserColumnName="purchase_admin" msprop:Generator_ColumnVarNameInTable="columnpurchase_admin" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="currency" msprop:nullValue="USD" msprop:Generator_ColumnPropNameInTable="currencyColumn" msprop:Generator_ColumnVarNameInTable="columncurrency" msprop:Generator_UserColumnName="currency" msprop:Generator_ColumnPropNameInRow="currency" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/Project/fProjectData.cs

@@ -529,42 +529,7 @@ namespace FPJ0000
 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            if (tbPath.Text == "") tbPath.Text = "/" + tbIdx.Text;
+            showfolder();
-
-            if (tbPath.Text.StartsWith("\\") == false)
-            {
-                if (tbPath.Text.StartsWith("/")) tbPath.Text = tbPath.Text.Replace("/", "\\");
-                else tbPath.Text = "\\" + tbPath.Text;
-            }
-            var datapath = FCOMMON.DBM.getCodeSvalue("55", "01");
-            var serverpath = System.IO.Path.Combine("Data", "Project");
-            if (System.IO.Directory.Exists(serverpath) == false)
-            {
-                FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
-                    serverpath);
-                return;
-            }
-
-            var path = serverpath + tbPath.Text;
-            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);
         }
         void SelectDate(TextBox ctl)
         {