..

Project/Properties/AssemblyInfo.cs

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

SubProject/FBS0000/dsReport.Designer.cs

@@ -3588,7 +3588,8 @@ namespace FBS0000.dsReportTableAdapters {
 FROM     Users INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
-WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1)
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND 
+               (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0)
 ORDER BY Holyday.uid, CrDay";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

SubProject/FBS0000/dsReport.xsd

@@ -17,7 +17,8 @@
 FROM     Users INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
-WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1)
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND 
+               (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0)
 ORDER BY Holyday.uid, CrDay</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -335,7 +336,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
               <xs:element name="crday" msprop:Generator_ColumnPropNameInTable="crdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="crday" msprop:Generator_UserColumnName="crday" msprop:Generator_ColumnVarNameInTable="columncrday" type="xs:double" minOccurs="0" />
               <xs:element name="janday" msprop:Generator_ColumnPropNameInTable="jandayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="janday" msprop:Generator_UserColumnName="janday" msprop:Generator_ColumnVarNameInTable="columnjanday" type="xs:double" minOccurs="0" />
               <xs:element name="rateday" msprop:Generator_ColumnPropNameInTable="ratedayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rateday" msprop:Generator_UserColumnName="rateday" msprop:Generator_ColumnVarNameInTable="columnrateday" type="xs:double" minOccurs="0" />
-              <xs:element name="addday" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="adddayColumn" msprop:Generator_ColumnVarNameInTable="columnaddday" msprop:Generator_UserColumnName="addday" msprop:Generator_ColumnPropNameInRow="addday" type="xs:double" minOccurs="0" />
+              <xs:element name="addday" msprop:Generator_ColumnPropNameInTable="adddayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="addday" msprop:Generator_UserColumnName="addday" msprop:Generator_ColumnVarNameInTable="columnaddday" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FCM0000/FCM0000.csproj

@@ -160,6 +160,12 @@
     <Compile Include="Form2.Designer.cs">
       <DependentUpon>Form2.cs</DependentUpon>
     </Compile>
+    <Compile Include="Item\fItemEdit.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Item\fItemEdit.Designer.cs">
+      <DependentUpon>fItemEdit.cs</DependentUpon>
+    </Compile>
     <Compile Include="Mail\fAutoSendSetting.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -384,6 +390,9 @@
     <EmbeddedResource Include="Board\fPatchList.resx">
       <DependentUpon>fPatchList.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Item\fItemEdit.resx">
+      <DependentUpon>fItemEdit.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Mail\fAutoSendSetting.resx">
       <DependentUpon>fAutoSendSetting.cs</DependentUpon>
     </EmbeddedResource>

SubProject/FCM0000/Item/fItemEdit.Designer.cs

@@ -0,0 +1,397 @@
+namespace FCM0000.Item
+{
+    partial class fItemEdit
+    {
+        /// <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()
+        {
+            System.Windows.Forms.Label nameLabel;
+            System.Windows.Forms.Label sidLabel;
+            System.Windows.Forms.Label modelLabel;
+            System.Windows.Forms.Label manuLabel;
+            System.Windows.Forms.Label supplyLabel;
+            System.Windows.Forms.Label memoLabel;
+            System.Windows.Forms.Label priceLabel;
+            System.Windows.Forms.Label label1;
+            System.Windows.Forms.Label label2;
+            System.Windows.Forms.Label label3;
+            System.Windows.Forms.Label label4;
+            System.Windows.Forms.Label label5;
+            this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter();
+            this.tbName = new System.Windows.Forms.TextBox();
+            this.tbSid = new System.Windows.Forms.TextBox();
+            this.tbModel = new System.Windows.Forms.TextBox();
+            this.tbManu = new System.Windows.Forms.TextBox();
+            this.tbSupply = new System.Windows.Forms.TextBox();
+            this.tbMemo = new System.Windows.Forms.TextBox();
+            this.tbPrice = new System.Windows.Forms.TextBox();
+            this.tbSupplyIdx = new System.Windows.Forms.TextBox();
+            this.tbUnit = new System.Windows.Forms.TextBox();
+            this.btOK = new System.Windows.Forms.Button();
+            this.dsMSSQL = new FCM0000.dsMSSQL();
+            this.tbPriceD = new System.Windows.Forms.TextBox();
+            this.tbStorage = new System.Windows.Forms.TextBox();
+            this.tbCate = new System.Windows.Forms.TextBox();
+            this.tbBarcode = new System.Windows.Forms.TextBox();
+            nameLabel = new System.Windows.Forms.Label();
+            sidLabel = new System.Windows.Forms.Label();
+            modelLabel = new System.Windows.Forms.Label();
+            manuLabel = new System.Windows.Forms.Label();
+            supplyLabel = new System.Windows.Forms.Label();
+            memoLabel = new System.Windows.Forms.Label();
+            priceLabel = new System.Windows.Forms.Label();
+            label1 = new System.Windows.Forms.Label();
+            label2 = new System.Windows.Forms.Label();
+            label3 = new System.Windows.Forms.Label();
+            label4 = new System.Windows.Forms.Label();
+            label5 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // nameLabel
+            // 
+            nameLabel.AutoSize = true;
+            nameLabel.Location = new System.Drawing.Point(52, 53);
+            nameLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            nameLabel.Name = "nameLabel";
+            nameLabel.Size = new System.Drawing.Size(55, 30);
+            nameLabel.TabIndex = 3;
+            nameLabel.Text = "품명";
+            // 
+            // sidLabel
+            // 
+            sidLabel.AutoSize = true;
+            sidLabel.Location = new System.Drawing.Point(62, 14);
+            sidLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            sidLabel.Name = "sidLabel";
+            sidLabel.Size = new System.Drawing.Size(45, 30);
+            sidLabel.TabIndex = 0;
+            sidLabel.Text = "SID";
+            // 
+            // modelLabel
+            // 
+            modelLabel.AutoSize = true;
+            modelLabel.Location = new System.Drawing.Point(31, 99);
+            modelLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            modelLabel.Name = "modelLabel";
+            modelLabel.Size = new System.Drawing.Size(76, 30);
+            modelLabel.TabIndex = 5;
+            modelLabel.Text = "모델명";
+            // 
+            // manuLabel
+            // 
+            manuLabel.AutoSize = true;
+            manuLabel.Location = new System.Drawing.Point(31, 183);
+            manuLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            manuLabel.Name = "manuLabel";
+            manuLabel.Size = new System.Drawing.Size(76, 30);
+            manuLabel.TabIndex = 9;
+            manuLabel.Text = "제조사";
+            // 
+            // supplyLabel
+            // 
+            supplyLabel.AutoSize = true;
+            supplyLabel.Location = new System.Drawing.Point(31, 315);
+            supplyLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            supplyLabel.Name = "supplyLabel";
+            supplyLabel.Size = new System.Drawing.Size(76, 30);
+            supplyLabel.TabIndex = 17;
+            supplyLabel.Text = "공급처";
+            // 
+            // memoLabel
+            // 
+            memoLabel.AutoSize = true;
+            memoLabel.Location = new System.Drawing.Point(52, 403);
+            memoLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            memoLabel.Name = "memoLabel";
+            memoLabel.Size = new System.Drawing.Size(55, 30);
+            memoLabel.TabIndex = 20;
+            memoLabel.Text = "비고";
+            // 
+            // priceLabel
+            // 
+            priceLabel.AutoSize = true;
+            priceLabel.Location = new System.Drawing.Point(52, 225);
+            priceLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            priceLabel.Name = "priceLabel";
+            priceLabel.Size = new System.Drawing.Size(55, 30);
+            priceLabel.TabIndex = 11;
+            priceLabel.Text = "단가";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new System.Drawing.Point(52, 137);
+            label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            label1.Name = "label1";
+            label1.Size = new System.Drawing.Size(55, 30);
+            label1.TabIndex = 7;
+            label1.Text = "단위";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.ForeColor = System.Drawing.Color.Blue;
+            label2.Location = new System.Drawing.Point(387, 225);
+            label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            label2.Name = "label2";
+            label2.Size = new System.Drawing.Size(25, 30);
+            label2.TabIndex = 13;
+            label2.Text = "$";
+            // 
+            // label3
+            // 
+            label3.AutoSize = true;
+            label3.Location = new System.Drawing.Point(31, 269);
+            label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            label3.Name = "label3";
+            label3.Size = new System.Drawing.Size(76, 30);
+            label3.TabIndex = 15;
+            label3.Text = "보관소";
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new System.Drawing.Point(357, 268);
+            label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            label4.Name = "label4";
+            label4.Size = new System.Drawing.Size(55, 30);
+            label4.TabIndex = 23;
+            label4.Text = "분류";
+            // 
+            // label5
+            // 
+            label5.AutoSize = true;
+            label5.Location = new System.Drawing.Point(31, 358);
+            label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            label5.Name = "label5";
+            label5.Size = new System.Drawing.Size(76, 30);
+            label5.TabIndex = 25;
+            label5.Text = "바코드";
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
+            // tbName
+            // 
+            this.tbName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbName.Location = new System.Drawing.Point(111, 53);
+            this.tbName.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbName.Name = "tbName";
+            this.tbName.Size = new System.Drawing.Size(546, 35);
+            this.tbName.TabIndex = 4;
+            // 
+            // tbSid
+            // 
+            this.tbSid.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.tbSid.Enabled = false;
+            this.tbSid.Location = new System.Drawing.Point(111, 12);
+            this.tbSid.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbSid.Name = "tbSid";
+            this.tbSid.Size = new System.Drawing.Size(546, 35);
+            this.tbSid.TabIndex = 2;
+            this.tbSid.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbModel
+            // 
+            this.tbModel.Location = new System.Drawing.Point(111, 94);
+            this.tbModel.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbModel.Name = "tbModel";
+            this.tbModel.Size = new System.Drawing.Size(546, 35);
+            this.tbModel.TabIndex = 6;
+            // 
+            // tbManu
+            // 
+            this.tbManu.Location = new System.Drawing.Point(111, 180);
+            this.tbManu.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbManu.Name = "tbManu";
+            this.tbManu.Size = new System.Drawing.Size(546, 35);
+            this.tbManu.TabIndex = 10;
+            // 
+            // tbSupply
+            // 
+            this.tbSupply.Location = new System.Drawing.Point(111, 312);
+            this.tbSupply.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbSupply.Name = "tbSupply";
+            this.tbSupply.Size = new System.Drawing.Size(449, 35);
+            this.tbSupply.TabIndex = 18;
+            // 
+            // tbMemo
+            // 
+            this.tbMemo.Location = new System.Drawing.Point(111, 396);
+            this.tbMemo.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbMemo.Name = "tbMemo";
+            this.tbMemo.Size = new System.Drawing.Size(546, 35);
+            this.tbMemo.TabIndex = 21;
+            this.tbMemo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbPrice
+            // 
+            this.tbPrice.Location = new System.Drawing.Point(111, 223);
+            this.tbPrice.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbPrice.Name = "tbPrice";
+            this.tbPrice.Size = new System.Drawing.Size(241, 35);
+            this.tbPrice.TabIndex = 12;
+            this.tbPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbSupplyIdx
+            // 
+            this.tbSupplyIdx.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.tbSupplyIdx.Enabled = false;
+            this.tbSupplyIdx.Location = new System.Drawing.Point(555, 312);
+            this.tbSupplyIdx.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbSupplyIdx.Name = "tbSupplyIdx";
+            this.tbSupplyIdx.Size = new System.Drawing.Size(102, 35);
+            this.tbSupplyIdx.TabIndex = 19;
+            this.tbSupplyIdx.Text = "-1";
+            this.tbSupplyIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbUnit
+            // 
+            this.tbUnit.Location = new System.Drawing.Point(111, 136);
+            this.tbUnit.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbUnit.Name = "tbUnit";
+            this.tbUnit.Size = new System.Drawing.Size(546, 35);
+            this.tbUnit.TabIndex = 8;
+            this.tbUnit.Text = "EA";
+            this.tbUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // btOK
+            // 
+            this.btOK.Location = new System.Drawing.Point(111, 440);
+            this.btOK.Name = "btOK";
+            this.btOK.Size = new System.Drawing.Size(546, 66);
+            this.btOK.TabIndex = 22;
+            this.btOK.Text = "확인";
+            this.btOK.UseVisualStyleBackColor = true;
+            this.btOK.Click += new System.EventHandler(this.btOK_Click);
+            // 
+            // dsMSSQL
+            // 
+            this.dsMSSQL.DataSetName = "dsMSSQL";
+            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // tbPriceD
+            // 
+            this.tbPriceD.ForeColor = System.Drawing.Color.Blue;
+            this.tbPriceD.Location = new System.Drawing.Point(416, 223);
+            this.tbPriceD.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbPriceD.Name = "tbPriceD";
+            this.tbPriceD.Size = new System.Drawing.Size(241, 35);
+            this.tbPriceD.TabIndex = 14;
+            this.tbPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbStorage
+            // 
+            this.tbStorage.Location = new System.Drawing.Point(111, 267);
+            this.tbStorage.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbStorage.Name = "tbStorage";
+            this.tbStorage.Size = new System.Drawing.Size(241, 35);
+            this.tbStorage.TabIndex = 16;
+            this.tbStorage.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbCate
+            // 
+            this.tbCate.Location = new System.Drawing.Point(416, 266);
+            this.tbCate.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbCate.Name = "tbCate";
+            this.tbCate.Size = new System.Drawing.Size(241, 35);
+            this.tbCate.TabIndex = 24;
+            this.tbCate.Text = "--";
+            this.tbCate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbBarcode
+            // 
+            this.tbBarcode.Location = new System.Drawing.Point(111, 355);
+            this.tbBarcode.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.tbBarcode.Name = "tbBarcode";
+            this.tbBarcode.Size = new System.Drawing.Size(546, 35);
+            this.tbBarcode.TabIndex = 26;
+            // 
+            // fItemEdit
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(669, 518);
+            this.Controls.Add(label5);
+            this.Controls.Add(this.tbBarcode);
+            this.Controls.Add(label4);
+            this.Controls.Add(this.tbCate);
+            this.Controls.Add(label3);
+            this.Controls.Add(this.tbStorage);
+            this.Controls.Add(label2);
+            this.Controls.Add(this.tbPriceD);
+            this.Controls.Add(this.btOK);
+            this.Controls.Add(nameLabel);
+            this.Controls.Add(this.tbName);
+            this.Controls.Add(sidLabel);
+            this.Controls.Add(this.tbSid);
+            this.Controls.Add(label1);
+            this.Controls.Add(modelLabel);
+            this.Controls.Add(this.tbModel);
+            this.Controls.Add(manuLabel);
+            this.Controls.Add(this.tbManu);
+            this.Controls.Add(supplyLabel);
+            this.Controls.Add(this.tbSupply);
+            this.Controls.Add(memoLabel);
+            this.Controls.Add(this.tbMemo);
+            this.Controls.Add(priceLabel);
+            this.Controls.Add(this.tbPrice);
+            this.Controls.Add(this.tbSupplyIdx);
+            this.Controls.Add(this.tbUnit);
+            this.Font = new System.Drawing.Font("맑은 고딕", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
+            this.MinimumSize = new System.Drawing.Size(685, 448);
+            this.Name = "fItemEdit";
+            this.Text = "품목 정보 변경";
+            this.Load += new System.EventHandler(this.fItemAdd_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private dsMSSQLTableAdapters.ItemsTableAdapter ta;
+        private System.Windows.Forms.Button btOK;
+        private dsMSSQL dsMSSQL;
+        public System.Windows.Forms.TextBox tbName;
+        public System.Windows.Forms.TextBox tbSid;
+        public System.Windows.Forms.TextBox tbModel;
+        public System.Windows.Forms.TextBox tbManu;
+        public System.Windows.Forms.TextBox tbSupply;
+        public System.Windows.Forms.TextBox tbMemo;
+        public System.Windows.Forms.TextBox tbPrice;
+        public System.Windows.Forms.TextBox tbSupplyIdx;
+        public System.Windows.Forms.TextBox tbUnit;
+        public System.Windows.Forms.TextBox tbPriceD;
+		public System.Windows.Forms.TextBox tbStorage;
+        public System.Windows.Forms.TextBox tbCate;
+        public System.Windows.Forms.TextBox tbBarcode;
+    }
+}

SubProject/FCM0000/Item/fItemEdit.cs

@@ -0,0 +1,189 @@
+using FarPoint.Excel.EntityClassLibrary.DrawingEx;
+using FCOMMON;
+using NetOffice.OutlookApi;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FCM0000.Item
+{
+    public partial class fItemEdit : FCOMMON.fBase
+    {
+        public int newIDX = -1;
+        public string newSID = string.Empty;
+        FCM0000.dsMSSQL.ItemsRow dr;
+
+        public fItemEdit(int pumidx)
+        {
+            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))
+                {
+                    ctl.KeyDown += ctl_KeyDown;
+                }
+            }
+            dr = ta.GetbyIDX(pumidx).FirstOrDefault();
+        }
+
+        void ctl_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Control ctl = sender as Control;
+                string nm = ctl.Name.ToLower();
+                string search = ctl.Text.Trim();
+                SendKeys.Send("{TAB}");
+            }
+        }
+
+        private void fItemAdd_Load(object sender, EventArgs e)
+        {
+            if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
+            if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
+            {
+                this.Location = new Point(0, 0);
+            }
+
+            tbSid.Text = dr.IssidNull() == false ? dr.sid : string.Empty;
+            tbName.Text = dr.IsnameNull() == false ? dr.name : string.Empty;
+            tbModel.Text = dr.IsmodelNull() == false ? dr.model : string.Empty;
+            tbUnit.Text = dr.IsunitNull() == false ? dr.unit : string.Empty;
+            tbManu.Text = dr.IsmanuNull() == false ? dr.manu : string.Empty;
+            tbPrice.Text = dr.IspriceNull() == false ? dr.price.ToString() : string.Empty;
+            tbPriceD.Text = dr.IspriceDNull() == false ? dr.priceD.ToString() : string.Empty;
+            tbStorage.Text = dr.IsStorageNull() == false ? dr.Storage : string.Empty;
+            tbCate.Text = dr.IscateNull() == false ? dr.cate : string.Empty;
+            tbSupply.Text = dr.IssupplyNull() == false ? dr.supply : string.Empty;
+            tbSupplyIdx.Text = dr.IssupplyidxNull() == false ? dr.supplyidx.ToString() : string.Empty;
+            tbBarcode.Text = dr.IsbarcodeNull() == false ? dr.barcode : string.Empty;
+            tbMemo.Text = dr.IsmemoNull() == false ? dr.memo : string.Empty;
+            this.Show();
+            //Application.DoEvents();
+
+        }
+
+        private void btOK_Click(object sender, EventArgs e)
+        {
+            if (tbName.Text.Trim() == "")
+            {
+                FCOMMON.Util.MsgE("품명은 필수 입니다");
+                tbName.Focus();
+                return;
+            }
+
+            //if (tbModel.Text.Trim() == "")
+            //{
+            //    FCOMMON.Util.MsgE("모델은 필수 입니다");
+            //    tbModel.Focus();
+            //    return;
+            //}
+
+            //if (tbSid.Text.StartsWith("신규")) tbSid.Text = "신규";
+            //else
+            //{
+            //    //이떄는 sid가 정상이어야 한다.
+            //    if (tbSid.Text.StartsWith("10") == false || tbSid.TextLength != 9)
+            //    {
+            //        Util.MsgE("SID는 9자리 숫자이며 10으로 시작 합니다\n입력값을 확인 하세요");
+            //        tbSid.Focus();
+            //        tbSid.SelectAll();
+            //        return;
+            //    }
+
+            //    if (ta.ExistSID(FCOMMON.info.Login.gcode, tbSid.Text) > 0)
+            //    {
+            //        Util.MsgE("동일한 SID정보가 있습니다\n화면을 닫은 후 SID로 검색하세요");
+            //        this.Close();
+            //        return;
+            //    }
+            //}
+
+            var pumName = tbName.Text.Trim();
+            var pumModel = tbModel.Text.Trim();
+            var searchKey = pumName + pumModel;
+            //var cnt = (int)(ta.ExistCheck(FCOMMON.info.Login.gcode, searchKey));
+            //if (cnt > 0)
+            //{
+            //    FCOMMON.Util.MsgE("동일 품명 모델의 정보가 존재 합니다");
+            //    return;
+            //}
+
+            if (int.TryParse(tbSupplyIdx.Text, out int supidx) == false)
+            {
+                dr.SetsupplyidxNull();
+            }
+            
+            dr.wdate = DateTime.Now;
+            dr.wuid = FCOMMON.info.Login.no;
+            dr.name = tbName.Text.Trim();
+            dr.sid = tbSid.Text.Trim();
+            dr.model = tbModel.Text.Trim();
+            dr.manu = tbManu.Text.Trim();
+            dr.supply = tbSupply.Text.Trim();
+            dr.memo = tbMemo.Text.Trim();
+            dr.cate = tbCate.Text.Trim();
+            dr.Storage = tbStorage.Text.Trim();
+            dr.barcode = tbBarcode.Text.Trim();
+
+            //21711
+            if (tbPriceD.Text.isEmpty() == false)
+            {
+                if (decimal.TryParse(tbPriceD.Text, out decimal priced))
+                {
+                    dr.priceD = priced;
+                    if (decimal.TryParse(tbPrice.Text, out decimal priceWon) == false)
+                    {
+                        var ConvertedPrice = (decimal)((double)priced * FCOMMON.info.dollertowon);
+                        tbPrice.Text = ConvertedPrice.ToString();
+                    }
+                }
+                else
+                {
+                    FCOMMON.Util.MsgE("입력값이 숫자가 아닙니다. 단가($)를 사용할 수 없습니다");
+                }
+            }
+
+
+            int price;
+            int.TryParse(tbPrice.Text, out price);
+            dr.price = price;
+
+            if(dr.IscateNull() || dr.scale == 0) dr.scale = 1;
+            dr.unit = tbUnit.Text.Trim();
+            if ( dr.IsunitNull() || dr.unit == "") dr.unit = "EA";
+            dr.EndEdit();
+
+            try
+            {
+                var cnt2 = ta.Update(dr);
+                if (cnt2 == 0)
+                {
+                    FCOMMON.Util.MsgE("변경 실패");
+                }
+                else
+                {
+                    this.newIDX = dr.idx;
+                    DialogResult = System.Windows.Forms.DialogResult.OK;
+                }
+            }
+            catch (System.Exception eX)
+            {
+                FCOMMON.Util.MsgE(eX.Message);
+                newIDX = -1;
+            }
+        }
+
+    }
+}

SubProject/FCM0000/Item/fItemEdit.resx

@@ -0,0 +1,162 @@
+<?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>
+  <metadata name="nameLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="sidLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="modelLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="manuLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="supplyLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="memoLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="priceLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

SubProject/FCOMMON/fSFI.Designer.cs

@@ -40,6 +40,8 @@ namespace FCOMMON
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.label19 = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
             this.label17 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.nudShiftCnt = new System.Windows.Forms.NumericUpDown();
@@ -60,8 +62,10 @@ namespace FCOMMON
             this.button1 = new System.Windows.Forms.Button();
             this.label14 = new System.Windows.Forms.Label();
             this.nudCnt = new System.Windows.Forms.NumericUpDown();
-            this.label18 = new System.Windows.Forms.Label();
+            this.nudMultiMFG = new System.Windows.Forms.NumericUpDown();
-            this.label19 = new System.Windows.Forms.Label();
+            this.label15 = new System.Windows.Forms.Label();
+            this.nudCSFIMFG = new System.Windows.Forms.NumericUpDown();
+            this.label16 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.nudSFIOffice)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
@@ -75,6 +79,8 @@ namespace FCOMMON
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudCnt)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nudMultiMFG)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nudCSFIMFG)).BeginInit();
             this.SuspendLayout();
             // 
             // radO
@@ -216,6 +222,10 @@ namespace FCOMMON
             // panel2
             // 
             this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.panel2.Controls.Add(this.label16);
+            this.panel2.Controls.Add(this.nudCSFIMFG);
+            this.panel2.Controls.Add(this.label15);
+            this.panel2.Controls.Add(this.nudMultiMFG);
             this.panel2.Controls.Add(this.label19);
             this.panel2.Controls.Add(this.label18);
             this.panel2.Controls.Add(this.label17);
@@ -238,9 +248,28 @@ namespace FCOMMON
             this.panel2.Enabled = false;
             this.panel2.Location = new System.Drawing.Point(43, 254);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(720, 223);
+            this.panel2.Size = new System.Drawing.Size(720, 269);
             this.panel2.TabIndex = 2;
             // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Location = new System.Drawing.Point(424, 125);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(28, 37);
+            this.label19.TabIndex = 19;
+            this.label19.Text = "/";
+            // 
+            // label18
+            // 
+            this.label18.AutoSize = true;
+            this.label18.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.label18.Location = new System.Drawing.Point(399, 28);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(26, 21);
+            this.label18.TabIndex = 18;
+            this.label18.Text = "분";
+            // 
             // label17
             // 
             this.label17.AutoSize = true;
@@ -374,7 +403,7 @@ namespace FCOMMON
             // 
             // nudSFIMFG
             // 
-            this.nudSFIMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.nudSFIMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.nudSFIMFG.DecimalPlaces = 2;
             this.nudSFIMFG.Location = new System.Drawing.Point(233, 169);
             this.nudSFIMFG.Maximum = new decimal(new int[] {
@@ -470,7 +499,7 @@ namespace FCOMMON
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(43, 483);
+            this.button1.Location = new System.Drawing.Point(43, 529);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(720, 55);
             this.button1.TabIndex = 3;
@@ -508,30 +537,66 @@ namespace FCOMMON
             0});
             this.nudCnt.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged);
             // 
-            // label18
+            // nudMultiMFG
             // 
-            this.label18.AutoSize = true;
+            this.nudMultiMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.label18.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.nudMultiMFG.DecimalPlaces = 2;
-            this.label18.Location = new System.Drawing.Point(399, 28);
+            this.nudMultiMFG.Location = new System.Drawing.Point(425, 169);
-            this.label18.Name = "label18";
+            this.nudMultiMFG.Maximum = new decimal(new int[] {
-            this.label18.Size = new System.Drawing.Size(26, 21);
+            999999999,
-            this.label18.TabIndex = 18;
+            0,
-            this.label18.Text = "분";
+            0,
+            0});
+            this.nudMultiMFG.Name = "nudMultiMFG";
+            this.nudMultiMFG.Size = new System.Drawing.Size(89, 43);
+            this.nudMultiMFG.TabIndex = 20;
+            this.nudMultiMFG.Tag = "m";
+            this.nudMultiMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.nudMultiMFG.Value = new decimal(new int[] {
+            125,
+            0,
+            0,
+            131072});
             // 
-            // label19
+            // label15
             // 
-            this.label19.AutoSize = true;
+            this.label15.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(424, 125);
+            this.label15.Location = new System.Drawing.Point(395, 172);
-            this.label19.Name = "label19";
+            this.label15.Name = "label15";
-            this.label19.Size = new System.Drawing.Size(28, 37);
+            this.label15.Size = new System.Drawing.Size(28, 37);
-            this.label19.TabIndex = 19;
+            this.label15.TabIndex = 21;
-            this.label19.Text = "/";
+            this.label15.Text = "*";
+            // 
+            // nudCSFIMFG
+            // 
+            this.nudCSFIMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.nudCSFIMFG.DecimalPlaces = 2;
+            this.nudCSFIMFG.Location = new System.Drawing.Point(233, 218);
+            this.nudCSFIMFG.Maximum = new decimal(new int[] {
+            999999999,
+            0,
+            0,
+            0});
+            this.nudCSFIMFG.Name = "nudCSFIMFG";
+            this.nudCSFIMFG.Size = new System.Drawing.Size(281, 43);
+            this.nudCSFIMFG.TabIndex = 22;
+            this.nudCSFIMFG.Tag = "m";
+            this.nudCSFIMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(96, 220);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(133, 37);
+            this.label16.TabIndex = 23;
+            this.label16.Text = "(C-SFI) = ";
             // 
             // fSFI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 37F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(774, 545);
+            this.ClientSize = new System.Drawing.Size(774, 596);
             this.Controls.Add(this.nudCnt);
             this.Controls.Add(this.label14);
             this.Controls.Add(this.button1);
@@ -560,6 +625,8 @@ namespace FCOMMON
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudCnt)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nudMultiMFG)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.nudCSFIMFG)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -599,5 +666,9 @@ namespace FCOMMON
         public System.Windows.Forms.NumericUpDown nudShiftCnt;
         private System.Windows.Forms.Label label19;
         private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.NumericUpDown nudMultiMFG;
+        private System.Windows.Forms.NumericUpDown nudCSFIMFG;
+        private System.Windows.Forms.Label label16;
     }
 }

SubProject/FCOMMON/fSFI.cs

@@ -62,7 +62,9 @@ namespace FCOMMON
             //mfg의 총 절감 시간이 변경되었다
             var 총절감시간 = (double)nud.Value;
             var sfi = 총절감시간 / (float)numericUpDown5.Value;
+            var csfi = sfi * (float)nudMultiMFG.Value;
             nudSFIMFG.Value = (Decimal)sfi;
+            nudCSFIMFG.Value = (Decimal)csfi;
         }
         public double Value { get; set; } = 0;
         void updateMFG()
@@ -93,7 +95,7 @@ namespace FCOMMON
             if (radO.Checked)
                 this.Value = (double)nudSFIOffice.Value;
             else
-                this.Value = (double)nudSFIMFG.Value;
+                this.Value = (double)nudCSFIMFG.Value;
             DialogResult = DialogResult.OK;
 
         }

SubProject/FEQ0000/DataBaseManager.cs

@@ -203,6 +203,401 @@ namespace FEQ0000
             }
 
 
+            if (book != null)
+            {
+                try
+                {
+                    book.save(savefilenamexls);
+                }
+                catch { }
+            }
+            return sb.ToString().Replace("{금액}", totalamt.ToString("N0"));
+        }
+
+        public static string MakeDataTableToHTML(List<dsPurchase.PurchaseRow> rows, string savefilenamexls = "")
+        {
+
+            libxl.Book book = null;// = new libxl.BinBook();
+            libxl.Sheet sheet = null;
+
+
+            libxl.Format fTitle = null;
+            libxl.Format fDataStr = null;
+            libxl.Format fDataNum = null;
+
+            if (savefilenamexls.isEmpty() == false)
+            {
+                book = new libxl.XmlBook();
+                book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey);
+                sheet = book.addSheet("Data");
+
+                fTitle = book.addFormat();
+                fDataStr = book.addFormat();
+                fDataNum = book.addFormat();
+
+                fDataStr.alignH = libxl.AlignH.ALIGNH_CENTER;
+                fDataStr.alignV = libxl.AlignV.ALIGNV_CENTER;
+                fDataStr.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN);
+                fDataStr.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID;
+                fDataStr.patternForegroundColor = libxl.Color.COLOR_WHITE;
+
+                fTitle.alignV = libxl.AlignV.ALIGNV_CENTER;
+                fTitle.alignH = libxl.AlignH.ALIGNH_CENTER;
+                fTitle.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN);
+                fTitle.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID;
+                fTitle.patternForegroundColor = libxl.Color.COLOR_GRAY25;
+
+                fDataNum.alignH = libxl.AlignH.ALIGNH_GENERAL;
+                fDataNum.alignV = libxl.AlignV.ALIGNV_CENTER;
+                fDataNum.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN);
+                fDataNum.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID;
+                fDataNum.patternForegroundColor = libxl.Color.COLOR_WHITE;
+
+            }
+
+            //목록을 본문에 추가한다
+            System.Text.StringBuilder sb = new StringBuilder();
+            sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
+            sb.AppendLine("<tr>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='text-align:center;'>TOTAL</td>");
+            sb.AppendLine("<td style='text-align:center;' colspan='2'><strong>{금액}</strong></td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("</tr>");
+            sb.AppendLine("<tr>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>No</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SC</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>자재번호</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>청구자</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품목</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급업체</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>용도</td>");
+            sb.AppendLine("</tr>");
+            sb.AppendLine("<tbody>");
+
+            var row = 0;
+            var col = 0;
+            if (sheet != null)
+            {
+                var basewidth = 15;
+                sheet.setRow(row, 30);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "No", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "S/C", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "자재번호", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "청구자", fTitle);
+                sheet.setCol(col, (int)(basewidth * 2)); sheet.writeStr(row, col++, "품목", fTitle);
+                sheet.setCol(col, (int)(basewidth * 3)); sheet.writeStr(row, col++, "규격", fTitle);
+                sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "수량", fTitle);
+                sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "단가", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "금액", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "공급업체", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "용도", fTitle);
+
+            }
+
+
+            decimal totalamt = 0;
+            row = 1;
+            col = 0;
+            foreach (dsPurchase.PurchaseRow dr in rows)
+            {
+                var s요청 = dr.IsrequestNameNull() ? "" : dr.requestName;//  fpSpread1_Sheet1.Cells[i, col_요청].Value;
+                var sSID = dr.IssidNull() ? "" : dr.sid;// fpSpread1_Sheet1.Cells[i, col_SID].Value;
+                var s품명 = dr.IspumnameNull() ? "" : dr.pumname;// fpSpread1_Sheet1.Cells[i, col_품명].Value;
+                var s규격 = dr.IspumunitNull() ? "" : dr.pumunit;// fpSpread1_Sheet1.Cells[i, col_규격].Value;
+                var qty = dr.IspumqtyNull() ? 0 : dr.pumqty;// fpSpread1_Sheet1.Cells[i, col_수량].Value;
+                var price = dr.IspumpriceNull() ? 0 : dr.pumprice;// fpSpread1_Sheet1.Cells[i, col_단가].Value;
+                var amt = dr.IspumamtNull() ? 0 : dr.pumamt;// fpSpread1_Sheet1.Cells[i, col_금액].Value;
+                var s공급 = dr.IssupplyNull() ? "" : dr.supply;// fpSpread1_Sheet1.Cells[i, col_공급].Value;
+                var s비고 = dr.IsbigoNull() ? "" : dr.bigo;// fpSpread1_Sheet1.Cells[i, col_비고].Value;
+                //var sSITE = dr.IssiteNull() ? "" : dr.site;// fpSpread1_Sheet1.Cells[i, col_site].Value;
+                var s분류 = dr.IsdeptNull() ? "" : dr.dept;
+                var sSC = dr.IsscNull() ? "" : dr.sc;//
+
+
+                totalamt += amt;
+
+                sb.AppendLine("<tr>");
+                sb.AppendLine($"<td>{row}</td>");
+                sb.AppendLine("<td>" + getmaxstr(sSC) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(sSID) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s요청) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s품명) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s규격) + "</td>");
+                sb.AppendLine("<td style='text-align:center'>" + qty.ToString("N0") + "</td>");
+                sb.AppendLine("<td style='text-align:right'>" + price.ToString("N0") + "</td>");
+                sb.AppendLine("<td style='text-align:right'>" + amt.ToString("N0") + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s공급) + "</td>");
+                sb.AppendLine("<td>" + s비고 + "</td>");
+
+                if (sheet != null)
+                {
+                    col = 0;
+                    sheet.setRow(row, 23);
+                    sheet.writeNum(row, col++, row, fDataNum);
+                    sheet.writeStr(row, col++, sSC, fDataStr);
+                    sheet.writeStr(row, col++, sSID, fDataStr);
+                    sheet.writeStr(row, col++, s요청, fDataStr);
+                    sheet.writeStr(row, col++, s품명, fDataStr);
+                    sheet.writeStr(row, col++, s규격, fDataStr);
+                    sheet.writeNum(row, col++, qty, fDataNum);
+                    sheet.writeNum(row, col++, (int)price, fDataNum);
+                    sheet.writeNum(row, col++, (int)amt, fDataNum);
+                    sheet.writeStr(row, col++, s공급, fDataStr);
+                    sheet.writeStr(row, col++, s비고, fDataStr);
+                    row += 1;
+                }
+
+                ////sb.AppendLine("<td>" + getmaxstr(sSTIE) + "</td>");
+                //''sb.AppendLine("<td>" + getmaxstr(s분류) + "</td>");
+                //sb.AppendLine("<td>" + getmaxstr(sCRCF) + "</td>");
+                //sb.AppendLine("<td>" + getmaxstr(s수령) + "</td>");
+
+
+
+                sb.AppendLine("</tr>");
+            }
+
+            sb.AppendLine("<tr>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='text-align:center;'>TOTAL</td>");
+            sb.AppendLine("<td style='text-align:center;' colspan='2'><strong>{금액}</strong></td>");
+            sb.AppendLine("</tr>");
+
+            sb.AppendLine("</tbody>");
+            sb.AppendLine("</table>");
+
+
+            if (sheet != null)
+            {
+                col = 0;
+                sheet.setRow(row, 30);
+                sheet.writeStr(row, col++, "합계", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeNum(row, col++, (int)totalamt, fTitle);
+                sheet.setMerge(row, row, col - 1, col);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                row += 1;
+            }
+
+
+            if (book != null)
+            {
+                try
+                {
+                    book.save(savefilenamexls);
+                }
+                catch { }
+            }
+            return sb.ToString().Replace("{금액}", totalamt.ToString("N0"));
+        }
+
+        public static string MakeDataTableToHTML(List<dsPurchase.EETGW_PurchaseCRRow> rows, string savefilenamexls = "")
+        {
+
+            libxl.Book book = null;// = new libxl.BinBook();
+            libxl.Sheet sheet = null;
+
+
+            libxl.Format fTitle = null;
+            libxl.Format fDataStr = null;
+            libxl.Format fDataNum = null;
+
+            if (savefilenamexls.isEmpty() == false)
+            {
+                book = new libxl.XmlBook();
+                book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey);
+                sheet = book.addSheet("Data");
+
+                fTitle = book.addFormat();
+                fDataStr = book.addFormat();
+                fDataNum = book.addFormat();
+
+                fDataStr.alignH = libxl.AlignH.ALIGNH_CENTER;
+                fDataStr.alignV = libxl.AlignV.ALIGNV_CENTER;
+                fDataStr.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN);
+                fDataStr.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID;
+                fDataStr.patternForegroundColor = libxl.Color.COLOR_WHITE;
+
+                fTitle.alignV = libxl.AlignV.ALIGNV_CENTER;
+                fTitle.alignH = libxl.AlignH.ALIGNH_CENTER;
+                fTitle.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN);
+                fTitle.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID;
+                fTitle.patternForegroundColor = libxl.Color.COLOR_GRAY25;
+
+                fDataNum.alignH = libxl.AlignH.ALIGNH_GENERAL;
+                fDataNum.alignV = libxl.AlignV.ALIGNV_CENTER;
+                fDataNum.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN);
+                fDataNum.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID;
+                fDataNum.patternForegroundColor = libxl.Color.COLOR_WHITE;
+
+            }
+
+            //목록을 본문에 추가한다
+            System.Text.StringBuilder sb = new StringBuilder();
+            sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
+            sb.AppendLine("<tr>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='text-align:center;'>TOTAL</td>");
+            sb.AppendLine("<td style='text-align:center;' colspan='2'><strong>{금액}</strong></td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("</tr>");
+            sb.AppendLine("<tr>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SC</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>자재번호</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>청구자</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품목</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급업체</td>");
+            sb.AppendLine("<td style='text-align:center;background-color: aqua;'>용도</td>");
+            sb.AppendLine("</tr>");
+            sb.AppendLine("<tbody>");
+
+            var row = 0;
+            var col = 0;
+            if (sheet != null)
+            {
+                var basewidth = 15;
+                sheet.setRow(row, 30);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "S/C", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "자재번호", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "청구자", fTitle);
+                sheet.setCol(col, (int)(basewidth * 2)); sheet.writeStr(row, col++, "품목", fTitle);
+                sheet.setCol(col, (int)(basewidth * 3)); sheet.writeStr(row, col++, "규격", fTitle);
+                sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "수량", fTitle);
+                sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "단가", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "금액", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "공급업체", fTitle);
+                sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "용도", fTitle);
+
+            }
+
+
+            decimal totalamt = 0;
+            row = 1;
+            col = 0;
+            foreach (dsPurchase.EETGW_PurchaseCRRow dr in rows)
+            {
+                var s요청 = dr.IsrequestNameNull() ? "" : dr.requestName;//  fpSpread1_Sheet1.Cells[i, col_요청].Value;
+                var sSID = dr.IssidNull() ? "" : dr.sid;// fpSpread1_Sheet1.Cells[i, col_SID].Value;
+                var s품명 = dr.IspumnameNull() ? "" : dr.pumname;// fpSpread1_Sheet1.Cells[i, col_품명].Value;
+                var s규격 = dr.IspumunitNull() ? "" : dr.pumunit;// fpSpread1_Sheet1.Cells[i, col_규격].Value;
+                var qty = dr.IspumqtyNull() ? 0 : dr.pumqty;// fpSpread1_Sheet1.Cells[i, col_수량].Value;
+                var price = dr.IspumpriceNull() ? 0 : dr.pumprice;// fpSpread1_Sheet1.Cells[i, col_단가].Value;
+                var amt = dr.IspumamtNull() ? 0 : dr.pumamt;// fpSpread1_Sheet1.Cells[i, col_금액].Value;
+                var s공급 = dr.IssupplyNull() ? "" : dr.supply;// fpSpread1_Sheet1.Cells[i, col_공급].Value;
+                var s비고 = dr.IsbigoNull() ? "" : dr.bigo;// fpSpread1_Sheet1.Cells[i, col_비고].Value;
+                //var sSITE = dr.IssiteNull() ? "" : dr.site;// fpSpread1_Sheet1.Cells[i, col_site].Value;
+                var s분류 = dr.IsdeptNull() ? "" : dr.dept;
+                var sSC = dr.IsscNull() ? "" : dr.sc;//
+
+
+                totalamt += amt;
+
+                sb.AppendLine("<tr>");
+                sb.AppendLine("<td>" + getmaxstr(sSC) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(sSID) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s요청) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s품명) + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s규격) + "</td>");
+                sb.AppendLine("<td style='text-align:center'>" + qty.ToString("N0") + "</td>");
+                sb.AppendLine("<td style='text-align:right'>" + price.ToString("N0") + "</td>");
+                sb.AppendLine("<td style='text-align:right'>" + amt.ToString("N0") + "</td>");
+                sb.AppendLine("<td>" + getmaxstr(s공급) + "</td>");
+                sb.AppendLine("<td>" + s비고 + "</td>");
+
+                if (sheet != null)
+                {
+                    col = 0;
+                    sheet.setRow(row, 23);
+                    sheet.writeStr(row, col++, sSC, fDataStr);
+                    sheet.writeStr(row, col++, sSID, fDataStr);
+                    sheet.writeStr(row, col++, s요청, fDataStr);
+                    sheet.writeStr(row, col++, s품명, fDataStr);
+                    sheet.writeStr(row, col++, s규격, fDataStr);
+                    sheet.writeNum(row, col++, qty, fDataNum);
+                    sheet.writeNum(row, col++, (int)price, fDataNum);
+                    sheet.writeNum(row, col++, (int)amt, fDataNum);
+                    sheet.writeStr(row, col++, s공급, fDataStr);
+                    sheet.writeStr(row, col++, s비고, fDataStr);
+                    row += 1;
+                }
+
+                ////sb.AppendLine("<td>" + getmaxstr(sSTIE) + "</td>");
+                //''sb.AppendLine("<td>" + getmaxstr(s분류) + "</td>");
+                //sb.AppendLine("<td>" + getmaxstr(sCRCF) + "</td>");
+                //sb.AppendLine("<td>" + getmaxstr(s수령) + "</td>");
+
+
+
+                sb.AppendLine("</tr>");
+            }
+
+            sb.AppendLine("<tr>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='border:none;text-align:center;'>&nbsp;</td>");
+            sb.AppendLine("<td style='text-align:center;'>TOTAL</td>");
+            sb.AppendLine("<td style='text-align:center;' colspan='2'><strong>{금액}</strong></td>");
+            sb.AppendLine("</tr>");
+
+            sb.AppendLine("</tbody>");
+            sb.AppendLine("</table>");
+
+
+            if (sheet != null)
+            {
+                col = 0;
+                sheet.setRow(row, 30);
+                sheet.writeStr(row, col++, "합계", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeNum(row, col++, (int)totalamt, fTitle);
+                sheet.setMerge(row, row, col - 1, col);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                sheet.writeStr(row, col++, "", fTitle);
+                row += 1;
+            }
+
+
             if (book != null)
             {
                 try

SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs

@@ -30,44 +30,44 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseCR));
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType10 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType11 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType76 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType36 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType37 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType38 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType39 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType97 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType12 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType40 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType98 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType99 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType100 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter();
@@ -99,7 +99,6 @@
             this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton();
             this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripButton7 = new System.Windows.Forms.ToolStripDropDownButton();
-            this.입고품목메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.sAP구매신청엑셀작성ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripButton5 = new System.Windows.Forms.ToolStripDropDownButton();
@@ -156,7 +155,12 @@
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.label2 = new System.Windows.Forms.Label();
-            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.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.현재목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.선택목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -437,10 +441,9 @@
             // toolStripButton7
             // 
             this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.입고품목메일전송ToolStripMenuItem,
+            this.메일전송ToolStripMenuItem,
             this.엑셀에서가져오기ToolStripMenuItem,
-            this.sAP구매신청엑셀작성ToolStripMenuItem,
+            this.sAP구매신청엑셀작성ToolStripMenuItem});
-            this.현재목록메일전송ToolStripMenuItem});
             this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
             this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton7.Name = "toolStripButton7";
@@ -448,14 +451,6 @@
             this.toolStripButton7.Text = "기능";
             this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
             // 
-            // 입고품목메일전송ToolStripMenuItem
-            // 
-            this.입고품목메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("입고품목메일전송ToolStripMenuItem.Image")));
-            this.입고품목메일전송ToolStripMenuItem.Name = "입고품목메일전송ToolStripMenuItem";
-            this.입고품목메일전송ToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
-            this.입고품목메일전송ToolStripMenuItem.Text = "입고 품목 메일 전송";
-            this.입고품목메일전송ToolStripMenuItem.Click += new System.EventHandler(this.입고품목메일전송ToolStripMenuItem_Click);
-            // 
             // 엑셀에서가져오기ToolStripMenuItem
             // 
             this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image")));
@@ -997,15 +992,15 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "비고";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 29F;
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 35F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType10;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1";
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType11;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "chk2";
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 37F;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType76;
             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).Tag = "pdate";
@@ -1013,243 +1008,243 @@
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType77;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "state";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Tag = "state";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType78;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place";
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType79;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(5).Tag = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType80;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "costcenter";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType81;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "linecode";
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType82;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sc";
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sc";
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType83;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(9).Tag = "crcf";
             this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType84;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "품명";
             this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
+            numberCellType31.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType31.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
+            numberCellType31.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType31;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumidx";
             this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(11).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumidx";
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType85;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "SID#";
             this.fpSpread1_Sheet1.Columns.Get(12).Tag = "sid";
             this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType86;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "모델";
             this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F;
-            numberCellType2.DecimalPlaces = 0;
+            numberCellType32.DecimalPlaces = 0;
-            numberCellType2.NegativeRed = true;
+            numberCellType32.NegativeRed = true;
-            numberCellType2.NullDisplay = "--";
+            numberCellType32.NullDisplay = "--";
-            numberCellType2.Separator = ",";
+            numberCellType32.Separator = ",";
-            numberCellType2.ShowSeparator = true;
+            numberCellType32.ShowSeparator = true;
-            numberCellType2.ShrinkToFit = true;
+            numberCellType32.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType32;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqtyReq";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량\r\n(요청)";
             this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
-            numberCellType3.DecimalPlaces = 0;
+            numberCellType33.DecimalPlaces = 0;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType33;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량\r\n(구매)\r\n";
             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType87;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위";
             this.fpSpread1_Sheet1.Columns.Get(16).Tag = "pumunit";
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F;
-            numberCellType4.DecimalPlaces = 2;
+            numberCellType34.DecimalPlaces = 2;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType34;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumpriceD";
             this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가($)";
             this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumpriceD";
             this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType5.DecimalPlaces = 0;
+            numberCellType35.DecimalPlaces = 0;
-            numberCellType5.MaximumValue = 9999999999999.99D;
+            numberCellType35.MaximumValue = 9999999999999.99D;
-            numberCellType5.MinimumValue = -9999999999999.99D;
+            numberCellType35.MinimumValue = -9999999999999.99D;
-            numberCellType5.NegativeRed = true;
+            numberCellType35.NegativeRed = true;
-            numberCellType5.NullDisplay = "--";
+            numberCellType35.NullDisplay = "--";
-            numberCellType5.Separator = ",";
+            numberCellType35.Separator = ",";
-            numberCellType5.ShowSeparator = true;
+            numberCellType35.ShowSeparator = true;
-            numberCellType5.ShrinkToFit = true;
+            numberCellType35.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType35;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "단가";
             this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F;
-            numberCellType6.DecimalPlaces = 0;
+            numberCellType36.DecimalPlaces = 0;
-            numberCellType6.MaximumValue = 9999999999999.99D;
+            numberCellType36.MaximumValue = 9999999999999.99D;
-            numberCellType6.MinimumValue = -9999999999999.99D;
+            numberCellType36.MinimumValue = -9999999999999.99D;
-            numberCellType6.NegativeRed = true;
+            numberCellType36.NegativeRed = true;
-            numberCellType6.NullDisplay = "--";
+            numberCellType36.NullDisplay = "--";
-            numberCellType6.Separator = ",";
+            numberCellType36.Separator = ",";
-            numberCellType6.ShowSeparator = true;
+            numberCellType36.ShowSeparator = true;
-            numberCellType6.ShrinkToFit = true;
+            numberCellType36.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType36;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "금액";
             this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType88;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급";
             this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply";
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType7.DecimalPlaces = 0;
+            numberCellType37.DecimalPlaces = 0;
-            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType37.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType7.MaximumValue = 2147483647D;
+            numberCellType37.MaximumValue = 2147483647D;
-            numberCellType7.MinimumValue = -2147483648D;
+            numberCellType37.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType37;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType89;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project";
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(22).Tag = "project";
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType8.DecimalPlaces = 0;
+            numberCellType38.DecimalPlaces = 0;
-            numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType38.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType8.MaximumValue = 2147483647D;
+            numberCellType38.MaximumValue = 2147483647D;
-            numberCellType8.MinimumValue = -2147483648D;
+            numberCellType38.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType38;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Tag = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(23).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType90;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(24).Tag = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType91;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "예정일";
             this.fpSpread1_Sheet1.Columns.Get(25).Tag = "edate";
             this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType92;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "수령인";
             this.fpSpread1_Sheet1.Columns.Get(26).Tag = "receiveName";
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType93;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "indate";
             this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(27).Label = "입고일";
             this.fpSpread1_Sheet1.Columns.Get(27).Tag = "indate";
             this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F;
-            numberCellType9.DecimalPlaces = 0;
+            numberCellType39.DecimalPlaces = 0;
-            numberCellType9.NegativeRed = true;
+            numberCellType39.NegativeRed = true;
-            numberCellType9.ShowSeparator = true;
+            numberCellType39.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType39;
             this.fpSpread1_Sheet1.Columns.Get(28).DataField = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Label = "수량";
             this.fpSpread1_Sheet1.Columns.Get(28).Tag = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType94;
             this.fpSpread1_Sheet1.Columns.Get(29).DataField = "inremark";
             this.fpSpread1_Sheet1.Columns.Get(29).Label = "비고";
             this.fpSpread1_Sheet1.Columns.Get(29).Tag = "inremark";
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType95;
             this.fpSpread1_Sheet1.Columns.Get(30).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(30).Tag = "po";
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType96;
             this.fpSpread1_Sheet1.Columns.Get(31).DataField = "chkremark";
             this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType97;
             this.fpSpread1_Sheet1.Columns.Get(32).DataField = "purchase_manager";
             this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType97;
             this.fpSpread1_Sheet1.Columns.Get(33).DataField = "purchase_admin";
             this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(34).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(34).CellType = checkBoxCellType12;
             this.fpSpread1_Sheet1.Columns.Get(34).DataField = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(34).Tag = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(35).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType40;
             this.fpSpread1_Sheet1.Columns.Get(35).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(35).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(35).Tag = "idx";
             this.fpSpread1_Sheet1.Columns.Get(35).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(36).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType98;
             this.fpSpread1_Sheet1.Columns.Get(36).DataField = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(36).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(36).Tag = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(36).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(37).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType99;
             this.fpSpread1_Sheet1.Columns.Get(37).DataField = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(37).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(37).Tag = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(37).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(38).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(38).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(38).CellType = textCellType100;
             this.fpSpread1_Sheet1.Columns.Get(38).DataField = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(38).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(38).Tag = "conf_request";
@@ -1274,12 +1269,51 @@
             this.label2.Text = "--";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // 현재목록메일전송ToolStripMenuItem
+            // 메일전송ToolStripMenuItem
             // 
-            this.현재목록메일전송ToolStripMenuItem.Name = "현재목록메일전송ToolStripMenuItem";
+            this.메일전송ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.현재목록메일전송ToolStripMenuItem.Size = new System.Drawing.Size(208, 22);
+            this.현재목록ToolStripMenuItem,
-            this.현재목록메일전송ToolStripMenuItem.Text = "현재목록 메일전송";
+            this.선택목록ToolStripMenuItem,
-            this.현재목록메일전송ToolStripMenuItem.Click += new System.EventHandler(this.현재목록메일전송ToolStripMenuItem_Click);
+            this.toolStripSeparator7,
+            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(208, 22);
+            this.메일전송ToolStripMenuItem.Text = "메일 전송";
+            // 
+            // 현재목록ToolStripMenuItem
+            // 
+            this.현재목록ToolStripMenuItem.Name = "현재목록ToolStripMenuItem";
+            this.현재목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.현재목록ToolStripMenuItem.Text = "현재목록";
+            this.현재목록ToolStripMenuItem.Click += new System.EventHandler(this.현재목록ToolStripMenuItem_Click);
+            // 
+            // 선택목록ToolStripMenuItem
+            // 
+            this.선택목록ToolStripMenuItem.Name = "선택목록ToolStripMenuItem";
+            this.선택목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.선택목록ToolStripMenuItem.Text = "선택목록";
+            this.선택목록ToolStripMenuItem.Click += new System.EventHandler(this.선택목록ToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
+            // 
+            // 현재목록입고양식ToolStripMenuItem
+            // 
+            this.현재목록입고양식ToolStripMenuItem.Name = "현재목록입고양식ToolStripMenuItem";
+            this.현재목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.현재목록입고양식ToolStripMenuItem.Text = "현재목록(입고양식)";
+            this.현재목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.현재목록입고양식ToolStripMenuItem_Click);
+            // 
+            // 선택목록입고양식ToolStripMenuItem
+            // 
+            this.선택목록입고양식ToolStripMenuItem.Name = "선택목록입고양식ToolStripMenuItem";
+            this.선택목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.선택목록입고양식ToolStripMenuItem.Text = "선택목록(입고양식)";
+            this.선택목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.선택목록입고양식ToolStripMenuItem_Click);
             // 
             // fPurchaseCR
             // 
@@ -1380,7 +1414,6 @@
         private System.Windows.Forms.ToolStripMenuItem cRCF검색ToolStripMenuItem;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ToolStripDropDownButton toolStripButton7;
-        private System.Windows.Forms.ToolStripMenuItem 입고품목메일전송ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 엑셀에서가져오기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton3;
         private FarPoint.Win.Spread.FpSpread fpSpread1;
@@ -1400,6 +1433,11 @@
         private System.Windows.Forms.ToolStripTextBox tbAdmin;
         private System.Windows.Forms.ToolStripButton toolStripButton8;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
-        private System.Windows.Forms.ToolStripMenuItem 현재목록메일전송ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+        private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem;
     }
 }

SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs

@@ -779,6 +779,173 @@ namespace FEQ0000
             refreshData();
         }
 
+        List<dsPurchase.EETGW_PurchaseCRRow> GetDatarows(bool all = false)
+        {
+            List<dsPurchase.EETGW_PurchaseCRRow> rows = new List<dsPurchase.EETGW_PurchaseCRRow>();
+
+            if (all)
+            {
+                var drows = (dsPurchase.EETGW_PurchaseCRRow[])(this.dsPurchase.EETGW_PurchaseCR.Select(this.bs.Filter, this.bs.Sort)); ;
+                foreach (var dr in drows)
+                    rows.Add(dr);
+            }
+            else
+            {
+                //선택된 자료의 데이터를 추출한다.
+                var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+                List<int> rowidxs = new List<int>();
+                var idxcol = this.fpSpread1_Sheet1.Columns["idx"];
+                var idxconf = this.fpSpread1_Sheet1.Columns["conf_status"];
+                var idxstatus = this.fpSpread1_Sheet1.Columns["state"];
+                foreach (var item in selected)
+                {
+                    for (int i = item.Row; i < item.Row + item.RowCount; i++)
+                    {
+                        if (rowidxs.Contains(i) == false)
+                        {
+                            if (fpSpread1_Sheet1.IsRowBound(i))
+                            {
+                                var confsta = fpSpread1.ActiveSheet.GetValue(i, idxconf.Index);
+                                var state = fpSpread1.ActiveSheet.GetValue(i, idxstatus.Index);
+                                //if (state != null && state.ToString() != "---")
+                                //{
+                                //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신규 요청데이터가 아닙니다");
+                                //}
+                                //else if (confsta != null && confsta.ToString() != "0")
+                                //{
+                                //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신청이 완료된 자료 입니다");
+                                //}
+                                // else
+                                rowidxs.Add(i);
+                            }
+                        }
+                    }
+                }
+
+                //수집된데이터를 보내야한다.
+
+                var idx = 0;
+                foreach (var i in rowidxs)
+                {
+                    var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
+                    var row = this.dsPurchase.EETGW_PurchaseCR.Where(t => t.idx == rowidx).First();
+                    rows.Add(row);
+                }
+                if (rows.Any() == false)
+                {
+                    if (this.bs.Count > 0)
+                    {
+                        var drv = this.bs.Current as DataRowView;
+                        rows.Add(drv.Row as dsPurchase.EETGW_PurchaseCRRow);
+                    }
+                }
+            }
+
+            return rows;
+
+        }
+
+        void MailSendNoForm(bool alldata, string cate = "")
+        {
+            var form_subject = "";
+            var form_body = "";
+            var form_to = "";
+            var form_cc = "{요청}";
+            var form_bcc = "";//f.tbBcc.Text.Trim();
+            bool attachfile = true;
+            bool attachlist = true;
+
+            if (cate.isEmpty() == false)
+            {
+                var db = new DataClasses1DataContext();
+                var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
+                var f = new Purchase.fMailForm(cate);
+                if (f.ShowDialog() != DialogResult.OK) return;
+
+                form_subject = f.tbSubject.Text.Trim();
+                form_body = f.htmlEditor1.Html;
+                form_to = f.tbTo.Text.Trim();
+                form_cc = f.tbCC.Text.Trim();
+                form_bcc = f.tbBcc.Text.Trim();
+                attachfile = f.chkAttach.Checked;
+                attachlist = f.chkList.Checked;
+            }
+
+            //현재표시데이터중에 수신자목록을 가져온다
+            var drows = this.GetDatarows(alldata);
+            var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
+            var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
+
+
+            List<string> tolist = new List<string>();   //최종받는사람
+            List<string> cclist = new List<string>();
+            List<string> bcclist = new List<string>();
+
+            //받는사람
+            if (form_to.Contains("{요청}") == true) tolist.AddRange(grp_req);
+            if (form_to.Contains("{수령}") == true) tolist.AddRange(grp_rec);
+            form_to = form_to.Replace("{요청}", "");
+            form_to = form_to.Replace("{수령}", "");
+            tolist.AddRange(form_to.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
+            tolist = ChangeMailAddress(tolist);
+
+            //참조
+            if (form_cc.Contains("{요청}") == true) cclist.AddRange(grp_req);
+            if (form_cc.Contains("{수령}") == true) cclist.AddRange(grp_rec);
+            form_cc = form_cc.Replace("{요청}", "");
+            form_cc = form_cc.Replace("{수령}", "");
+            cclist.AddRange(form_cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
+            cclist = ChangeMailAddress(cclist);
+
+            //숨은참조
+            if (form_bcc.Contains("{요청}") == true) bcclist.AddRange(grp_req);
+            if (form_bcc.Contains("{수령}") == true) bcclist.AddRange(grp_rec);
+            form_bcc = form_bcc.Replace("{요청}", "");
+            form_bcc = form_bcc.Replace("{수령}", "");
+            bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
+            bcclist = ChangeMailAddress(bcclist);
+
+            var datestr = DateTime.Now.ToShortDateString();
+            if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
+            else datestr = dtSD.Text + "~" + dtED.Text;
+            form_subject = form_subject.Replace("{DATE}", datestr);
+
+            try
+            {
+                Outlook.Application outlookApplication = new Outlook.Application();
+                var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
+                newMail.Display();
+                newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title;
+                newMail.To = string.Join(";", tolist.ToArray());
+                newMail.CC = string.Join(";", cclist.ToArray());
+                newMail.BCC = string.Join(";", bcclist.ToArray());
+                string fn = "";
+                if (attachfile)
+                {
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseNRI_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    if (fi.Directory.Exists == false) fi.Directory.Create();
+                    fn = fi.FullName;
+                }
+
+                var tabledata = UTIL_EQ0000.MakeDataTableToHTML(drows, fn);
+                if (attachlist)
+                {
+                    form_body += "<br />" + tabledata;
+                }
+
+                if (fn.isEmpty() == false)
+                    newMail.Attachments.Add(fn);
+
+                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
+                form_body = form_body.Replace("{DATE}", datestr);
+                newMail.HTMLBody = form_body + newMail.HTMLBody; //
+            }
+            catch (Exception ex)
+            {
+                util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
+                    "아웃룩의 설정이 정상인지 확인하세요");
+            }
+        }
 
         void func_copy()
         {
@@ -941,16 +1108,6 @@ namespace FEQ0000
             else this.label2.Visible = false;
         }
 
-        private void toolStripButton4_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        string getmaxstr(string src, int len = 30)
-        {
-            if (src.Length > len) return src.Substring(0, len) + "...";
-            else return src;
-        }
 
         List<string> ChangeMailAddress(List<string> userid)
         {
@@ -980,16 +1137,6 @@ namespace FEQ0000
         }
 
 
-        private void toolStripButton6_Click(object sender, EventArgs e)
-        {
-            //선택된 줄의 데이터를 생성하낟.
-            var drv = this.bs.Current as DataRowView;
-            if (drv == null) return;
-            var dr = drv.Row as dsPurchase.EETGW_PurchaseCRRow;
-            string buffer = string.Format("{0}_{1}", dr.pumname.Replace("_", "-"), dr.pumscale.Replace("_", "-"), dr.dept.Replace("_", "-"), dr.manuproc.Replace("_", "-"), dr.asset.Replace("_", "-"));
-            Clipboard.SetText(buffer);
-            //FCOMMON.Util.MsgI("다음 데이터가 클립보드에 저장됨\n\n" + buffer);  190131
-        }
 
         private void dtSD_DoubleClick(object sender, EventArgs e)
         {
@@ -1014,190 +1161,7 @@ namespace FEQ0000
             f.Show();
         }
 
-        private void 입고품목메일전송ToolStripMenuItem_Click(object sender, EventArgs e)
+    
-        {
-
-            var db = new DataClasses1DataContext();
-            var dr = db.MailForm.Where(t => t.cate == "PD").FirstOrDefault();
-
-            //현재표시데이터중에 수신자목록을 가져온다
-            var drows = (dsPurchase.EETGW_PurchaseCRRow[])(this.dsPurchase.EETGW_PurchaseCR.Select(this.bs.Filter, this.bs.Sort));
-            var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
-            var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
-
-            var f = new Purchase.fMailForm("PD");
-            if (f.ShowDialog() != DialogResult.OK) return;
-
-            var form_subject = f.tbSubject.Text.Trim();
-            var form_body = f.htmlEditor1.Html;
-            var form_to = f.tbTo.Text.Trim();
-            var form_cc = f.tbCC.Text.Trim();
-            var form_bcc = f.tbBcc.Text.Trim();
-
-            List<string> tolist = new List<string>();   //최종받는사람
-            List<string> cclist = new List<string>();
-            List<string> bcclist = new List<string>();
-
-            //받는사람
-            if (form_to.Contains("{요청}") == true) tolist.AddRange(grp_req);
-            if (form_to.Contains("{수령}") == true) tolist.AddRange(grp_rec);
-            form_to = form_to.Replace("{요청}", "");
-            form_to = form_to.Replace("{수령}", "");
-            tolist.AddRange(form_to.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            tolist = ChangeMailAddress(tolist);
-
-            //참조
-            if (form_cc.Contains("{요청}") == true) cclist.AddRange(grp_req);
-            if (form_cc.Contains("{수령}") == true) cclist.AddRange(grp_rec);
-            form_cc = form_cc.Replace("{요청}", "");
-            form_cc = form_cc.Replace("{수령}", "");
-            cclist.AddRange(form_cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            cclist = ChangeMailAddress(cclist);
-
-            //숨은참조
-            if (form_bcc.Contains("{요청}") == true) bcclist.AddRange(grp_req);
-            if (form_bcc.Contains("{수령}") == true) bcclist.AddRange(grp_rec);
-            form_bcc = form_bcc.Replace("{요청}", "");
-            form_bcc = form_bcc.Replace("{수령}", "");
-            bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            bcclist = ChangeMailAddress(bcclist);
-
-            var datestr = DateTime.Now.ToShortDateString();
-            if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
-            else datestr = dtSD.Text + "~" + dtED.Text;
-            form_subject = form_subject.Replace("{DATE}", datestr);
-
-            try
-            {
-                Outlook.Application outlookApplication = new Outlook.Application();
-                var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
-                newMail.Display();
-                newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title;
-                newMail.To = string.Join(";", tolist.ToArray());
-                newMail.CC = string.Join(";", cclist.ToArray());
-                newMail.BCC = string.Join(";", bcclist.ToArray());
-                if (f.chkAttach.Checked)
-                {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseCR_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
-                    if (fi.Directory.Exists == false) fi.Directory.Create();
-
-                    ///save file
-                    fpSpread1.SaveExcel(fi.FullName,
-                           FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                           | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                           | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                           | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-
-                    newMail.Attachments.Add(fi.FullName);
-                }
-                if (f.chkList.Checked)
-                {
-                    //목록을 본문에 추가한다
-                    System.Text.StringBuilder sb = new StringBuilder();
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>신청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>요청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>CR/CF</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수령</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SID</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품명</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급</td>");
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    var col_신청 = fpSpread1_Sheet1.Columns["pdate"].Index;
-                    var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index;
-                    var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index;
-
-                    var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index;
-                    var col_SID = fpSpread1_Sheet1.Columns["sid"].Index;
-                    var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index;
-                    var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index;
-                    var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index;
-                    var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index;
-                    var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index;
-                    var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index;
-                    var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index;
-
-
-                    for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++)
-                    {
-                        var v신청 = fpSpread1_Sheet1.Cells[i, col_신청].Value;
-                        var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value;
-                        var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value;
-
-                        var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value;
-                        var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value;
-                        var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value;
-                        var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value;
-                        var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value;
-                        var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value;
-                        var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value;
-                        var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value;
-                        var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value;
-
-                        var s신청 = String.Empty;
-                        var s요청 = String.Empty;
-                        var sCRCF = String.Empty;
-                        var s수령 = String.Empty;
-                        var sSID = String.Empty;
-                        var s품명 = String.Empty;
-                        var s규격 = String.Empty;
-                        var s수량 = "0";
-                        var s단가 = "0";
-                        var s금액 = "0";
-                        var s입고 = String.Empty;
-                        var s공급 = String.Empty;
-                        var s비고 = String.Empty;
-
-                        if (v신청 != null) s신청 = v신청.ToString();
-                        if (v요청 != null) s요청 = v요청.ToString();
-                        if (vCRCF != null) sCRCF = vCRCF.ToString();
-                        if (v수령 != null) s수령 = v수령.ToString();
-                        if (vSID != null) sSID = vSID.ToString();
-                        if (v품명 != null) s품명 = v품명.ToString();
-                        if (v규격 != null) s규격 = v규격.ToString();
-                        if (v수량 != null) s수량 = v수량.ToString();
-                        if (v단가 != null) s단가 = v단가.ToString();
-                        if (v금액 != null) s금액 = v금액.ToString();
-                        if (v공급 != null) s공급 = v공급.ToString();
-
-                        sb.AppendLine("<tr>");
-                        sb.AppendLine("<td>" + getmaxstr(s신청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s요청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sCRCF) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s수령) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sSID) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s품명) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s규격) + "</td>");
-                        sb.AppendLine("<td style='text-align:center'>" + int.Parse(s수량).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s단가).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s금액).ToString("N0") + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s공급) + "</td>");
-
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    form_body += sb.ToString();
-                }
-
-                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
-                form_body = form_body.Replace("{DATE}", datestr);
-                newMail.HTMLBody = form_body + newMail.HTMLBody; //
-            }
-            catch (Exception ex)
-            {
-                util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
-                    "아웃룩의 설정이 정상인지 확인하세요");
-            }
-        }
-
         private void toolStripButton3_Click_1(object sender, EventArgs e)
         {
             var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "PurcManual.pdf");
@@ -1437,189 +1401,25 @@ namespace FEQ0000
             FormattingData();
         }
 
-        private void 현재목록메일전송ToolStripMenuItem_Click(object sender, EventArgs e)
+       
+        private void 현재목록ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var cate = "PO";
+            MailSendNoForm(true);
+        }
 
-            var db = new DataClasses1DataContext();
+        private void 선택목록ToolStripMenuItem_Click(object sender, EventArgs e)
-            var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
+        {
+            MailSendNoForm(false);
+        }
 
-            //현재표시데이터중에 수신자목록을 가져온다
+        private void 현재목록입고양식ToolStripMenuItem_Click(object sender, EventArgs e)
-            var drows = (dsPurchase.EETGW_PurchaseEBRow[])(this.dsPurchase.EETGW_PurchaseEB.Select(this.bs.Filter, this.bs.Sort));
+        {
-            var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
+            MailSendNoForm(true, "PD");
-            var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
+        }
 
-            var f = new Purchase.fMailForm(cate);
+        private void 선택목록입고양식ToolStripMenuItem_Click(object sender, EventArgs e)
-            if (f.ShowDialog() != DialogResult.OK) return;
+        {
-
+            MailSendNoForm(false, "PD");
-            var form_subject = f.tbSubject.Text.Trim();
-            var form_body = f.htmlEditor1.Html;
-            var form_to = f.tbTo.Text.Trim();
-            var form_cc = f.tbCC.Text.Trim();
-            var form_bcc = f.tbBcc.Text.Trim();
-
-            List<string> tolist = new List<string>();   //최종받는사람
-            List<string> cclist = new List<string>();
-            List<string> bcclist = new List<string>();
-
-            //받는사람
-            if (form_to.Contains("{요청}") == true) tolist.AddRange(grp_req);
-            if (form_to.Contains("{수령}") == true) tolist.AddRange(grp_rec);
-            form_to = form_to.Replace("{요청}", "");
-            form_to = form_to.Replace("{수령}", "");
-            tolist.AddRange(form_to.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            tolist = ChangeMailAddress(tolist);
-
-            //참조
-            if (form_cc.Contains("{요청}") == true) cclist.AddRange(grp_req);
-            if (form_cc.Contains("{수령}") == true) cclist.AddRange(grp_rec);
-            form_cc = form_cc.Replace("{요청}", "");
-            form_cc = form_cc.Replace("{수령}", "");
-            cclist.AddRange(form_cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            cclist = ChangeMailAddress(cclist);
-
-            //숨은참조
-            if (form_bcc.Contains("{요청}") == true) bcclist.AddRange(grp_req);
-            if (form_bcc.Contains("{수령}") == true) bcclist.AddRange(grp_rec);
-            form_bcc = form_bcc.Replace("{요청}", "");
-            form_bcc = form_bcc.Replace("{수령}", "");
-            bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            bcclist = ChangeMailAddress(bcclist);
-
-            var datestr = DateTime.Now.ToShortDateString();
-            if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
-            else datestr = dtSD.Text + "~" + dtED.Text;
-            form_subject = form_subject.Replace("{DATE}", datestr);
-
-            try
-            {
-                Outlook.Application outlookApplication = new Outlook.Application();
-                var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
-                newMail.Display();
-                newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title;
-                newMail.To = string.Join(";", tolist.ToArray());
-                newMail.CC = string.Join(";", cclist.ToArray());
-                newMail.BCC = string.Join(";", bcclist.ToArray());
-                if (f.chkAttach.Checked)
-                {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseListEB_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
-                    if (fi.Directory.Exists == false) fi.Directory.Create();
-
-                    ///save file
-                    fpSpread1.SaveExcel(fi.FullName,
-                           FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                           | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                           | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                           | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-
-                    newMail.Attachments.Add(fi.FullName);
-                }
-                if (f.chkList.Checked)
-                {
-                    //목록을 본문에 추가한다
-                    System.Text.StringBuilder sb = new StringBuilder();
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>신청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>요청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>CR/CF</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수령</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SID</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품명</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급</td>");
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    var col_신청 = fpSpread1_Sheet1.Columns["pdate"].Index;
-                    var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index;
-                    var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index;
-
-                    var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index;
-                    var col_SID = fpSpread1_Sheet1.Columns["sid"].Index;
-                    var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index;
-                    var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index;
-                    var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index;
-                    var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index;
-                    var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index;
-                    var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index;
-                    var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index;
-
-
-                    for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++)
-                    {
-                        var v신청 = fpSpread1_Sheet1.Cells[i, col_신청].Value;
-                        var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value;
-                        var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value;
-
-                        var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value;
-                        var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value;
-                        var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value;
-                        var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value;
-                        var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value;
-                        var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value;
-                        var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value;
-                        var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value;
-                        var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value;
-
-                        var s신청 = String.Empty;
-                        var s요청 = String.Empty;
-                        var sCRCF = String.Empty;
-                        var s수령 = String.Empty;
-                        var sSID = String.Empty;
-                        var s품명 = String.Empty;
-                        var s규격 = String.Empty;
-                        var s수량 = "0";
-                        var s단가 = "0";
-                        var s금액 = "0";
-                        var s입고 = String.Empty;
-                        var s공급 = String.Empty;
-                        var s비고 = String.Empty;
-
-                        if (v신청 != null) s신청 = v신청.ToString();
-                        if (v요청 != null) s요청 = v요청.ToString();
-                        if (vCRCF != null) sCRCF = vCRCF.ToString();
-                        if (v수령 != null) s수령 = v수령.ToString();
-                        if (vSID != null) sSID = vSID.ToString();
-                        if (v품명 != null) s품명 = v품명.ToString();
-                        if (v규격 != null) s규격 = v규격.ToString();
-                        if (v수량 != null) s수량 = v수량.ToString();
-                        if (v단가 != null) s단가 = v단가.ToString();
-                        if (v금액 != null) s금액 = v금액.ToString();
-                        if (v공급 != null) s공급 = v공급.ToString();
-
-                        sb.AppendLine("<tr>");
-                        sb.AppendLine("<td>" + getmaxstr(s신청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s요청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sCRCF) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s수령) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sSID) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s품명) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s규격) + "</td>");
-                        sb.AppendLine("<td style='text-align:center'>" + int.Parse(s수량).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s단가).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s금액).ToString("N0") + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s공급) + "</td>");
-
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    form_body += sb.ToString();
-                }
-
-                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
-                form_body = form_body.Replace("{DATE}", datestr);
-                newMail.HTMLBody = form_body + newMail.HTMLBody; //
-            }
-            catch (Exception ex)
-            {
-                util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
-                    "아웃룩의 설정이 정상인지 확인하세요");
-            }
         }
     }
 }

SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx

@@ -281,7 +281,7 @@
         brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="입고품목메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQfAPr8/VVritvj7IqsyElVa+Ps9MvT2rvc/aPQ/KrU/Or0/nmYspzN/LbZ/FJgeXiQ
         q0NLXHWPrJnA1sDf/CkxQ9RSXD5FVa/X/H2fudPn8HyjwMPg/WV/nG+Or////////yH/C05FVFNDQVBF

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs

@@ -314,11 +314,6 @@ namespace FEQ0000
 
         }
 
-        private void toolStripButton3_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void bs_CurrentChanged(object sender, EventArgs e)
         {
             var dr = bs.Current as dsPurchase.EETGW_PurchaseCRRow;
@@ -328,10 +323,7 @@ namespace FEQ0000
             //else richTextBox2.Text = dr.bigo;
         }
 
-        private void toolStripButton4_Click(object sender, EventArgs e)
+  
-        {
-
-        }
 
         string getmaxstr(string src, int len = 30)
         {
@@ -440,77 +432,25 @@ namespace FEQ0000
                 newMail.To = string.Join(";", tolist.ToArray());
                 newMail.CC = string.Join(";", cclist.ToArray());
                 newMail.BCC = string.Join(";", bcclist.ToArray());
+                string fn = "";
                 if (f.chkAttach.Checked)
                 {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_confirmcr_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_confirmeb_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
                     if (fi.Directory.Exists == false) fi.Directory.Create();
+                    fn = fi.FullName;
+                    //FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName);
 
-                    FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName);
 
-                
+                    //newMail.Attachments.Add(fi.FullName);
-                    newMail.Attachments.Add(fi.FullName);
                 }
-                if (f.chkList.Checked)
+                var rows = this.rows;
-                {
+                var tabledata = UTIL_EQ0000.MakeDataTableToHTML(rows, fn);
 
-                    //목록을 본문에 추가한다
-                    System.Text.StringBuilder sb = new StringBuilder();
-            
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
 
-                    foreach (DataGridViewColumn col in this.dataGridView1.Columns)
+                if (fn.isEmpty() == false)
-                    {
+                    newMail.Attachments.Add(fn);
-                        if (col.DataPropertyName.ToLower() == "pumqty") continue;
-                        sb.AppendLine($"<td style='text-align:center;background-color: aqua;'>{col.HeaderText}</td>");
-                    }
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    for (int i = 0; i < this.dataGridView1.RowCount; i++)
-                    {
-
-                        sb.AppendLine("<tr>");
-
-                        foreach (DataGridViewColumn col in this.dataGridView1.Columns)
-                        {
-                            if (col.DataPropertyName.ToLower() == "pumqty") continue;
-                            var v = dataGridView1.Rows[i].Cells[col.Index].Value;
-                            string value = "";
-                            if (v != null) value = v.ToString();
-
-                            if (col.ValueType == typeof(int))
-                            {
-                                var ivalue = (int)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N0}</td>");
-                            }
-                            else if (col.ValueType == typeof(decimal))
-                            {
-                                var ivalue = (decimal)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N0}</td>");
-                            }
-                            else if (col.ValueType == typeof(float))
-                            {
-                                var ivalue = (float)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N1}</td>");
-                            }
-                            else if (col.ValueType == typeof(double))
-                            {
-                                var ivalue = (double)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N1}</td>");
-                            }
-                            else sb.AppendLine($"<td>{getmaxstr(value)}</td>");
-                        }
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    sb.AppendLine($"항목:{this.bs.Count}건,합계금액:{lbSum.Text}");
-                    form_body = form_body.Replace("{body}", sb.ToString());
-                }
-
-                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
 
+                form_body = form_body.Replace("{body}", tabledata);
                 newMail.HTMLBody = form_body + newMail.HTMLBody; //
             }
             catch (Exception ex)

SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs

@@ -30,37 +30,37 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseEB));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType121 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType122 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType123 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType124 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType125 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType126 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType127 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType128 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType129 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType130 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType41 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType61 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType131 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType42 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType62 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType43 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType63 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType132 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType44 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType64 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType133 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType45 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType65 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType46 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType66 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType134 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType47 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType67 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType48 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType68 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType135 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType136 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType97 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType137 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType49 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType69 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType98 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType138 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType99 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType139 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType7 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType50 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType70 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType100 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType140 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
@@ -94,10 +94,8 @@
             this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.구매승인양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripButton7 = new System.Windows.Forms.ToolStripDropDownButton();
-            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.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
             this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -143,6 +141,12 @@
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
+            this.메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.현재목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.선택목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.현재목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.선택목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -255,6 +259,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";
@@ -381,6 +386,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);
@@ -439,10 +445,9 @@
             // toolStripButton7
             // 
             this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.입고품목메일전송ToolStripMenuItem,
+            this.메일전송ToolStripMenuItem,
             this.엑셀에서가져오기ToolStripMenuItem,
             this.견적서폴더열기ToolStripMenuItem,
-            this.현재목록메일전송ToolStripMenuItem,
             this.toolStripMenuItem2});
             this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
             this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
@@ -450,14 +455,6 @@
             this.toolStripButton7.Size = new System.Drawing.Size(60, 23);
             this.toolStripButton7.Text = "기능";
             // 
-            // 입고품목메일전송ToolStripMenuItem
-            // 
-            this.입고품목메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("입고품목메일전송ToolStripMenuItem.Image")));
-            this.입고품목메일전송ToolStripMenuItem.Name = "입고품목메일전송ToolStripMenuItem";
-            this.입고품목메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
-            this.입고품목메일전송ToolStripMenuItem.Text = "입고 품목 메일 전송";
-            this.입고품목메일전송ToolStripMenuItem.Click += new System.EventHandler(this.입고품목메일전송ToolStripMenuItem_Click);
-            // 
             // 엑셀에서가져오기ToolStripMenuItem
             // 
             this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image")));
@@ -474,13 +471,6 @@
             this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기";
             this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click);
             // 
-            // 현재목록메일전송ToolStripMenuItem
-            // 
-            this.현재목록메일전송ToolStripMenuItem.Name = "현재목록메일전송ToolStripMenuItem";
-            this.현재목록메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
-            this.현재목록메일전송ToolStripMenuItem.Text = "현재 목록 메일 전송";
-            this.현재목록메일전송ToolStripMenuItem.Click += new System.EventHandler(this.현재목록메일전송ToolStripMenuItem_Click);
-            // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
@@ -661,6 +651,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";
@@ -677,6 +668,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";
@@ -732,6 +724,7 @@
             // 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;
@@ -878,7 +871,7 @@
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType81;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType121;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Label = "구매신청일";
@@ -887,7 +880,7 @@
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType82;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType122;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
@@ -895,7 +888,7 @@
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType83;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType123;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "site";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE";
@@ -903,7 +896,7 @@
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType84;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType124;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "dept";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "분류";
@@ -911,13 +904,13 @@
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 100F;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType85;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType125;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName";
             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).Tag = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType86;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType126;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#";
@@ -925,7 +918,7 @@
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType87;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType127;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "SCR/CF";
@@ -933,208 +926,208 @@
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType88;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType128;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령";
             this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(7).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType89;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType129;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#";
             this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid";
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType90;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType130;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname";
             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).Tag = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(9).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType41.DecimalPlaces = 0;
+            numberCellType61.DecimalPlaces = 0;
-            numberCellType41.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType61.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType41.MaximumValue = 2147483647D;
+            numberCellType61.MaximumValue = 2147483647D;
-            numberCellType41.MinimumValue = -2147483648D;
+            numberCellType61.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType41;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType61;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx";
             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).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType91;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType131;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격";
             this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 119F;
-            numberCellType42.DecimalPlaces = 0;
+            numberCellType62.DecimalPlaces = 0;
-            numberCellType42.NegativeRed = true;
+            numberCellType62.NegativeRed = true;
-            numberCellType42.NullDisplay = "--";
+            numberCellType62.NullDisplay = "--";
-            numberCellType42.Separator = ",";
+            numberCellType62.Separator = ",";
-            numberCellType42.ShowSeparator = true;
+            numberCellType62.ShowSeparator = true;
-            numberCellType42.ShrinkToFit = true;
+            numberCellType62.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType42;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType62;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumqtyReq";
             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "수량\r\n(요청)";
             this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(12).Width = 119F;
-            numberCellType43.DecimalPlaces = 0;
+            numberCellType63.DecimalPlaces = 0;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType43;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType63;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량\r\n(구매)";
             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType92;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType132;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumunit";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "단위";
             this.fpSpread1_Sheet1.Columns.Get(14).Width = 119F;
-            numberCellType44.DecimalPlaces = 2;
+            numberCellType64.DecimalPlaces = 2;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType44;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType64;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumpriceD";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가\r\n(해외)";
             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType93;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType133;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "currency";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "통화";
             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 119F;
-            numberCellType45.DecimalPlaces = 0;
+            numberCellType65.DecimalPlaces = 0;
-            numberCellType45.MaximumValue = 9999999999999.99D;
+            numberCellType65.MaximumValue = 9999999999999.99D;
-            numberCellType45.MinimumValue = -9999999999999.99D;
+            numberCellType65.MinimumValue = -9999999999999.99D;
-            numberCellType45.NegativeRed = true;
+            numberCellType65.NegativeRed = true;
-            numberCellType45.NullDisplay = "--";
+            numberCellType65.NullDisplay = "--";
-            numberCellType45.Separator = ",";
+            numberCellType65.Separator = ",";
-            numberCellType45.ShowSeparator = true;
+            numberCellType65.ShowSeparator = true;
-            numberCellType45.ShrinkToFit = true;
+            numberCellType65.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType45;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType65;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가";
             this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(17).Width = 119F;
-            numberCellType46.DecimalPlaces = 0;
+            numberCellType66.DecimalPlaces = 0;
-            numberCellType46.MaximumValue = 9999999999999.99D;
+            numberCellType66.MaximumValue = 9999999999999.99D;
-            numberCellType46.MinimumValue = -9999999999999.99D;
+            numberCellType66.MinimumValue = -9999999999999.99D;
-            numberCellType46.NegativeRed = true;
+            numberCellType66.NegativeRed = true;
-            numberCellType46.NullDisplay = "--";
+            numberCellType66.NullDisplay = "--";
-            numberCellType46.Separator = ",";
+            numberCellType66.Separator = ",";
-            numberCellType46.ShowSeparator = true;
+            numberCellType66.ShowSeparator = true;
-            numberCellType46.ShrinkToFit = true;
+            numberCellType66.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType46;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType66;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액";
             this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(18).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType94;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType134;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply";
             this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체";
             this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply";
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType47.DecimalPlaces = 0;
+            numberCellType67.DecimalPlaces = 0;
-            numberCellType47.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType67.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType47.MaximumValue = 2147483647D;
+            numberCellType67.MaximumValue = 2147483647D;
-            numberCellType47.MinimumValue = -2147483648D;
+            numberCellType67.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType47;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType67;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(20).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType48.DecimalPlaces = 0;
+            numberCellType68.DecimalPlaces = 0;
-            numberCellType48.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType68.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType48.MaximumValue = 2147483647D;
+            numberCellType68.MaximumValue = 2147483647D;
-            numberCellType48.MinimumValue = -2147483648D;
+            numberCellType68.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType48;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType68;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(21).Tag = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(21).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 119F;
-            textCellType95.WordWrap = true;
+            textCellType135.WordWrap = true;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType95;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType135;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고(구매사유)\r\n(요청자)";
             this.fpSpread1_Sheet1.Columns.Get(22).Tag = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType96;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType136;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate";
             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 = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType97;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType137;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate";
             this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일";
             this.fpSpread1_Sheet1.Columns.Get(24).Tag = "indate";
             this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F;
-            numberCellType49.DecimalPlaces = 0;
+            numberCellType69.DecimalPlaces = 0;
-            numberCellType49.NegativeRed = true;
+            numberCellType69.NegativeRed = true;
-            numberCellType49.ShowSeparator = true;
+            numberCellType69.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType49;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType69;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고수량";
             this.fpSpread1_Sheet1.Columns.Get(25).Tag = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType98;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType138;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "PO#";
             this.fpSpread1_Sheet1.Columns.Get(26).Tag = "po";
             this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F;
-            textCellType99.WordWrap = true;
+            textCellType139.WordWrap = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType99;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType139;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "chkremark";
             this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(27).Label = "비고\r\n(담당자)";
             this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(27).Width = 119F;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType7;
             this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨";
             this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(28).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(29).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType50;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType70;
             this.fpSpread1_Sheet1.Columns.Get(29).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(29).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(29).Tag = "idx";
             this.fpSpread1_Sheet1.Columns.Get(29).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(29).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(30).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType100;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType140;
             this.fpSpread1_Sheet1.Columns.Get(30).DataField = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(30).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(30).Tag = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(30).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(31).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType100;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType140;
             this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(31).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(31).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(31).Width = 119F;
             this.fpSpread1_Sheet1.Columns.Get(32).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType100;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType140;
             this.fpSpread1_Sheet1.Columns.Get(32).DataField = "conf_reponse";
             this.fpSpread1_Sheet1.Columns.Get(32).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(32).Tag = "conf_reponse";
@@ -1171,6 +1164,52 @@
             this.label2.Text = "--";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // 메일전송ToolStripMenuItem
+            // 
+            this.메일전송ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.현재목록ToolStripMenuItem,
+            this.선택목록ToolStripMenuItem,
+            this.toolStripSeparator7,
+            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(180, 22);
+            this.메일전송ToolStripMenuItem.Text = "메일 전송";
+            // 
+            // 현재목록ToolStripMenuItem
+            // 
+            this.현재목록ToolStripMenuItem.Name = "현재목록ToolStripMenuItem";
+            this.현재목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.현재목록ToolStripMenuItem.Text = "현재목록";
+            this.현재목록ToolStripMenuItem.Click += new System.EventHandler(this.현재목록ToolStripMenuItem_Click);
+            // 
+            // 선택목록ToolStripMenuItem
+            // 
+            this.선택목록ToolStripMenuItem.Name = "선택목록ToolStripMenuItem";
+            this.선택목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.선택목록ToolStripMenuItem.Text = "선택목록";
+            this.선택목록ToolStripMenuItem.Click += new System.EventHandler(this.선택목록ToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
+            // 
+            // 현재목록입고양식ToolStripMenuItem
+            // 
+            this.현재목록입고양식ToolStripMenuItem.Name = "현재목록입고양식ToolStripMenuItem";
+            this.현재목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.현재목록입고양식ToolStripMenuItem.Text = "현재목록(입고양식)";
+            this.현재목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.현재목록입고양식ToolStripMenuItem_Click);
+            // 
+            // 선택목록입고양식ToolStripMenuItem
+            // 
+            this.선택목록입고양식ToolStripMenuItem.Name = "선택목록입고양식ToolStripMenuItem";
+            this.선택목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.선택목록입고양식ToolStripMenuItem.Text = "선택목록(입고양식)";
+            this.선택목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.선택목록입고양식ToolStripMenuItem_Click);
+            // 
             // fPurchaseEB
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1271,7 +1310,6 @@
         private System.Windows.Forms.ToolStripMenuItem 구매승인양식ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton6;
         private System.Windows.Forms.ToolStripDropDownButton toolStripButton7;
-        private System.Windows.Forms.ToolStripMenuItem 입고품목메일전송ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 엑셀에서가져오기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 견적서폴더열기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton4;
@@ -1280,9 +1318,14 @@
         private System.Windows.Forms.ToolStripMenuItem 엑셀에서열기ToolStripMenuItem;
         private dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter ta;
         private System.Windows.Forms.ToolStripButton toolStripButton8;
-        private System.Windows.Forms.ToolStripMenuItem 현재목록메일전송ToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
         private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+        private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+        private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem;
     }
 }

SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs

@@ -1015,101 +1015,7 @@ namespace FEQ0000
 
         private void 입고품목메일전송ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var cate = "PF";
+            
-
-            var db = new DataClasses1DataContext();
-            var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
-
-            //현재표시데이터중에 수신자목록을 가져온다
-            var drows = (dsPurchase.EETGW_PurchaseEBRow[])(this.dsPurchase.EETGW_PurchaseEB.Select(this.bs.Filter, this.bs.Sort));
-            var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
-            var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
-
-            var f = new Purchase.fMailForm(cate);
-            if (f.ShowDialog() != DialogResult.OK) return;
-
-            var form_subject = f.tbSubject.Text.Trim();
-            var form_body = f.htmlEditor1.Html;
-            var form_to = f.tbTo.Text.Trim();
-            var form_cc = f.tbCC.Text.Trim();
-            var form_bcc = f.tbBcc.Text.Trim();
-
-            List<string> tolist = new List<string>();   //최종받는사람
-            List<string> cclist = new List<string>();
-            List<string> bcclist = new List<string>();
-
-            //받는사람
-            if (form_to.Contains("{요청}") == true) tolist.AddRange(grp_req);
-            if (form_to.Contains("{수령}") == true) tolist.AddRange(grp_rec);
-            form_to = form_to.Replace("{요청}", "");
-            form_to = form_to.Replace("{수령}", "");
-            tolist.AddRange(form_to.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            tolist = ChangeMailAddress(tolist);
-
-            //참조
-            if (form_cc.Contains("{요청}") == true) cclist.AddRange(grp_req);
-            if (form_cc.Contains("{수령}") == true) cclist.AddRange(grp_rec);
-            form_cc = form_cc.Replace("{요청}", "");
-            form_cc = form_cc.Replace("{수령}", "");
-            cclist.AddRange(form_cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            cclist = ChangeMailAddress(cclist);
-
-            //숨은참조
-            if (form_bcc.Contains("{요청}") == true) bcclist.AddRange(grp_req);
-            if (form_bcc.Contains("{수령}") == true) bcclist.AddRange(grp_rec);
-            form_bcc = form_bcc.Replace("{요청}", "");
-            form_bcc = form_bcc.Replace("{수령}", "");
-            bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            bcclist = ChangeMailAddress(bcclist);
-
-            var datestr = DateTime.Now.ToShortDateString();
-            if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
-            else datestr = dtSD.Text + "~" + dtED.Text;
-            form_subject = form_subject.Replace("{DATE}", datestr);
-
-            try
-            {
-                Outlook.Application outlookApplication = new Outlook.Application();
-                var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
-                newMail.Display();
-                newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title;
-                newMail.To = string.Join(";", tolist.ToArray());
-                newMail.CC = string.Join(";", cclist.ToArray());
-                newMail.BCC = string.Join(";", bcclist.ToArray());
-                string fn = "";
-                if (f.chkAttach.Checked)
-                {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseEB_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
-                    if (fi.Directory.Exists == false) fi.Directory.Create();
-                    fn = fi.FullName;
-
-                    ///save file
-                    //fpSpread1.SaveExcel(fi.FullName,
-                    //       FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                    //       | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                    //       | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                    //       | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-
-                }
-                var rows = this.GetDatarows();
-                var tabledata = UTIL_EQ0000.MakeDataTableToHTML(rows, fn);
-                if (f.chkList.Checked)
-                {
-                    form_body += tabledata;
-                }
-
-                if (fn.isEmpty() == false)
-                    newMail.Attachments.Add(fn);
-
-                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
-                form_body = form_body.Replace("{DATE}", datestr);
-                newMail.HTMLBody = form_body + newMail.HTMLBody; //
-            }
-            catch (Exception ex)
-            {
-                util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
-                    "아웃룩의 설정이 정상인지 확인하세요");
-            }
         }
 
         //string MakeDataTableToHTML(string savefilenamexls = "")
@@ -1473,56 +1379,67 @@ namespace FEQ0000
 
         }
 
-        List<dsPurchase.EETGW_PurchaseEBRow> GetDatarows()
+        List<dsPurchase.EETGW_PurchaseEBRow> GetDatarows(bool all = false)
         {
             List<dsPurchase.EETGW_PurchaseEBRow> rows = new List<dsPurchase.EETGW_PurchaseEBRow>();
-            //선택된 자료의 데이터를 추출한다.
+
-            var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+            if (all)
-            List<int> rowidxs = new List<int>();
-            var idxcol = this.fpSpread1_Sheet1.Columns["idx"];
-            var idxconf = this.fpSpread1_Sheet1.Columns["conf_status"];
-            var idxstatus = this.fpSpread1_Sheet1.Columns["state"];
-            foreach (var item in selected)
             {
-                for (int i = item.Row; i < item.Row + item.RowCount; i++)
+                var drows = (dsPurchase.EETGW_PurchaseEBRow[])(this.dsPurchase.EETGW_PurchaseEB.Select(this.bs.Filter, this.bs.Sort));
+                foreach (var dr in drows)
+                    rows.Add(dr);
+            }
+            else
+            {
+                //선택된 자료의 데이터를 추출한다.
+                var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+                List<int> rowidxs = new List<int>();
+                var idxcol = this.fpSpread1_Sheet1.Columns["idx"];
+                var idxconf = this.fpSpread1_Sheet1.Columns["conf_status"];
+                var idxstatus = this.fpSpread1_Sheet1.Columns["state"];
+                foreach (var item in selected)
                 {
-                    if (rowidxs.Contains(i) == false)
+                    for (int i = item.Row; i < item.Row + item.RowCount; i++)
                     {
-                        if (fpSpread1_Sheet1.IsRowBound(i))
+                        if (rowidxs.Contains(i) == false)
                         {
-                            var confsta = fpSpread1.ActiveSheet.GetValue(i, idxconf.Index);
+                            if (fpSpread1_Sheet1.IsRowBound(i))
-                            var state = fpSpread1.ActiveSheet.GetValue(i, idxstatus.Index);
-                            if (state != null && state.ToString() != "---")
                             {
-                                FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신규 요청데이터가 아닙니다");
+                                var confsta = fpSpread1.ActiveSheet.GetValue(i, idxconf.Index);
+                                var state = fpSpread1.ActiveSheet.GetValue(i, idxstatus.Index);
+                                if (state != null && state.ToString() != "---")
+                                {
+                                    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신규 요청데이터가 아닙니다");
+                                }
+                                //else if (confsta != null && confsta.ToString() != "0")
+                                //{
+                                //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신청이 완료된 자료 입니다");
+                                //}
+                                else rowidxs.Add(i);
                             }
-                            //else if (confsta != null && confsta.ToString() != "0")
-                            //{
-                            //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신청이 완료된 자료 입니다");
-                            //}
-                            else rowidxs.Add(i);
                         }
                     }
                 }
-            }
 
-            //수집된데이터를 보내야한다.
+                //수집된데이터를 보내야한다.
 
-            var idx = 0;
+                var idx = 0;
-            foreach (var i in rowidxs)
+                foreach (var i in rowidxs)
-            {
-                var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
-                var row = this.dsPurchase.EETGW_PurchaseEB.Where(t => t.idx == rowidx).First();
-                rows.Add(row);
-            }
-            if (rows.Any() == false)
-            {
-                if (this.bs.Count > 0)
                 {
-                    var drv = this.bs.Current as DataRowView;
+                    var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
-                    rows.Add(drv.Row as dsPurchase.EETGW_PurchaseEBRow);    
+                    var row = this.dsPurchase.EETGW_PurchaseEB.Where(t => t.idx == rowidx).First();
+                    rows.Add(row);
+                }
+                if (rows.Any() == false)
+                {
+                    if (this.bs.Count > 0)
+                    {
+                        var drv = this.bs.Current as DataRowView;
+                        rows.Add(drv.Row as dsPurchase.EETGW_PurchaseEBRow);
+                    }
                 }
             }
+     
             return rows;
 
         }
@@ -1546,24 +1463,83 @@ namespace FEQ0000
 
         private void 현재목록메일전송ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var cate = "PO";
+            
+        }
 
-            var db = new DataClasses1DataContext();
+        private void 상태일괄변경ToolStripMenuItem_Click(object sender, EventArgs e)
-            var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
+        {
+
+            var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+            List<int> rows = new List<int>();
+            foreach (var item in selected)
+            {
+                for (int i = item.Row; i < item.Row + item.RowCount; i++)
+                {
+                    if (rows.Contains(i) == false)
+                    {
+                        if (fpSpread1_Sheet1.IsRowBound(i))
+                        {
+                            rows.Add(i);
+                        }
+
+                    }
+
+                }
+            }
+
+            //이대상의 실제 데이터베이스 인덱스값을 생성해서 폼에 전송한다.
+            var codlist = DBM.getCodeList("04");
+
+            var f = new FEQ0000.Purchase.fBatchUpdate(rows);
+            if (f.ShowDialog() != DialogResult.OK) return;
+
+            var colstat = fpSpread1_Sheet1.Columns["state"];
+            var value = f.cmbState.Text;
+
+            foreach (var rowindex in rows)
+            {
+                fpSpread1_Sheet1.SetValue(rowindex, colstat.Index, value);
+            }
+
+            FCOMMON.Util.MsgI($"{rows.Count} 건의 자료가 변경되었습니다\n저장 버튼을 누르면 적용 됩니다\n취소하려면 새로고침을 누르세요");
+        }
+
+        private void 현재목록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            MailSendNoForm(true);
+        }
+
+        void MailSendNoForm(bool alldata, string cate = "")
+        {
+            var form_subject = "";
+            var form_body = "";
+            var form_to = "";
+            var form_cc = "{요청}";
+            var form_bcc = "";//f.tbBcc.Text.Trim();
+            bool attachfile = true;
+            bool attachlist = true;
+
+            if (cate.isEmpty() == false)
+            {
+                var db = new DataClasses1DataContext();
+                var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
+                var f = new Purchase.fMailForm(cate);
+                if (f.ShowDialog() != DialogResult.OK) return;
+
+                form_subject = f.tbSubject.Text.Trim();
+                form_body = f.htmlEditor1.Html;
+                form_to = f.tbTo.Text.Trim();
+                form_cc = f.tbCC.Text.Trim();
+                form_bcc = f.tbBcc.Text.Trim();
+                attachfile = f.chkAttach.Checked;
+                attachlist = f.chkList.Checked;
+            }
 
             //현재표시데이터중에 수신자목록을 가져온다
-            var drows = (dsPurchase.EETGW_PurchaseEBRow[])(this.dsPurchase.EETGW_PurchaseEB.Select(this.bs.Filter, this.bs.Sort));
+            var drows = this.GetDatarows(alldata);
             var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
             var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
 
-            var f = new Purchase.fMailForm(cate);
-            if (f.ShowDialog() != DialogResult.OK) return;
-
-            var form_subject = f.tbSubject.Text.Trim();
-            var form_body = f.htmlEditor1.Html;
-            var form_to = f.tbTo.Text.Trim();
-            var form_cc = f.tbCC.Text.Trim();
-            var form_bcc = f.tbBcc.Text.Trim();
 
             List<string> tolist = new List<string>();   //최종받는사람
             List<string> cclist = new List<string>();
@@ -1607,117 +1583,23 @@ namespace FEQ0000
                 newMail.To = string.Join(";", tolist.ToArray());
                 newMail.CC = string.Join(";", cclist.ToArray());
                 newMail.BCC = string.Join(";", bcclist.ToArray());
-                if (f.chkAttach.Checked)
+                string fn = "";
+                if (attachfile)
                 {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseListEB_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseNRI_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
                     if (fi.Directory.Exists == false) fi.Directory.Create();
-
+                    fn = fi.FullName;
-                    ///save file
-                    fpSpread1.SaveExcel(fi.FullName,
-                           FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                           | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                           | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                           | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-
-                    newMail.Attachments.Add(fi.FullName);
                 }
-                if (f.chkList.Checked)
+
+                var tabledata = UTIL_EQ0000.MakeDataTableToHTML(drows, fn);
+                if (attachlist)
                 {
-                    //목록을 본문에 추가한다
+                    form_body += "<br />" + tabledata;
-                    System.Text.StringBuilder sb = new StringBuilder();
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>신청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>요청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>CR/CF</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수령</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SID</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품명</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급</td>");
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    var col_신청 = fpSpread1_Sheet1.Columns["pdate"].Index;
-                    var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index;
-                    var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index;
-
-                    var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index;
-                    var col_SID = fpSpread1_Sheet1.Columns["sid"].Index;
-                    var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index;
-                    var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index;
-                    var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index;
-                    var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index;
-                    var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index;
-                    var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index;
-                    var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index;
-
-
-                    for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++)
-                    {
-                        var v신청 = fpSpread1_Sheet1.Cells[i, col_신청].Value;
-                        var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value;
-                        var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value;
-
-                        var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value;
-                        var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value;
-                        var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value;
-                        var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value;
-                        var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value;
-                        var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value;
-                        var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value;
-                        var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value;
-                        var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value;
-
-                        var s신청 = String.Empty;
-                        var s요청 = String.Empty;
-                        var sCRCF = String.Empty;
-                        var s수령 = String.Empty;
-                        var sSID = String.Empty;
-                        var s품명 = String.Empty;
-                        var s규격 = String.Empty;
-                        var s수량 = "0";
-                        var s단가 = "0";
-                        var s금액 = "0";
-                        var s입고 = String.Empty;
-                        var s공급 = String.Empty;
-                        var s비고 = String.Empty;
-
-                        if (v신청 != null) s신청 = v신청.ToString();
-                        if (v요청 != null) s요청 = v요청.ToString();
-                        if (vCRCF != null) sCRCF = vCRCF.ToString();
-                        if (v수령 != null) s수령 = v수령.ToString();
-                        if (vSID != null) sSID = vSID.ToString();
-                        if (v품명 != null) s품명 = v품명.ToString();
-                        if (v규격 != null) s규격 = v규격.ToString();
-                        if (v수량 != null) s수량 = v수량.ToString();
-                        if (v단가 != null) s단가 = v단가.ToString();
-                        if (v금액 != null) s금액 = v금액.ToString();
-                        if (v공급 != null) s공급 = v공급.ToString();
-
-                        sb.AppendLine("<tr>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(s신청) + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(s요청) + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(sCRCF) + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(s수령) + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(sSID) + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(s품명) + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(s규격) + "</td>");
-                        sb.AppendLine("<td style='text-align:center'>" + int.Parse(s수량).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s단가).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s금액).ToString("N0") + "</td>");
-                        sb.AppendLine("<td>" + UTIL_EQ0000.getmaxstr(s공급) + "</td>");
-
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    form_body += sb.ToString();
                 }
 
+                if (fn.isEmpty() == false)
+                    newMail.Attachments.Add(fn);
+
                 //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
                 form_body = form_body.Replace("{DATE}", datestr);
                 newMail.HTMLBody = form_body + newMail.HTMLBody; //
@@ -1729,42 +1611,20 @@ namespace FEQ0000
             }
         }
 
-        private void 상태일괄변경ToolStripMenuItem_Click(object sender, EventArgs e)
+        private void 현재목록입고양식ToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            MailSendNoForm(true,"PF");
 
-            var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+        }
-            List<int> rows = new List<int>();
-            foreach (var item in selected)
-            {
-                for (int i = item.Row; i < item.Row + item.RowCount; i++)
-                {
-                    if (rows.Contains(i) == false)
-                    {
-                        if (fpSpread1_Sheet1.IsRowBound(i))
-                        {
-                            rows.Add(i);
-                        }
 
-                    }
+        private void 선택목록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            MailSendNoForm(false);
+        }
 
-                }
+        private void 선택목록입고양식ToolStripMenuItem_Click(object sender, EventArgs e)
-            }
+        {
-
+            MailSendNoForm(false, "PF");
-            //이대상의 실제 데이터베이스 인덱스값을 생성해서 폼에 전송한다.
-            var codlist = DBM.getCodeList("04");
-
-            var f = new FEQ0000.Purchase.fBatchUpdate(rows);
-            if (f.ShowDialog() != DialogResult.OK) return;
-
-            var colstat = fpSpread1_Sheet1.Columns["state"];
-            var value = f.cmbState.Text;
-
-            foreach (var rowindex in rows)
-            {
-                fpSpread1_Sheet1.SetValue(rowindex, colstat.Index, value);
-            }
-
-            FCOMMON.Util.MsgI($"{rows.Count} 건의 자료가 변경되었습니다\n저장 버튼을 누르면 적용 됩니다\n취소하려면 새로고침을 누르세요");
         }
     }
 }

SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx

@@ -296,21 +296,7 @@
         brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX
-        EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl
-        7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR
-        BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT
-        Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz
-        tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV
-        iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i
-        DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA
-        AAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="입고품목메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQfAPr8/VVritvj7IqsyElVa+Ps9MvT2rvc/aPQ/KrU/Or0/nmYspzN/LbZ/FJgeXiQ
         q0NLXHWPrJnA1sDf/CkxQ9RSXD5FVa/X/H2fudPn8HyjwMPg/WV/nG+Or////////yH/C05FVFNDQVBF
@@ -347,6 +333,20 @@
         oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A
         cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA
         Ow==
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX
+        EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl
+        7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR
+        BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT
+        Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz
+        tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV
+        iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i
+        DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs

@@ -307,11 +307,6 @@ namespace FEQ0000
 
         }
 
-        private void toolStripButton3_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void bs_CurrentChanged(object sender, EventArgs e)
         {
             var dr = bs.Current as dsPurchase.EETGW_PurchaseEBRow;
@@ -321,10 +316,6 @@ namespace FEQ0000
             //else richTextBox2.Text = dr.bigo;
         }
 
-        private void toolStripButton4_Click(object sender, EventArgs e)
-        {
-
-        }
 
         string getmaxstr(string src, int len = 30)
         {
@@ -440,7 +431,7 @@ namespace FEQ0000
                 string fn = "";
                 if (f.chkAttach.Checked)
                 {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_confirmeb_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseEB_confirmeb_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
                     if (fi.Directory.Exists == false) fi.Directory.Create();
                     fn = fi.FullName;
                     //FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName);

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.Designer.cs

@@ -63,6 +63,9 @@ namespace FEQ0000.Purchase
             this.tbPrjName = new System.Windows.Forms.TextBox();
             this.tbIdx = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.tbSCRCF = new System.Windows.Forms.TextBox();
+            this.tbSC = new System.Windows.Forms.TextBox();
+            this.tbSID = new System.Windows.Forms.TextBox();
             this.tbRemarkO = new System.Windows.Forms.TextBox();
             this.tbAmt = new System.Windows.Forms.TextBox();
             this.tbPriceO = new System.Windows.Forms.TextBox();
@@ -82,9 +85,6 @@ namespace FEQ0000.Purchase
             this.dtInDate = new System.Windows.Forms.DateTimePicker();
             this.btOK = new System.Windows.Forms.Button();
             this.arLabel3 = new System.Windows.Forms.Label();
-            this.tbSID = new System.Windows.Forms.TextBox();
-            this.tbSCRCF = new System.Windows.Forms.TextBox();
-            this.tbSC = new System.Windows.Forms.TextBox();
             label17 = new System.Windows.Forms.Label();
             label12 = new System.Windows.Forms.Label();
             label11 = new System.Windows.Forms.Label();
@@ -276,6 +276,45 @@ namespace FEQ0000.Purchase
             label1.TabIndex = 98;
             label1.Text = "수량/단가/금액";
             // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new System.Drawing.Point(40, 171);
+            label10.Name = "label10";
+            label10.Size = new System.Drawing.Size(58, 12);
+            label10.TabIndex = 109;
+            label10.Text = "SCR/CF#";
+            // 
+            // label15
+            // 
+            label15.AutoSize = true;
+            label15.Location = new System.Drawing.Point(76, 152);
+            label15.Name = "label15";
+            label15.Size = new System.Drawing.Size(22, 12);
+            label15.TabIndex = 110;
+            label15.Text = "SC";
+            // 
+            // label14
+            // 
+            label14.AutoSize = true;
+            label14.Font = new System.Drawing.Font("맑은 고딕", 15F);
+            label14.Location = new System.Drawing.Point(67, 303);
+            label14.Name = "label14";
+            label14.Size = new System.Drawing.Size(38, 28);
+            label14.TabIndex = 115;
+            label14.Text = "PO";
+            // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Font = new System.Drawing.Font("맑은 고딕", 15F);
+            label7.Location = new System.Drawing.Point(53, 221);
+            label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label7.Name = "label7";
+            label7.Size = new System.Drawing.Size(52, 28);
+            label7.TabIndex = 116;
+            label7.Text = "비고";
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Gainsboro;
@@ -438,6 +477,37 @@ namespace FEQ0000.Purchase
             this.panel2.Size = new System.Drawing.Size(582, 192);
             this.panel2.TabIndex = 88;
             // 
+            // tbSCRCF
+            // 
+            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSCRCF.Location = new System.Drawing.Point(338, 147);
+            this.tbSCRCF.Name = "tbSCRCF";
+            this.tbSCRCF.ReadOnly = true;
+            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
+            this.tbSCRCF.TabIndex = 112;
+            // 
+            // tbSC
+            // 
+            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSC.Location = new System.Drawing.Point(104, 147);
+            this.tbSC.Name = "tbSC";
+            this.tbSC.ReadOnly = true;
+            this.tbSC.Size = new System.Drawing.Size(232, 38);
+            this.tbSC.TabIndex = 111;
+            // 
+            // tbSID
+            // 
+            this.tbSID.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSID.Location = new System.Drawing.Point(433, 53);
+            this.tbSID.Name = "tbSID";
+            this.tbSID.ReadOnly = true;
+            this.tbSID.Size = new System.Drawing.Size(137, 30);
+            this.tbSID.TabIndex = 108;
+            this.tbSID.Text = "000000000";
+            this.tbSID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // tbRemarkO
             // 
             this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
@@ -659,77 +729,7 @@ namespace FEQ0000.Purchase
             this.arLabel3.Text = "입고정보";
             this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // tbSID
+            // fPurchaseEB_Ipgo
-            // 
-            this.tbSID.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSID.Location = new System.Drawing.Point(433, 53);
-            this.tbSID.Name = "tbSID";
-            this.tbSID.ReadOnly = true;
-            this.tbSID.Size = new System.Drawing.Size(137, 30);
-            this.tbSID.TabIndex = 108;
-            this.tbSID.Text = "000000000";
-            this.tbSID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // tbSCRCF
-            // 
-            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSCRCF.Location = new System.Drawing.Point(338, 147);
-            this.tbSCRCF.Name = "tbSCRCF";
-            this.tbSCRCF.ReadOnly = true;
-            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
-            this.tbSCRCF.TabIndex = 112;
-            // 
-            // tbSC
-            // 
-            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSC.Location = new System.Drawing.Point(104, 147);
-            this.tbSC.Name = "tbSC";
-            this.tbSC.ReadOnly = true;
-            this.tbSC.Size = new System.Drawing.Size(232, 38);
-            this.tbSC.TabIndex = 111;
-            // 
-            // label10
-            // 
-            label10.AutoSize = true;
-            label10.Location = new System.Drawing.Point(40, 171);
-            label10.Name = "label10";
-            label10.Size = new System.Drawing.Size(58, 12);
-            label10.TabIndex = 109;
-            label10.Text = "SCR/CF#";
-            // 
-            // label15
-            // 
-            label15.AutoSize = true;
-            label15.Location = new System.Drawing.Point(76, 152);
-            label15.Name = "label15";
-            label15.Size = new System.Drawing.Size(22, 12);
-            label15.TabIndex = 110;
-            label15.Text = "SC";
-            // 
-            // label14
-            // 
-            label14.AutoSize = true;
-            label14.Font = new System.Drawing.Font("맑은 고딕", 15F);
-            label14.Location = new System.Drawing.Point(67, 303);
-            label14.Name = "label14";
-            label14.Size = new System.Drawing.Size(38, 28);
-            label14.TabIndex = 115;
-            label14.Text = "PO";
-            // 
-            // label7
-            // 
-            label7.AutoSize = true;
-            label7.Font = new System.Drawing.Font("맑은 고딕", 15F);
-            label7.Location = new System.Drawing.Point(53, 221);
-            label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label7.Name = "label7";
-            label7.Size = new System.Drawing.Size(52, 28);
-            label7.TabIndex = 116;
-            label7.Text = "비고";
-            // 
-            // fPurchaseNR_Ipgo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -739,9 +739,9 @@ namespace FEQ0000.Purchase
             this.Controls.Add(this.panel1);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "fPurchaseNR_Ipgo";
+            this.Name = "fPurchaseEB_Ipgo";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "NR 품목 입고";
+            this.Text = " 전자실 품목 입고";
             this.Load += new System.EventHandler(this.fPurchaseCR_Ipgo_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs

@@ -122,7 +122,7 @@ namespace FEQ0000.Purchase
                 cmbReceive.Focus();
                 return;
             }
-            var ta = new dsPurchaseTableAdapters.PurchaseTableAdapter ();
+            var ta = new dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter();
             var dr = ta.GetByIdx(this.idx).First();
             if (chkInDate.Checked == false)
             {

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.resx

@@ -180,16 +180,4 @@
   <metadata name="label7.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>
-  <metadata name="label15.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="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
 </root>

SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs

@@ -30,45 +30,45 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseNR));
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType19 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType20 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType157 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType158 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType159 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType160 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType161 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType162 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType163 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType164 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType165 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType166 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType167 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType168 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType169 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType61 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType170 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType171 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType62 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType63 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType172 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType64 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType173 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType65 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType66 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType174 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType67 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType175 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType68 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType176 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType177 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType178 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType69 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType179 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType180 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType181 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType70 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType182 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType21 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -102,7 +102,6 @@
             this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.구매승인양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripButton7 = new System.Windows.Forms.ToolStripDropDownButton();
-            this.입고품목메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
@@ -154,7 +153,12 @@
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            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.선택목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.선택목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -439,38 +443,29 @@
             // 집계표ToolStripMenuItem
             // 
             this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem";
-            this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+            this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.집계표ToolStripMenuItem.Text = "집계표";
             this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click);
             // 
             // 구매승인양식ToolStripMenuItem
             // 
             this.구매승인양식ToolStripMenuItem.Name = "구매승인양식ToolStripMenuItem";
-            this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+            this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식";
             this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click);
             // 
             // toolStripButton7
             // 
             this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.입고품목메일전송ToolStripMenuItem,
+            this.메일전송ToolStripMenuItem,
             this.엑셀에서가져오기ToolStripMenuItem,
-            this.견적서폴더열기ToolStripMenuItem,
+            this.견적서폴더열기ToolStripMenuItem});
-            this.현재목록메일전송ToolStripMenuItem});
             this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
             this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton7.Name = "toolStripButton7";
             this.toolStripButton7.Size = new System.Drawing.Size(68, 28);
             this.toolStripButton7.Text = "기능";
             // 
-            // 입고품목메일전송ToolStripMenuItem
-            // 
-            this.입고품목메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("입고품목메일전송ToolStripMenuItem.Image")));
-            this.입고품목메일전송ToolStripMenuItem.Name = "입고품목메일전송ToolStripMenuItem";
-            this.입고품목메일전송ToolStripMenuItem.Size = new System.Drawing.Size(190, 30);
-            this.입고품목메일전송ToolStripMenuItem.Text = "입고 품목 메일 전송";
-            this.입고품목메일전송ToolStripMenuItem.Click += new System.EventHandler(this.입고품목메일전송ToolStripMenuItem_Click);
-            // 
             // 엑셀에서가져오기ToolStripMenuItem
             // 
             this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image")));
@@ -928,17 +923,17 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "구매담당";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 42).Value = "삭제됨";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType19;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1";
             this.fpSpread1_Sheet1.Columns.Get(0).Label = "요청\r\n검사";
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 37F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType20;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "chk2";
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "구매\r\n검사";
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 35F;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType157;
             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 = "구매신청";
@@ -947,7 +942,7 @@
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 68F;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType158;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "prdate";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "PR입력";
@@ -955,7 +950,7 @@
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 76F;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType159;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "state";
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "상태";
@@ -963,39 +958,39 @@
             this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType160;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "place";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "보관소";
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType161;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "공정";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType162;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "요청";
             this.fpSpread1_Sheet1.Columns.Get(7).Tag = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType163;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "costcenter";
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "Cost Center";
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType164;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "linecode";
             this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(9).Label = "LineCode";
             this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType165;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "sc";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "SC#";
@@ -1003,231 +998,231 @@
             this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(11).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType166;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(11).Label = "SCR/CF";
             this.fpSpread1_Sheet1.Columns.Get(11).Tag = "crcf";
             this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType167;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "수령";
             this.fpSpread1_Sheet1.Columns.Get(12).Tag = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(13).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType168;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "SID#";
             this.fpSpread1_Sheet1.Columns.Get(13).Tag = "sid";
             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType169;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "품명";
             this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
+            numberCellType61.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType61.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType61.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
+            numberCellType61.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType61;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumidx";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType170;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "규격";
             this.fpSpread1_Sheet1.Columns.Get(16).Tag = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType171;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "dept";
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "장비\r\n제조사";
             this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType171;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "manuproc";
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "제조\r\n공정";
             this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType171;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "asset";
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "장비\r\n모델";
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F;
-            numberCellType2.DecimalPlaces = 0;
+            numberCellType62.DecimalPlaces = 0;
-            numberCellType2.NegativeRed = true;
+            numberCellType62.NegativeRed = true;
-            numberCellType2.NullDisplay = "--";
+            numberCellType62.NullDisplay = "--";
-            numberCellType2.Separator = ",";
+            numberCellType62.Separator = ",";
-            numberCellType2.ShowSeparator = true;
+            numberCellType62.ShowSeparator = true;
-            numberCellType2.ShrinkToFit = true;
+            numberCellType62.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType62;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "pumqtyReq";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "수량\r\n(요청)";
             this.fpSpread1_Sheet1.Columns.Get(20).Tag = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F;
-            numberCellType3.DecimalPlaces = 0;
+            numberCellType63.DecimalPlaces = 0;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType63;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Label = "수량\r\n(구매)";
             this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 55F;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType172;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "pumunit";
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Label = "단위";
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F;
-            numberCellType4.DecimalPlaces = 2;
+            numberCellType64.DecimalPlaces = 2;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType64;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "pumpriceD";
             this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(23).Label = "단가\r\n(해외)";
             this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType173;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "currency";
             this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(24).Label = "통화";
             this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F;
-            numberCellType5.DecimalPlaces = 0;
+            numberCellType65.DecimalPlaces = 0;
-            numberCellType5.MaximumValue = 9999999999999.99D;
+            numberCellType65.MaximumValue = 9999999999999.99D;
-            numberCellType5.MinimumValue = -9999999999999.99D;
+            numberCellType65.MinimumValue = -9999999999999.99D;
-            numberCellType5.NegativeRed = true;
+            numberCellType65.NegativeRed = true;
-            numberCellType5.NullDisplay = "--";
+            numberCellType65.NullDisplay = "--";
-            numberCellType5.Separator = ",";
+            numberCellType65.Separator = ",";
-            numberCellType5.ShowSeparator = true;
+            numberCellType65.ShowSeparator = true;
-            numberCellType5.ShrinkToFit = true;
+            numberCellType65.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType65;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "단가";
             this.fpSpread1_Sheet1.Columns.Get(25).Tag = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F;
-            numberCellType6.DecimalPlaces = 0;
+            numberCellType66.DecimalPlaces = 0;
-            numberCellType6.MaximumValue = 9999999999999.99D;
+            numberCellType66.MaximumValue = 9999999999999.99D;
-            numberCellType6.MinimumValue = -9999999999999.99D;
+            numberCellType66.MinimumValue = -9999999999999.99D;
-            numberCellType6.NegativeRed = true;
+            numberCellType66.NegativeRed = true;
-            numberCellType6.NullDisplay = "--";
+            numberCellType66.NullDisplay = "--";
-            numberCellType6.Separator = ",";
+            numberCellType66.Separator = ",";
-            numberCellType6.ShowSeparator = true;
+            numberCellType66.ShowSeparator = true;
-            numberCellType6.ShrinkToFit = true;
+            numberCellType66.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType66;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "합계금액";
             this.fpSpread1_Sheet1.Columns.Get(26).Tag = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType174;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "supply";
             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).Tag = "supply";
             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)))));
-            numberCellType7.DecimalPlaces = 0;
+            numberCellType67.DecimalPlaces = 0;
-            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType67.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType7.MaximumValue = 2147483647D;
+            numberCellType67.MaximumValue = 2147483647D;
-            numberCellType7.MinimumValue = -2147483648D;
+            numberCellType67.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType67;
             this.fpSpread1_Sheet1.Columns.Get(28).DataField = "supplyidx";
             this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(29).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType175;
             this.fpSpread1_Sheet1.Columns.Get(29).DataField = "project";
             this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(29).Label = "프로젝트";
             this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(30).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType8.DecimalPlaces = 0;
+            numberCellType68.DecimalPlaces = 0;
-            numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType68.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType8.MaximumValue = 2147483647D;
+            numberCellType68.MaximumValue = 2147483647D;
-            numberCellType8.MinimumValue = -2147483648D;
+            numberCellType68.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType68;
             this.fpSpread1_Sheet1.Columns.Get(30).DataField = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(30).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(30).Tag = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F;
-            textCellType20.WordWrap = true;
+            textCellType176.WordWrap = true;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType176;
             this.fpSpread1_Sheet1.Columns.Get(31).DataField = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(31).Label = "비고(구매사유)\r\n(요청자)";
             this.fpSpread1_Sheet1.Columns.Get(31).Tag = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(31).Width = 96F;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType177;
             this.fpSpread1_Sheet1.Columns.Get(32).DataField = "edate";
             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).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType178;
             this.fpSpread1_Sheet1.Columns.Get(33).DataField = "indate";
             this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(33).Label = "입고일";
             this.fpSpread1_Sheet1.Columns.Get(33).Tag = "indate";
             this.fpSpread1_Sheet1.Columns.Get(33).Width = 51F;
-            numberCellType9.DecimalPlaces = 0;
+            numberCellType69.DecimalPlaces = 0;
-            numberCellType9.NegativeRed = true;
+            numberCellType69.NegativeRed = true;
-            numberCellType9.ShowSeparator = true;
+            numberCellType69.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType69;
             this.fpSpread1_Sheet1.Columns.Get(34).DataField = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(34).Label = "입고수량";
             this.fpSpread1_Sheet1.Columns.Get(34).Tag = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType179;
             this.fpSpread1_Sheet1.Columns.Get(35).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(35).Label = "PO#";
             this.fpSpread1_Sheet1.Columns.Get(35).Tag = "po";
             this.fpSpread1_Sheet1.Columns.Get(35).Width = 51F;
-            textCellType24.WordWrap = true;
+            textCellType180.WordWrap = true;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType180;
             this.fpSpread1_Sheet1.Columns.Get(36).DataField = "chkremark";
             this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(36).Label = "비고\r\n(담당자)";
             this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType181;
             this.fpSpread1_Sheet1.Columns.Get(37).DataField = "purchase_manager";
             this.fpSpread1_Sheet1.Columns.Get(37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(37).Label = "구매담당";
             this.fpSpread1_Sheet1.Columns.Get(37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(38).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(38).CellType = numberCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(38).CellType = numberCellType70;
             this.fpSpread1_Sheet1.Columns.Get(38).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(38).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(38).Tag = "idx";
             this.fpSpread1_Sheet1.Columns.Get(38).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(39).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(39).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(39).CellType = textCellType182;
             this.fpSpread1_Sheet1.Columns.Get(39).DataField = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(39).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(39).Tag = "conf_status";
             this.fpSpread1_Sheet1.Columns.Get(39).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(40).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(40).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(40).CellType = textCellType182;
             this.fpSpread1_Sheet1.Columns.Get(40).DataField = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(40).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(40).Tag = "conf_request";
             this.fpSpread1_Sheet1.Columns.Get(40).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(41).BackColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(41).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(41).CellType = textCellType182;
             this.fpSpread1_Sheet1.Columns.Get(41).DataField = "conf_reponse";
             this.fpSpread1_Sheet1.Columns.Get(41).ForeColor = System.Drawing.Color.Red;
             this.fpSpread1_Sheet1.Columns.Get(41).Tag = "conf_reponse";
             this.fpSpread1_Sheet1.Columns.Get(41).Visible = false;
-            this.fpSpread1_Sheet1.Columns.Get(42).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(42).CellType = checkBoxCellType21;
             this.fpSpread1_Sheet1.Columns.Get(42).DataField = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(42).Label = "삭제됨";
             this.fpSpread1_Sheet1.Columns.Get(42).Tag = "isdel";
@@ -1265,12 +1260,51 @@
             this.label2.Text = "--";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // 현재목록메일전송ToolStripMenuItem
+            // 메일전송ToolStripMenuItem
             // 
-            this.현재목록메일전송ToolStripMenuItem.Name = "현재목록메일전송ToolStripMenuItem";
+            this.메일전송ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.현재목록메일전송ToolStripMenuItem.Size = new System.Drawing.Size(190, 30);
+            this.현재목록ToolStripMenuItem,
-            this.현재목록메일전송ToolStripMenuItem.Text = "현재목록 메일 전송";
+            this.선택목록ToolStripMenuItem,
-            this.현재목록메일전송ToolStripMenuItem.Click += new System.EventHandler(this.현재목록메일전송ToolStripMenuItem_Click);
+            this.toolStripMenuItem2,
+            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(188, 30);
+            this.메일전송ToolStripMenuItem.Text = "메일 전송";
+            // 
+            // 현재목록ToolStripMenuItem
+            // 
+            this.현재목록ToolStripMenuItem.Name = "현재목록ToolStripMenuItem";
+            this.현재목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.현재목록ToolStripMenuItem.Text = "현재목록";
+            this.현재목록ToolStripMenuItem.Click += new System.EventHandler(this.현재목록ToolStripMenuItem_Click);
+            // 
+            // 현재목록입고양식ToolStripMenuItem
+            // 
+            this.현재목록입고양식ToolStripMenuItem.Name = "현재목록입고양식ToolStripMenuItem";
+            this.현재목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.현재목록입고양식ToolStripMenuItem.Text = "현재목록(입고양식)";
+            this.현재목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.현재목록입고양식ToolStripMenuItem_Click);
+            // 
+            // 선택목록ToolStripMenuItem
+            // 
+            this.선택목록ToolStripMenuItem.Name = "선택목록ToolStripMenuItem";
+            this.선택목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.선택목록ToolStripMenuItem.Text = "선택목록";
+            this.선택목록ToolStripMenuItem.Click += new System.EventHandler(this.선택목록ToolStripMenuItem_Click);
+            // 
+            // 선택목록입고양식ToolStripMenuItem
+            // 
+            this.선택목록입고양식ToolStripMenuItem.Name = "선택목록입고양식ToolStripMenuItem";
+            this.선택목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.선택목록입고양식ToolStripMenuItem.Text = "선택목록(입고양식)";
+            this.선택목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.선택목록입고양식ToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
             // 
             // fPurchaseNR
             // 
@@ -1373,7 +1407,6 @@
         private System.Windows.Forms.ToolStripMenuItem 구매승인양식ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton6;
         private System.Windows.Forms.ToolStripDropDownButton toolStripButton7;
-        private System.Windows.Forms.ToolStripMenuItem 입고품목메일전송ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 엑셀에서가져오기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 견적서폴더열기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton3;
@@ -1388,6 +1421,11 @@
         private System.Windows.Forms.ToolStripMenuItem 사용자내보내기ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton8;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
-        private System.Windows.Forms.ToolStripMenuItem 현재목록메일전송ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+        private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem;
     }
 }

SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs

@@ -303,6 +303,7 @@ namespace FEQ0000
 
             FormattingData();
         }
+
         void FormattingData()
         {
             //삭제컬럼인덱스
@@ -417,9 +418,8 @@ namespace FEQ0000
             {
                 FCOMMON.Util.MsgE("저장 실패\n" + ex.Message);
             }
-
-
         }
+
         void showSummary()
         {
             decimal sum = 0;
@@ -451,7 +451,6 @@ namespace FEQ0000
             saveData(true);
         }
 
-
         private void lbEnd_Click(object sender, EventArgs e)
         {
             //end date
@@ -648,10 +647,6 @@ namespace FEQ0000
             return retval;
         }
 
-        private void copyDataToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-
-        }
 
         private void btFind_Click(object sender, EventArgs e)
         {
@@ -733,15 +728,6 @@ namespace FEQ0000
 
         }
 
-        private void autoToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            FCOMMON.Util.FPColSizeAuto(this.fpSpread1);
-            //this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true;
-
-            //for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
-            //    this.fpSpread1.ActiveSheet.SetRowHeight(i, 25);
-            //dv1.AutoResizeColumns();
-        }
 
         private void resetToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -767,56 +753,7 @@ namespace FEQ0000
         }
 
 
-        void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
+    
-        {
-            //if (e.ColumnIndex < 0 || e.RowIndex < 0) return;
-            //var state = this.dv1.Rows[e.RowIndex].Cells["dvc_state"].Value.ToString();
-            //switch (state)
-            //{
-            //    case "00":  //입력대기(미확인)
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.Black;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.LightGray;
-            //        break;
-            //    case "01":  //파트장 승인 기다림
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.DarkBlue;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.White;
-            //        break;
-            //    case "03":  //PO (협력업체 전달)
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.DarkMagenta;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.White;
-            //        break;
-            //    case "04":  //자재 수령
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.White;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.Green;
-            //        break;
-            //    case "05": //canceld (취소)
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.LightGray;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.Red;
-            //        break;
-            //    case "06":  //cancel (취소됨)
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.HotPink;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.Black;
-            //        break;
-            //    case "08":  //문의
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.Green;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.White;
-            //        break;
-            //    default:
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = Color.White;
-            //        this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.ForeColor = Color.Black;
-            //        break;
-            //}
-        }
-
-        private void updateSCToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var dlg = FCOMMON.Util.MsgQ("#SC가 없는 자료에 한하여 일괄 기록을 실행 합니다.");
-            if (dlg == System.Windows.Forms.DialogResult.Yes)
-            {
-
-            }
-        }
-
         private void exportDataToolStripMenuItem_Click(object sender, EventArgs e)
         {
             SaveFileDialog sd = new SaveFileDialog();
@@ -871,11 +808,6 @@ namespace FEQ0000
         }
 
 
-        private void copyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-
-        }
-
         void func_copy()
         {
             var drv = this.bs.Current as DataRowView;
@@ -1027,11 +959,6 @@ namespace FEQ0000
 
         }
 
-        private void toolStripButton3_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void bs_CurrentChanged(object sender, EventArgs e)
         {
             var drv = this.bs.Current as DataRowView;
@@ -1054,16 +981,6 @@ namespace FEQ0000
             else this.label2.Visible = false;
         }
 
-        private void toolStripButton4_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        string getmaxstr(string src, int len = 30)
-        {
-            if (src.Length > len) return src.Substring(0, len) + "...";
-            else return src;
-        }
 
         List<string> ChangeMailAddress(List<string> userid)
         {
@@ -1092,11 +1009,7 @@ namespace FEQ0000
             return retval;
         }
 
-        private void toolStripButton5_Click(object sender, EventArgs e)
+     
-        {
-
-
-        }
 
         private void 구매승인양식ToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -1155,189 +1068,6 @@ namespace FEQ0000
             f.Show();
         }
 
-        private void 입고품목메일전송ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-
-            var db = new DataClasses1DataContext();
-            var dr = db.MailForm.Where(t => t.cate == "PC").FirstOrDefault();
-
-            //현재표시데이터중에 수신자목록을 가져온다
-            var drows = (dsPurchase.PurchaseRow[])(this.dsPurchase.Purchase.Select(this.bs.Filter, this.bs.Sort));
-            var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
-            var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
-
-            var f = new Purchase.fMailForm("PC");
-            if (f.ShowDialog() != DialogResult.OK) return;
-
-            var form_subject = f.tbSubject.Text.Trim();
-            var form_body = f.htmlEditor1.Html;
-            var form_to = f.tbTo.Text.Trim();
-            var form_cc = f.tbCC.Text.Trim();
-            var form_bcc = f.tbBcc.Text.Trim();
-
-            List<string> tolist = new List<string>();   //최종받는사람
-            List<string> cclist = new List<string>();
-            List<string> bcclist = new List<string>();
-
-            //받는사람
-            if (form_to.Contains("{요청}") == true) tolist.AddRange(grp_req);
-            if (form_to.Contains("{수령}") == true) tolist.AddRange(grp_rec);
-            form_to = form_to.Replace("{요청}", "");
-            form_to = form_to.Replace("{수령}", "");
-            tolist.AddRange(form_to.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            tolist = ChangeMailAddress(tolist);
-
-            //참조
-            if (form_cc.Contains("{요청}") == true) cclist.AddRange(grp_req);
-            if (form_cc.Contains("{수령}") == true) cclist.AddRange(grp_rec);
-            form_cc = form_cc.Replace("{요청}", "");
-            form_cc = form_cc.Replace("{수령}", "");
-            cclist.AddRange(form_cc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            cclist = ChangeMailAddress(cclist);
-
-            //숨은참조
-            if (form_bcc.Contains("{요청}") == true) bcclist.AddRange(grp_req);
-            if (form_bcc.Contains("{수령}") == true) bcclist.AddRange(grp_rec);
-            form_bcc = form_bcc.Replace("{요청}", "");
-            form_bcc = form_bcc.Replace("{수령}", "");
-            bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
-            bcclist = ChangeMailAddress(bcclist);
-
-            var datestr = DateTime.Now.ToShortDateString();
-            if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
-            else datestr = dtSD.Text + "~" + dtED.Text;
-            form_subject = form_subject.Replace("{DATE}", datestr);
-
-            try
-            {
-                Outlook.Application outlookApplication = new Outlook.Application();
-                var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
-                newMail.Display();
-                newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title;
-                newMail.To = string.Join(";", tolist.ToArray());
-                newMail.CC = string.Join(";", cclist.ToArray());
-                newMail.BCC = string.Join(";", bcclist.ToArray());
-                if (f.chkAttach.Checked)
-                {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
-                    if (fi.Directory.Exists == false) fi.Directory.Create();
-
-                    ///save file
-                    fpSpread1.SaveExcel(fi.FullName,
-                           FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                           | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                           | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                           | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-
-                    newMail.Attachments.Add(fi.FullName);
-                }
-                if (f.chkList.Checked)
-                {
-                    //목록을 본문에 추가한다
-                    System.Text.StringBuilder sb = new StringBuilder();
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>신청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>요청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>CR/CF</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수령</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SID</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품명</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급</td>");
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    var col_신청 = fpSpread1_Sheet1.Columns["pdate"].Index;
-                    var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index;
-                    var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index;
-
-                    var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index;
-                    var col_SID = fpSpread1_Sheet1.Columns["sid"].Index;
-                    var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index;
-                    var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index;
-                    var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index;
-                    var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index;
-                    var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index;
-                    var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index;
-                    var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index;
-
-
-                    for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++)
-                    {
-                        var v신청 = fpSpread1_Sheet1.Cells[i, col_신청].Value;
-                        var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value;
-                        var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value;
-
-                        var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value;
-                        var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value;
-                        var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value;
-                        var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value;
-                        var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value;
-                        var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value;
-                        var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value;
-                        var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value;
-                        var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value;
-
-                        var s신청 = String.Empty;
-                        var s요청 = String.Empty;
-                        var sCRCF = String.Empty;
-                        var s수령 = String.Empty;
-                        var sSID = String.Empty;
-                        var s품명 = String.Empty;
-                        var s규격 = String.Empty;
-                        var s수량 = "0";
-                        var s단가 = "0";
-                        var s금액 = "0";
-                        var s입고 = String.Empty;
-                        var s공급 = String.Empty;
-                        var s비고 = String.Empty;
-
-                        if (v신청 != null) s신청 = v신청.ToString();
-                        if (v요청 != null) s요청 = v요청.ToString();
-                        if (vCRCF != null) sCRCF = vCRCF.ToString();
-                        if (v수령 != null) s수령 = v수령.ToString();
-                        if (vSID != null) sSID = vSID.ToString();
-                        if (v품명 != null) s품명 = v품명.ToString();
-                        if (v규격 != null) s규격 = v규격.ToString();
-                        if (v수량 != null) s수량 = v수량.ToString();
-                        if (v단가 != null) s단가 = v단가.ToString();
-                        if (v금액 != null) s금액 = v금액.ToString();
-                        if (v공급 != null) s공급 = v공급.ToString();
-
-                        sb.AppendLine("<tr>");
-                        sb.AppendLine("<td>" + getmaxstr(s신청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s요청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sCRCF) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s수령) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sSID) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s품명) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s규격) + "</td>");
-                        sb.AppendLine("<td style='text-align:center'>" + int.Parse(s수량).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s단가).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s금액).ToString("N0") + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s공급) + "</td>");
-
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    form_body += sb.ToString();
-                }
-
-                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
-                form_body = form_body.Replace("{DATE}", datestr);
-                newMail.HTMLBody = form_body + newMail.HTMLBody; //
-            }
-            catch (Exception ex)
-            {
-                util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
-                    "아웃룩의 설정이 정상인지 확인하세요");
-            }
-        }
 
         private void toolStripButton3_Click_1(object sender, EventArgs e)
         {
@@ -1349,6 +1079,71 @@ namespace FEQ0000
             else FCOMMON.Util.MsgE("설명서 파일(manual.pdf)이 없습니다. 개발자 문의 해주세요(chikyun.kim@amkor.co.kr)");
         }
 
+        List<dsPurchase.PurchaseRow> GetDatarows(bool all = false)
+        {
+            List<dsPurchase.PurchaseRow> rows = new List<dsPurchase.PurchaseRow>();
+
+            if (all)
+            {
+                var drows = (dsPurchase.PurchaseRow[])(this.dsPurchase.Purchase.Select(this.bs.Filter, this.bs.Sort)); ;
+                foreach (var dr in drows)
+                    rows.Add(dr);
+            }
+            else
+            {
+                //선택된 자료의 데이터를 추출한다.
+                var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+                List<int> rowidxs = new List<int>();
+                var idxcol = this.fpSpread1_Sheet1.Columns["idx"];
+                var idxconf = this.fpSpread1_Sheet1.Columns["conf_status"];
+                var idxstatus = this.fpSpread1_Sheet1.Columns["state"];
+                foreach (var item in selected)
+                {
+                    for (int i = item.Row; i < item.Row + item.RowCount; i++)
+                    {
+                        if (rowidxs.Contains(i) == false)
+                        {
+                            if (fpSpread1_Sheet1.IsRowBound(i))
+                            {
+                                var confsta = fpSpread1.ActiveSheet.GetValue(i, idxconf.Index);
+                                var state = fpSpread1.ActiveSheet.GetValue(i, idxstatus.Index);
+                                //if (state != null && state.ToString() != "---")
+                                //{
+                                //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신규 요청데이터가 아닙니다");
+                                //}
+                                //else if (confsta != null && confsta.ToString() != "0")
+                                //{
+                                //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신청이 완료된 자료 입니다");
+                                //}
+                               // else
+                                    rowidxs.Add(i);
+                            }
+                        }
+                    }
+                }
+
+                //수집된데이터를 보내야한다.
+
+                var idx = 0;
+                foreach (var i in rowidxs)
+                {
+                    var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
+                    var row = this.dsPurchase.Purchase.Where(t => t.idx == rowidx).First();
+                    rows.Add(row);
+                }
+                if (rows.Any() == false)
+                {
+                    if (this.bs.Count > 0)
+                    {
+                        var drv = this.bs.Current as DataRowView;
+                        rows.Add(drv.Row as dsPurchase.PurchaseRow);
+                    }
+                }
+            }
+
+            return rows;
+
+        }
         private void fpSpread1_EditModeOff(object sender, EventArgs e)
         {
             if (fpSpread1_Sheet1.Columns["pumqty"].Index == fpSpread1_Sheet1.ActiveColumnIndex)
@@ -1512,51 +1307,11 @@ namespace FEQ0000
 
         private void toolStripButton8_Click(object sender, EventArgs e)
         {
-            //승인요청
-
-
-            //선택된 자료의 데이터를 추출한다.
-            var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
-            List<int> rowidxs = new List<int>();
-            var idxcol = this.fpSpread1_Sheet1.Columns["idx"];
-            var idxconf = this.fpSpread1_Sheet1.Columns["conf_status"];
-            var idxstatus = this.fpSpread1_Sheet1.Columns["state"];
-            foreach (var item in selected)
-            {
-                for (int i = item.Row; i < item.Row + item.RowCount; i++)
-                {
-                    if (rowidxs.Contains(i) == false)
-                    {
-                        if (fpSpread1_Sheet1.IsRowBound(i))
-                        {
-                            var confsta = fpSpread1.ActiveSheet.GetValue(i, idxconf.Index);
-                            var state = fpSpread1.ActiveSheet.GetValue(i, idxstatus.Index);
-                            if (state != null && state.ToString() != "---")
-                            {
-                                FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신규 요청데이터가 아닙니다");
-                            }
-                            //else if (confsta != null && confsta.ToString() != "0")
-                            //{
-                            //    FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신청이 완료된 자료 입니다");
-                            //}
-                            else rowidxs.Add(i);
-                        }
-                    }
-                }
-            }
-
             //수집된데이터를 보내야한다.
-            List<dsPurchase.PurchaseRow> rows = new List<dsPurchase.PurchaseRow>();
+            var rows = GetDatarows();
-            var idx = 0;
-            foreach (var i in rowidxs)
-            {
-                var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
-                var row = this.dsPurchase.Purchase.Where(t => t.idx == rowidx).First();
-                rows.Add(row);
-            }
 
             //이자료를 승인요청창에 보낸다.
-            if(rows.Any()==false)
+            if (rows.Any() == false)
             {
                 FCOMMON.Util.MsgE("대상 데이터가 없습니다.");
                 return;
@@ -1567,26 +1322,46 @@ namespace FEQ0000
 
         }
 
-        private void 현재목록메일전송ToolStripMenuItem_Click(object sender, EventArgs e)
+        private void 현재목록ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var cate = "PO";
+            MailSendNoForm(true);
+        }
 
-            var db = new DataClasses1DataContext();
+        private void 현재목록입고양식ToolStripMenuItem_Click(object sender, EventArgs e)
-            var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
+        {
+            MailSendNoForm(true, "PC");
+        }
+        void MailSendNoForm(bool alldata, string cate = "")
+        {
+            var form_subject = "";
+            var form_body = "";
+            var form_to = "";
+            var form_cc = "{요청}";
+            var form_bcc = "";//f.tbBcc.Text.Trim();
+            bool attachfile = true;
+            bool attachlist = true;
+
+            if (cate.isEmpty() == false)
+            {
+                var db = new DataClasses1DataContext();
+                var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault();
+                var f = new Purchase.fMailForm(cate);
+                if (f.ShowDialog() != DialogResult.OK) return;
+
+                form_subject = f.tbSubject.Text.Trim();
+                form_body = f.htmlEditor1.Html;
+                form_to = f.tbTo.Text.Trim();
+                form_cc = f.tbCC.Text.Trim();
+                form_bcc = f.tbBcc.Text.Trim();
+                attachfile = f.chkAttach.Checked;
+                attachlist = f.chkList.Checked;
+            }
 
             //현재표시데이터중에 수신자목록을 가져온다
-            var drows = (dsPurchase.EETGW_PurchaseEBRow[])(this.dsPurchase.EETGW_PurchaseEB.Select(this.bs.Filter, this.bs.Sort));
+            var drows = this.GetDatarows(alldata);
             var grp_req = drows.Where(t => t.request.isEmpty() == false).GroupBy(t => t.request).Select(t => t.FirstOrDefault().request).ToList();
             var grp_rec = drows.Where(t => t.receive.isEmpty() == false).GroupBy(t => t.receive).Select(t => t.FirstOrDefault().receive).ToList();
 
-            var f = new Purchase.fMailForm(cate);
-            if (f.ShowDialog() != DialogResult.OK) return;
-
-            var form_subject = f.tbSubject.Text.Trim();
-            var form_body = f.htmlEditor1.Html;
-            var form_to = f.tbTo.Text.Trim();
-            var form_cc = f.tbCC.Text.Trim();
-            var form_bcc = f.tbBcc.Text.Trim();
 
             List<string> tolist = new List<string>();   //최종받는사람
             List<string> cclist = new List<string>();
@@ -1630,117 +1405,23 @@ namespace FEQ0000
                 newMail.To = string.Join(";", tolist.ToArray());
                 newMail.CC = string.Join(";", cclist.ToArray());
                 newMail.BCC = string.Join(";", bcclist.ToArray());
-                if (f.chkAttach.Checked)
+                string fn = "";
+                if (attachfile)
                 {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseListEB_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseNRI_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
                     if (fi.Directory.Exists == false) fi.Directory.Create();
-
+                    fn = fi.FullName;
-                    ///save file
-                    fpSpread1.SaveExcel(fi.FullName,
-                           FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                           | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                           | FarPoint.Excel.ExcelSaveFlags.NoFormulas
-                           | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
-
-                    newMail.Attachments.Add(fi.FullName);
                 }
-                if (f.chkList.Checked)
+
+                var tabledata = UTIL_EQ0000.MakeDataTableToHTML(drows, fn);
+                if (attachlist)
                 {
-                    //목록을 본문에 추가한다
+                    form_body += "<br />" + tabledata;
-                    System.Text.StringBuilder sb = new StringBuilder();
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>신청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>요청</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>CR/CF</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수령</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>SID</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>품명</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>규격</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>수량</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>단가</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>금액</td>");
-                    sb.AppendLine("<td style='text-align:center;background-color: aqua;'>공급</td>");
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    var col_신청 = fpSpread1_Sheet1.Columns["pdate"].Index;
-                    var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index;
-                    var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index;
-
-                    var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index;
-                    var col_SID = fpSpread1_Sheet1.Columns["sid"].Index;
-                    var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index;
-                    var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index;
-                    var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index;
-                    var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index;
-                    var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index;
-                    var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index;
-                    var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index;
-
-
-                    for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++)
-                    {
-                        var v신청 = fpSpread1_Sheet1.Cells[i, col_신청].Value;
-                        var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value;
-                        var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value;
-
-                        var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value;
-                        var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value;
-                        var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value;
-                        var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value;
-                        var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value;
-                        var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value;
-                        var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value;
-                        var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value;
-                        var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value;
-
-                        var s신청 = String.Empty;
-                        var s요청 = String.Empty;
-                        var sCRCF = String.Empty;
-                        var s수령 = String.Empty;
-                        var sSID = String.Empty;
-                        var s품명 = String.Empty;
-                        var s규격 = String.Empty;
-                        var s수량 = "0";
-                        var s단가 = "0";
-                        var s금액 = "0";
-                        var s입고 = String.Empty;
-                        var s공급 = String.Empty;
-                        var s비고 = String.Empty;
-
-                        if (v신청 != null) s신청 = v신청.ToString();
-                        if (v요청 != null) s요청 = v요청.ToString();
-                        if (vCRCF != null) sCRCF = vCRCF.ToString();
-                        if (v수령 != null) s수령 = v수령.ToString();
-                        if (vSID != null) sSID = vSID.ToString();
-                        if (v품명 != null) s품명 = v품명.ToString();
-                        if (v규격 != null) s규격 = v규격.ToString();
-                        if (v수량 != null) s수량 = v수량.ToString();
-                        if (v단가 != null) s단가 = v단가.ToString();
-                        if (v금액 != null) s금액 = v금액.ToString();
-                        if (v공급 != null) s공급 = v공급.ToString();
-
-                        sb.AppendLine("<tr>");
-                        sb.AppendLine("<td>" + getmaxstr(s신청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s요청) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sCRCF) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s수령) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(sSID) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s품명) + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s규격) + "</td>");
-                        sb.AppendLine("<td style='text-align:center'>" + int.Parse(s수량).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s단가).ToString("N0") + "</td>");
-                        sb.AppendLine("<td style='text-align:right'>" + int.Parse(s금액).ToString("N0") + "</td>");
-                        sb.AppendLine("<td>" + getmaxstr(s공급) + "</td>");
-
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    form_body += sb.ToString();
                 }
 
+                if (fn.isEmpty() == false)
+                    newMail.Attachments.Add(fn);
+
                 //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
                 form_body = form_body.Replace("{DATE}", datestr);
                 newMail.HTMLBody = form_body + newMail.HTMLBody; //
@@ -1751,5 +1432,15 @@ namespace FEQ0000
                     "아웃룩의 설정이 정상인지 확인하세요");
             }
         }
+
+        private void 선택목록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            MailSendNoForm(false);
+        }
+
+        private void 선택목록입고양식ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            MailSendNoForm(false, "PC");
+        }
     }
 }

SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx

@@ -296,7 +296,7 @@
         brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="입고품목메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQfAPr8/VVritvj7IqsyElVa+Ps9MvT2rvc/aPQ/KrU/Or0/nmYspzN/LbZ/FJgeXiQ
         q0NLXHWPrJnA1sDf/CkxQ9RSXD5FVa/X/H2fudPn8HyjwMPg/WV/nG+Or////////yH/C05FVFNDQVBF

SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs

@@ -40,6 +40,7 @@ namespace FEQ0000
 
             this.bs.DataSource = rows;
             this.dataGridView1.DataError += (s1, e1) => { };
+            this.dataGridView1.EditMode = DataGridViewEditMode.EditOnKeystroke;
         }
 
         private void FPurchase_FormClosing(object sender, FormClosingEventArgs e)
@@ -312,11 +313,6 @@ namespace FEQ0000
 
         }
 
-        private void toolStripButton3_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void bs_CurrentChanged(object sender, EventArgs e)
         {
             var dr = bs.Current as dsPurchase.PurchaseRow;
@@ -326,10 +322,6 @@ namespace FEQ0000
             //else richTextBox2.Text = dr.bigo;
         }
 
-        private void toolStripButton4_Click(object sender, EventArgs e)
-        {
-
-        }
 
         string getmaxstr(string src, int len = 30)
         {
@@ -441,77 +433,25 @@ namespace FEQ0000
                 newMail.To = string.Join(";", tolist.ToArray());
                 newMail.CC = string.Join(";", cclist.ToArray());
                 newMail.BCC = string.Join(";", bcclist.ToArray());
+                string fn = "";
                 if (f.chkAttach.Checked)
                 {
-                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_confirm_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
+                    var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseNR_confirmeb_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls");
                     if (fi.Directory.Exists == false) fi.Directory.Create();
+                    fn = fi.FullName;
+                    //FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName);
 
-                    FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName);
 
-                
+                    //newMail.Attachments.Add(fi.FullName);
-                    newMail.Attachments.Add(fi.FullName);
                 }
-                if (f.chkList.Checked)
+                var rows = this.rows;
-                {
+                var tabledata = UTIL_EQ0000.MakeDataTableToHTML(rows, fn);
 
-                    //목록을 본문에 추가한다
-                    System.Text.StringBuilder sb = new StringBuilder();
-            
-                    sb.AppendLine("<table border='1' cellspacing='0' cellpadding='1'>");
-                    sb.AppendLine("<thead>");
 
-                    foreach (DataGridViewColumn col in this.dataGridView1.Columns)
+                if (fn.isEmpty() == false)
-                    {
+                    newMail.Attachments.Add(fn);
-                        if (col.DataPropertyName.ToLower() == "pumqty") continue;
-                        sb.AppendLine($"<td style='text-align:center;background-color: aqua;'>{col.HeaderText}</td>");
-                    }
-                    sb.AppendLine("</thead>");
-                    sb.AppendLine("<tbody>");
-
-                    for (int i = 0; i < this.dataGridView1.RowCount; i++)
-                    {
-
-                        sb.AppendLine("<tr>");
-
-                        foreach (DataGridViewColumn col in this.dataGridView1.Columns)
-                        {
-                            if (col.DataPropertyName.ToLower() == "pumqty") continue;
-                            var v = dataGridView1.Rows[i].Cells[col.Index].Value;
-                            string value = "";
-                            if (v != null) value = v.ToString();
-
-                            if (col.ValueType == typeof(int))
-                            {
-                                var ivalue = (int)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N0}</td>");
-                            }
-                            else if (col.ValueType == typeof(decimal))
-                            {
-                                var ivalue = (decimal)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N0}</td>");
-                            }
-                            else if (col.ValueType == typeof(float))
-                            {
-                                var ivalue = (float)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N1}</td>");
-                            }
-                            else if (col.ValueType == typeof(double))
-                            {
-                                var ivalue = (double)v;
-                                sb.AppendLine($"<td style='text-align:center'>{ivalue:N1}</td>");
-                            }
-                            else sb.AppendLine($"<td>{getmaxstr(value)}</td>");
-                        }
-                        sb.AppendLine("</tr>");
-                    }
-                    sb.AppendLine("</tbody>");
-                    sb.AppendLine("</table>");
-                    sb.AppendLine($"항목:{this.bs.Count}건,합계금액:{lbSum.Text}");
-                    form_body = form_body.Replace("{body}", sb.ToString());
-                }
-
-                //newMail.BodyFormat = OlBodyFormat.olFormatHTML;
 
+                form_body = form_body.Replace("{body}", tabledata);
                 newMail.HTMLBody = form_body + newMail.HTMLBody; //
             }
             catch (Exception ex)

SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.Designer.cs

@@ -63,6 +63,9 @@ namespace FEQ0000.Purchase
             this.tbPrjName = new System.Windows.Forms.TextBox();
             this.tbIdx = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.tbSCRCF = new System.Windows.Forms.TextBox();
+            this.tbSC = new System.Windows.Forms.TextBox();
+            this.tbSID = new System.Windows.Forms.TextBox();
             this.tbRemarkO = new System.Windows.Forms.TextBox();
             this.tbAmt = new System.Windows.Forms.TextBox();
             this.tbPriceO = new System.Windows.Forms.TextBox();
@@ -82,9 +85,6 @@ namespace FEQ0000.Purchase
             this.dtInDate = new System.Windows.Forms.DateTimePicker();
             this.btOK = new System.Windows.Forms.Button();
             this.arLabel3 = new System.Windows.Forms.Label();
-            this.tbSID = new System.Windows.Forms.TextBox();
-            this.tbSCRCF = new System.Windows.Forms.TextBox();
-            this.tbSC = new System.Windows.Forms.TextBox();
             label17 = new System.Windows.Forms.Label();
             label12 = new System.Windows.Forms.Label();
             label11 = new System.Windows.Forms.Label();
@@ -276,6 +276,45 @@ namespace FEQ0000.Purchase
             label1.TabIndex = 98;
             label1.Text = "수량/단가/금액";
             // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new System.Drawing.Point(40, 171);
+            label10.Name = "label10";
+            label10.Size = new System.Drawing.Size(58, 12);
+            label10.TabIndex = 109;
+            label10.Text = "SCR/CF#";
+            // 
+            // label15
+            // 
+            label15.AutoSize = true;
+            label15.Location = new System.Drawing.Point(76, 152);
+            label15.Name = "label15";
+            label15.Size = new System.Drawing.Size(22, 12);
+            label15.TabIndex = 110;
+            label15.Text = "SC";
+            // 
+            // label14
+            // 
+            label14.AutoSize = true;
+            label14.Font = new System.Drawing.Font("맑은 고딕", 15F);
+            label14.Location = new System.Drawing.Point(67, 303);
+            label14.Name = "label14";
+            label14.Size = new System.Drawing.Size(38, 28);
+            label14.TabIndex = 115;
+            label14.Text = "PO";
+            // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Font = new System.Drawing.Font("맑은 고딕", 15F);
+            label7.Location = new System.Drawing.Point(53, 221);
+            label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label7.Name = "label7";
+            label7.Size = new System.Drawing.Size(52, 28);
+            label7.TabIndex = 116;
+            label7.Text = "비고";
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Gainsboro;
@@ -303,7 +342,7 @@ namespace FEQ0000.Purchase
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(582, 171);
+            this.panel1.Size = new System.Drawing.Size(985, 171);
             this.panel1.TabIndex = 87;
             // 
             // tbPrjStatus
@@ -388,7 +427,7 @@ namespace FEQ0000.Purchase
             this.arLabel2.ForeColor = System.Drawing.Color.Black;
             this.arLabel2.Location = new System.Drawing.Point(0, 0);
             this.arLabel2.Name = "arLabel2";
-            this.arLabel2.Size = new System.Drawing.Size(582, 23);
+            this.arLabel2.Size = new System.Drawing.Size(985, 23);
             this.arLabel2.TabIndex = 86;
             this.arLabel2.Text = "프로젝트";
             this.arLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -435,9 +474,40 @@ namespace FEQ0000.Purchase
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 171);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(582, 192);
+            this.panel2.Size = new System.Drawing.Size(985, 192);
             this.panel2.TabIndex = 88;
             // 
+            // tbSCRCF
+            // 
+            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSCRCF.Location = new System.Drawing.Point(338, 147);
+            this.tbSCRCF.Name = "tbSCRCF";
+            this.tbSCRCF.ReadOnly = true;
+            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
+            this.tbSCRCF.TabIndex = 112;
+            // 
+            // tbSC
+            // 
+            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbSC.Location = new System.Drawing.Point(104, 147);
+            this.tbSC.Name = "tbSC";
+            this.tbSC.ReadOnly = true;
+            this.tbSC.Size = new System.Drawing.Size(232, 38);
+            this.tbSC.TabIndex = 111;
+            // 
+            // tbSID
+            // 
+            this.tbSID.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbSID.Location = new System.Drawing.Point(433, 53);
+            this.tbSID.Name = "tbSID";
+            this.tbSID.ReadOnly = true;
+            this.tbSID.Size = new System.Drawing.Size(137, 30);
+            this.tbSID.TabIndex = 108;
+            this.tbSID.Text = "000000000";
+            this.tbSID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // tbRemarkO
             // 
             this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
@@ -507,7 +577,7 @@ namespace FEQ0000.Purchase
             this.arLabel1.ForeColor = System.Drawing.Color.Black;
             this.arLabel1.Location = new System.Drawing.Point(0, 0);
             this.arLabel1.Name = "arLabel1";
-            this.arLabel1.Size = new System.Drawing.Size(582, 23);
+            this.arLabel1.Size = new System.Drawing.Size(985, 23);
             this.arLabel1.TabIndex = 86;
             this.arLabel1.Text = "품목정보";
             this.arLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -560,7 +630,7 @@ namespace FEQ0000.Purchase
             this.panel3.Location = new System.Drawing.Point(0, 363);
             this.panel3.Name = "panel3";
             this.panel3.Padding = new System.Windows.Forms.Padding(0, 0, 10, 10);
-            this.panel3.Size = new System.Drawing.Size(582, 351);
+            this.panel3.Size = new System.Drawing.Size(985, 351);
             this.panel3.TabIndex = 89;
             // 
             // tbInPrice
@@ -637,7 +707,7 @@ namespace FEQ0000.Purchase
             // 
             this.btOK.Dock = System.Windows.Forms.DockStyle.Right;
             this.btOK.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.btOK.Location = new System.Drawing.Point(433, 23);
+            this.btOK.Location = new System.Drawing.Point(836, 23);
             this.btOK.Name = "btOK";
             this.btOK.Size = new System.Drawing.Size(139, 318);
             this.btOK.TabIndex = 102;
@@ -654,81 +724,11 @@ namespace FEQ0000.Purchase
             this.arLabel3.ForeColor = System.Drawing.Color.Black;
             this.arLabel3.Location = new System.Drawing.Point(0, 0);
             this.arLabel3.Name = "arLabel3";
-            this.arLabel3.Size = new System.Drawing.Size(572, 23);
+            this.arLabel3.Size = new System.Drawing.Size(975, 23);
             this.arLabel3.TabIndex = 86;
             this.arLabel3.Text = "입고정보";
             this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // tbSID
-            // 
-            this.tbSID.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSID.Location = new System.Drawing.Point(433, 53);
-            this.tbSID.Name = "tbSID";
-            this.tbSID.ReadOnly = true;
-            this.tbSID.Size = new System.Drawing.Size(137, 30);
-            this.tbSID.TabIndex = 108;
-            this.tbSID.Text = "000000000";
-            this.tbSID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // tbSCRCF
-            // 
-            this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSCRCF.Location = new System.Drawing.Point(338, 147);
-            this.tbSCRCF.Name = "tbSCRCF";
-            this.tbSCRCF.ReadOnly = true;
-            this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
-            this.tbSCRCF.TabIndex = 112;
-            // 
-            // tbSC
-            // 
-            this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.tbSC.Location = new System.Drawing.Point(104, 147);
-            this.tbSC.Name = "tbSC";
-            this.tbSC.ReadOnly = true;
-            this.tbSC.Size = new System.Drawing.Size(232, 38);
-            this.tbSC.TabIndex = 111;
-            // 
-            // label10
-            // 
-            label10.AutoSize = true;
-            label10.Location = new System.Drawing.Point(40, 171);
-            label10.Name = "label10";
-            label10.Size = new System.Drawing.Size(58, 12);
-            label10.TabIndex = 109;
-            label10.Text = "SCR/CF#";
-            // 
-            // label15
-            // 
-            label15.AutoSize = true;
-            label15.Location = new System.Drawing.Point(76, 152);
-            label15.Name = "label15";
-            label15.Size = new System.Drawing.Size(22, 12);
-            label15.TabIndex = 110;
-            label15.Text = "SC";
-            // 
-            // label14
-            // 
-            label14.AutoSize = true;
-            label14.Font = new System.Drawing.Font("맑은 고딕", 15F);
-            label14.Location = new System.Drawing.Point(67, 303);
-            label14.Name = "label14";
-            label14.Size = new System.Drawing.Size(38, 28);
-            label14.TabIndex = 115;
-            label14.Text = "PO";
-            // 
-            // label7
-            // 
-            label7.AutoSize = true;
-            label7.Font = new System.Drawing.Font("맑은 고딕", 15F);
-            label7.Location = new System.Drawing.Point(53, 221);
-            label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label7.Name = "label7";
-            label7.Size = new System.Drawing.Size(52, 28);
-            label7.TabIndex = 116;
-            label7.Text = "비고";
-            // 
             // fPurchaseNR_Ipgo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs

@@ -14,13 +14,14 @@ namespace FEQ0000.Purchase
     {
         int idx = -1;
         string po = string.Empty;
-        public fPurchaseNR_Ipgo(int purchaseIdx,string po_)
+        public fPurchaseNR_Ipgo(int purchaseIdx, string po_)
         {
             InitializeComponent();
             this.po = po_;
             this.idx = purchaseIdx;
             this.KeyPreview = true;
-            this.KeyDown += (s1, e1) => {
+            this.KeyDown += (s1, e1) =>
+            {
                 if (e1.KeyCode == Keys.Escape) this.Close();
             };
         }
@@ -122,16 +123,24 @@ namespace FEQ0000.Purchase
                 cmbReceive.Focus();
                 return;
             }
-            var ta = new dsPurchaseTableAdapters.PurchaseTableAdapter ();
+            var ta = new dsPurchaseTableAdapters.PurchaseTableAdapter();
             var dr = ta.GetByIdx(this.idx).First();
             if (chkInDate.Checked == false)
             {
+                if (dr.IsindateNull() == false)
+                {
+                    if (dr.indate.isEmpty() == false)
+                    {
+                        if (FCOMMON.Util.MsgQ("입고정보를 삭제할까요? 상태는 [PR]로 전환됩니다.") != DialogResult.Yes) return;
+                    }
+                }
+
                 dr.indate = string.Empty;
                 dr.receive = string.Empty;
                 //  dr.receiveName = string.Empty;
                 dr.inqty = 0;
                 dr.inremark = string.Empty;
-                if (prestatus == "Received") dr.state = "---";
+                if (prestatus == "Received") dr.state = "PO";
                 else dr.state = prestatus;
             }
             else

SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.resx

@@ -180,16 +180,4 @@
   <metadata name="label7.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>
-  <metadata name="label15.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="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
 </root>

SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs

@@ -77,7 +77,6 @@
             this.cmbState = new System.Windows.Forms.ComboBox();
             this.cmbRequest = new System.Windows.Forms.ComboBox();
             this.cmbReceive = new System.Windows.Forms.ComboBox();
-            this.tbPumIDX = new System.Windows.Forms.TextBox();
             this.dtInDate = new System.Windows.Forms.DateTimePicker();
             this.chkInDate = new System.Windows.Forms.CheckBox();
             this.dtExpDate = new System.Windows.Forms.DateTimePicker();
@@ -118,6 +117,7 @@
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
+            this.tbPumIDX = new System.Windows.Forms.Button();
             processLabel = new System.Windows.Forms.Label();
             receiveLabel = new System.Windows.Forms.Label();
             scLabel = new System.Windows.Forms.Label();
@@ -216,7 +216,7 @@
             // pumpriceLabel
             // 
             pumpriceLabel.AutoSize = true;
-            pumpriceLabel.Location = new System.Drawing.Point(7, 176);
+            pumpriceLabel.Location = new System.Drawing.Point(7, 175);
             pumpriceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumpriceLabel.Name = "pumpriceLabel";
             pumpriceLabel.Size = new System.Drawing.Size(79, 20);
@@ -330,7 +330,7 @@
             // 
             label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             label7.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label7.Location = new System.Drawing.Point(11, 661);
+            label7.Location = new System.Drawing.Point(11, 640);
             label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label7.Name = "label7";
             label7.Padding = new System.Windows.Forms.Padding(5);
@@ -434,7 +434,7 @@
             // 
             // label18
             // 
-            this.label18.Location = new System.Drawing.Point(277, 177);
+            this.label18.Location = new System.Drawing.Point(277, 175);
             this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(198, 20);
@@ -602,7 +602,7 @@
             // 
             // btSave
             // 
-            this.btSave.Location = new System.Drawing.Point(11, 770);
+            this.btSave.Location = new System.Drawing.Point(11, 749);
             this.btSave.Margin = new System.Windows.Forms.Padding(4);
             this.btSave.Name = "btSave";
             this.btSave.Size = new System.Drawing.Size(490, 43);
@@ -650,18 +650,6 @@
             this.cmbReceive.Size = new System.Drawing.Size(286, 28);
             this.cmbReceive.TabIndex = 5;
             // 
-            // tbPumIDX
-            // 
-            this.tbPumIDX.Location = new System.Drawing.Point(410, 79);
-            this.tbPumIDX.Margin = new System.Windows.Forms.Padding(4);
-            this.tbPumIDX.Name = "tbPumIDX";
-            this.tbPumIDX.ReadOnly = true;
-            this.tbPumIDX.Size = new System.Drawing.Size(64, 27);
-            this.tbPumIDX.TabIndex = 8;
-            this.tbPumIDX.TabStop = false;
-            this.tbPumIDX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.toolTip1.SetToolTip(this.tbPumIDX, "Database ID");
-            // 
             // dtInDate
             // 
             this.dtInDate.Location = new System.Drawing.Point(112, 297);
@@ -708,7 +696,7 @@
             // 
             // btSaveAdd
             // 
-            this.btSaveAdd.Location = new System.Drawing.Point(511, 770);
+            this.btSaveAdd.Location = new System.Drawing.Point(511, 749);
             this.btSaveAdd.Margin = new System.Windows.Forms.Padding(4);
             this.btSaveAdd.Name = "btSaveAdd";
             this.btSaveAdd.Size = new System.Drawing.Size(410, 43);
@@ -719,6 +707,7 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.tbPumIDX);
             this.groupBox1.Controls.Add(this.tbStorage);
             this.groupBox1.Controls.Add(this.label18);
             this.groupBox1.Controls.Add(this.cmbRemark);
@@ -745,7 +734,6 @@
             this.groupBox1.Controls.Add(deptLabel);
             this.groupBox1.Controls.Add(this.tbSupplyIndex);
             this.groupBox1.Controls.Add(pumamtLabel);
-            this.groupBox1.Controls.Add(this.tbPumIDX);
             this.groupBox1.Controls.Add(this.cmbState);
             this.groupBox1.Controls.Add(this.tbSID);
             this.groupBox1.Controls.Add(this.tbQtyReq);
@@ -766,7 +754,7 @@
             this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox1.Size = new System.Drawing.Size(490, 651);
+            this.groupBox1.Size = new System.Drawing.Size(490, 628);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "필수입력";
@@ -859,9 +847,9 @@
             // btSIDChk
             // 
             this.btSIDChk.BackColor = System.Drawing.Color.Gray;
-            this.btSIDChk.Location = new System.Drawing.Point(279, 264);
+            this.btSIDChk.Location = new System.Drawing.Point(274, 264);
             this.btSIDChk.Name = "btSIDChk";
-            this.btSIDChk.Size = new System.Drawing.Size(196, 34);
+            this.btSIDChk.Size = new System.Drawing.Size(201, 34);
             this.btSIDChk.TabIndex = 27;
             this.btSIDChk.Text = "SID 검사(SPR/NR)";
             this.btSIDChk.UseVisualStyleBackColor = false;
@@ -951,7 +939,7 @@
             this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox2.Size = new System.Drawing.Size(409, 650);
+            this.groupBox2.Size = new System.Drawing.Size(409, 627);
             this.groupBox2.TabIndex = 0;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "추가정보";
@@ -1064,7 +1052,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(4, 615);
+            this.button7.Location = new System.Drawing.Point(14, 590);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(93, 27);
             this.button7.TabIndex = 29;
@@ -1083,7 +1071,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(4, 583);
+            this.button6.Location = new System.Drawing.Point(14, 558);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(93, 27);
             this.button6.TabIndex = 28;
@@ -1093,7 +1081,7 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(4, 551);
+            this.button5.Location = new System.Drawing.Point(14, 526);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(93, 27);
             this.button5.TabIndex = 27;
@@ -1103,7 +1091,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(4, 519);
+            this.button4.Location = new System.Drawing.Point(14, 494);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(93, 27);
             this.button4.TabIndex = 26;
@@ -1125,7 +1113,7 @@
             // pictureBox1
             // 
             this.pictureBox1.BackColor = System.Drawing.Color.Gray;
-            this.pictureBox1.Location = new System.Drawing.Point(104, 519);
+            this.pictureBox1.Location = new System.Drawing.Point(114, 494);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(286, 123);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -1152,11 +1140,20 @@
             // 
             this.ta.ClearBeforeFill = true;
             // 
+            // tbPumIDX
+            // 
+            this.tbPumIDX.Location = new System.Drawing.Point(410, 79);
+            this.tbPumIDX.Name = "tbPumIDX";
+            this.tbPumIDX.Size = new System.Drawing.Size(65, 27);
+            this.tbPumIDX.TabIndex = 53;
+            this.tbPumIDX.UseVisualStyleBackColor = true;
+            this.tbPumIDX.Click += new System.EventHandler(this.tbPumIDX_Click);
+            // 
             // fPurchase_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(929, 821);
+            this.ClientSize = new System.Drawing.Size(929, 796);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.btSaveAdd);
@@ -1203,7 +1200,6 @@
         private System.Windows.Forms.ComboBox cmbState;
         private System.Windows.Forms.ComboBox cmbRequest;
         private System.Windows.Forms.ComboBox cmbReceive;
-        private System.Windows.Forms.TextBox tbPumIDX;
         private System.Windows.Forms.DateTimePicker dtInDate;
         private System.Windows.Forms.CheckBox chkInDate;
         private System.Windows.Forms.DateTimePicker dtExpDate;
@@ -1245,5 +1241,6 @@
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.DateTimePicker dtPrdate;
         private System.Windows.Forms.CheckBox chkprdate;
+        private System.Windows.Forms.Button tbPumIDX;
     }
 }

SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs

@@ -1380,5 +1380,29 @@ namespace FEQ0000
             btEQModel.BackColor = bgcolor;
             btManuProc.BackColor = bgcolor;
         }
+
+        private void tbPumIDX_Click(object sender, EventArgs e)
+        {
+            if (int.TryParse(tbPumIDX.Text, out int pumidx) == false)
+            {
+                FCOMMON.Util.MsgE("품번호가 정확하지 않습니다\n품목을 다시 선택하세요");
+                return;
+            }
+            if(pumidx < 0)
+            {
+                FCOMMON.Util.MsgE("품번호가 정확하지 않습니다\n품목을 다시 선택하세요");
+                return;
+            }
+            var f = new FCM0000.Item.fItemEdit(pumidx);
+            if (f.ShowDialog() != DialogResult.OK) return;
+
+            tbPumName.Text = f.tbName.Text;
+            tbPumModel.Text = f.tbModel.Text;
+            tbPumPrice.Text = f.tbPrice.Text;
+            tbPumPriceD.Text = f.tbPriceD.Text;
+            tbSupply.Text = f.tbSupply.Text;
+            tbSupplyIndex.Text = f.tbSupplyIdx.Text;
+            tbSID.Text = f.tbSid.Text;
+        }
     }
 }

SubProject/FEQ0000/dsPurchase.Designer.cs

@@ -17387,18 +17387,33 @@ ORDER BY pdate DESC, idx DESC";
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = @"SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+            this._commandCollection[0].CommandText = "SELECT          \'NR\' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty" +
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                ", pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS re" +
-FROM     Purchase
+                "quest, indate, inqty, \r\n                      dbo.getUserName(receive) AS receiv" +
-WHERE  (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
+                "e, sc, po, orderno, (CASE [state] WHEN \'PO\' THEN 1 WHEN \'PR\' THEN 2 ELSE 3 END) " +
-               (ISNULL(purchase_admin, '') LIKE @search_admin)
+                "AS sortkey, purchase_manager, purchase_admin, \r\n                      place\r\nFRO" +
-UNION
+                "M            Purchase\r\nWHERE           (state IN (\'PO\', \'PR\', \'Approving\')) AND " +
-SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+                "(pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(pu" +
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                "rchase_manager, \'\') \r\n                      LIKE @search_manager) AND (ISNULL(pu" +
-FROM     EETGW_PurchaseCR
+                "rchase_admin, \'\') LIKE @search_admin)\r\nUNION\r\nSELECT          \'CR\' AS Expr1, idx" +
-WHERE  (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
+                ", pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, projec" +
-               (ISNULL(purchase_admin, '') LIKE @search_admin)
+                "t, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, \r\n          " +
-ORDER BY sortkey, wdate DESC";
+                "            dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] " +
+                "WHEN \'PO\' THEN 1 WHEN \'PR\' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purc" +
+                "hase_admin, \r\n                      place\r\nFROM            EETGW_PurchaseCR\r\nWHE" +
+                "RE           (state IN (\'PO\', \'PR\', \'Approving\')) AND (pdate >= @pdate) AND (ISN" +
+                "ULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, \'\') \r\n    " +
+                "                  LIKE @search_manager) AND (ISNULL(purchase_admin, \'\') LIKE @se" +
+                "arch_admin)\r\nUNION\r\nSELECT          \'EB\' AS Expr1, idx, pdate, state, sid, pumna" +
+                "me, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUse" +
+                "rName(request) AS request, indate, inqty, \r\n                      dbo.getUserNam" +
+                "e(receive) AS receive, sc, po, orderno, (CASE [state] WHEN \'PO\' THEN 1 WHEN \'PR\'" +
+                " THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, \r\n            " +
+                "          place\r\nFROM            EETGW_PurchaseEB\r\nWHERE           (state IN (\'P" +
+                "O\', \'PR\', \'Approving\')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gc" +
+                "ode = @gcode) AND (ISNULL(purchase_manager, \'\') \r\n                      LIKE @se" +
+                "arch_manager) AND (ISNULL(purchase_admin, \'\') LIKE @search_admin)\r\nORDER BY     " +
+                "sortkey, wdate DESC";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -17406,18 +17421,32 @@ ORDER BY sortkey, wdate DESC";
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search_admin", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = @"SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+            this._commandCollection[1].CommandText = "SELECT          \'NR\' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty" +
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                ", pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS re" +
-FROM     Purchase
+                "quest, indate, inqty, \r\n                      dbo.getUserName(receive) AS receiv" +
-WHERE  (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') 
+                "e, sc, po, orderno, (CASE [state] WHEN \'PO\' THEN 1 WHEN \'PR\' THEN 2 ELSE 3 END) " +
-               LIKE @search_admin)
+                "AS sortkey, purchase_manager, purchase_admin, \r\n                      place\r\nFRO" +
-UNION
+                "M            Purchase\r\nWHERE           (state = \'Received\') AND (indate = @pdate" +
-SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+                ") AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, " +
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                "\'\') LIKE @search_manager) AND \r\n                      (ISNULL(purchase_admin, \'\'" +
-FROM     EETGW_PurchaseCR
+                ") LIKE @search_admin)\r\nUNION\r\nSELECT          \'CR\' AS Expr1, idx, pdate, state, " +
-WHERE  (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') 
+                "sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, " +
-               LIKE @search_admin)
+                "dbo.getUserName(request) AS request, indate, inqty, \r\n                      dbo." +
-ORDER BY source DESC, request, wdate DESC";
+                "getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN \'PO\' THEN 1" +
+                " WHEN \'PR\' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, \r\n  " +
+                "                    place\r\nFROM            EETGW_PurchaseCR\r\nWHERE           (st" +
+                "ate = \'Received\') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = " +
+                "@gcode) AND (ISNULL(purchase_manager, \'\') LIKE @search_manager) AND \r\n          " +
+                "            (ISNULL(purchase_admin, \'\') LIKE @search_admin)\r\nUNION\r\nSELECT      " +
+                "    \'CR\' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, " +
+                "pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indat" +
+                "e, inqty, \r\n                      dbo.getUserName(receive) AS receive, sc, po, o" +
+                "rderno, (CASE [state] WHEN \'PO\' THEN 1 WHEN \'PR\' THEN 2 ELSE 3 END) AS sortkey, " +
+                "purchase_manager, purchase_admin, \r\n                      place\r\nFROM           " +
+                " EETGW_PurchaseEB\r\nWHERE           (state = \'Received\') AND (indate = @pdate) AN" +
+                "D (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, \'\') " +
+                "LIKE @search_manager) AND \r\n                      (ISNULL(purchase_admin, \'\') LI" +
+                "KE @search_admin)\r\nORDER BY     source DESC, request, wdate DESC";
             this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

SubProject/FEQ0000/dsPurchase.xsd

@@ -983,18 +983,27 @@ ORDER BY pdate DESC, idx DESC</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" 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">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+                    <CommandText>SELECT          'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                      dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, 
-FROM     Purchase
+                      place
-WHERE  (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
+FROM            Purchase
-               (ISNULL(purchase_admin, '') LIKE @search_admin)
+WHERE           (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') 
+                      LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin)
 UNION
-SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+SELECT          'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                      dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, 
-FROM     EETGW_PurchaseCR
+                      place
-WHERE  (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
+FROM            EETGW_PurchaseCR
-               (ISNULL(purchase_admin, '') LIKE @search_admin)
+WHERE           (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') 
-ORDER BY sortkey, wdate DESC</CommandText>
+                      LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin)
+UNION
+SELECT          'EB' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+                      dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, 
+                      place
+FROM            EETGW_PurchaseEB
+WHERE           (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') 
+                      LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin)
+ORDER BY     sortkey, wdate DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1036,18 +1045,27 @@ ORDER BY sortkey, wdate DESC</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByTodayIn" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByTodayIn" GeneratorSourceName="FillByTodayIn" GetMethodModifier="Public" GetMethodName="GetByTodayIn" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByTodayIn" UserSourceName="FillByTodayIn">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+                    <CommandText>SELECT          'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                      dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, 
-FROM     Purchase
+                      place
-WHERE  (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') 
+FROM            Purchase
-               LIKE @search_admin)
+WHERE           (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
+                      (ISNULL(purchase_admin, '') LIKE @search_admin)
 UNION
-SELECT  'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+SELECT          'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
-               dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
+                      dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, 
-FROM     EETGW_PurchaseCR
+                      place
-WHERE  (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') 
+FROM            EETGW_PurchaseCR
-               LIKE @search_admin)
+WHERE           (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
-ORDER BY source DESC, request, wdate DESC</CommandText>
+                      (ISNULL(purchase_admin, '') LIKE @search_admin)
+UNION
+SELECT          'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, 
+                      dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, 
+                      place
+FROM            EETGW_PurchaseEB
+WHERE           (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
+                      (ISNULL(purchase_admin, '') LIKE @search_admin)
+ORDER BY     source DESC, request, wdate DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="indate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2185,14 +2203,14 @@ ORDER BY pdate DESC, idx DESC</CommandText>
         <xs:element name="Ipkolist" msprop:Generator_RowEvHandlerName="IpkolistRowChangeEventHandler" msprop:Generator_RowDeletedName="IpkolistRowDeleted" msprop:Generator_RowDeletingName="IpkolistRowDeleting" msprop:Generator_RowEvArgName="IpkolistRowChangeEvent" msprop:Generator_TablePropName="Ipkolist" msprop:Generator_RowChangedName="IpkolistRowChanged" msprop:Generator_UserTableName="Ipkolist" msprop:Generator_RowChangingName="IpkolistRowChanging" msprop:Generator_RowClassName="IpkolistRow" msprop:Generator_TableClassName="IpkolistDataTable" msprop:Generator_TableVarName="tableIpkolist">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="source" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="sourceColumn" msprop:Generator_ColumnPropNameInRow="source" msprop:Generator_UserColumnName="source" msprop:Generator_ColumnVarNameInTable="columnsource">
+              <xs:element name="source" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="sourceColumn" msprop:Generator_ColumnPropNameInRow="source" msprop:Generator_UserColumnName="source" msprop:Generator_ColumnVarNameInTable="columnsource" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" minOccurs="0" />
               <xs:element name="pdate" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -2692,7 +2710,7 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="site" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="siteColumn" msprop:Generator_ColumnVarNameInTable="columnsite" msprop:Generator_UserColumnName="site" msprop:Generator_ColumnPropNameInRow="site" minOccurs="0">
+              <xs:element name="site" msprop:Generator_ColumnPropNameInTable="siteColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="site" msprop:Generator_UserColumnName="site" msprop:Generator_ColumnVarNameInTable="columnsite" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />

SubProject/FEQ0000/fItemin.cs

@@ -293,6 +293,16 @@ namespace FEQ0000
                     tbSearch.SelectAll();
                 }
             }
+            else if (dr.source == "EB")
+            {
+                var f = new FEQ0000.Purchase.fPurchaseEB_Ipgo(dr.idx, po);
+                if (f.ShowDialog() == DialogResult.OK)
+                {
+                    refreshData();
+                    tbSearch.Focus();
+                    tbSearch.SelectAll();
+                }
+            }
             else
             {
                 var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx, po);

SubProject/FPJ0000/Project/fProjectData.cs

@@ -165,7 +165,8 @@ namespace FPJ0000
             btMailAddr.Enabled = btPart.Enabled;
             btPath.Enabled = btPart.Enabled;
             btSendMail.Enabled = btPart.Enabled;
-            tbSFI.Text = dr.sfi.ToString("N2");
+            if(dr.IssficNull()==false)
+                tbSFI.Text = dr.sfic.ToString("N2");
 
             //일반사용자의경우에는 상태를 변경하지 못한다.
             int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project));

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -119,7 +119,6 @@
             this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.cmbDateType = new System.Windows.Forms.ToolStripComboBox();
             this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
@@ -216,13 +215,13 @@
             this.label41 = new System.Windows.Forms.Label();
             this.lbcnt5 = new System.Windows.Forms.Label();
             this.lbcnt6 = new System.Windows.Forms.Label();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsHistD)).BeginInit();
@@ -236,6 +235,7 @@
             this.panel1.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
             this.tableLayoutPanel4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -692,306 +692,7 @@
             this.fpSpread1.Size = new System.Drawing.Size(1339, 295);
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
-            // 
+            this.fpSpread1.SetViewportLeftColumn(0, 0, 14);
-            // 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 = 38;
-            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
-            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, 3).ColumnSpan = 8;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Basic Info";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Process /\r\nEquipment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).ColumnSpan = 8;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Schedule";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Schedule";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).ColumnSpan = 5;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Original\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).StyleName = " ";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Input\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "Effect\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "Budget";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Human Resource";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).ColumnSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "Comment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "Comment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Ext.Info";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "Cost Save";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "Fan Out";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "Major Item";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Project\r\nNo";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Process / Equipment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "Site";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Plant";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "PKG";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Line";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Request Team";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Project Title";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "준수(%)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "완료(%)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Status";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "검토\r\n기한";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "업데이트";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Start Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Due Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "Done Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Q\'ty";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "Outsourced Cost ($K)/Set\r\n";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "In-house Cost ($K/Set)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "Cost Save ($k)/Set";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "SFI";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "SCR/CF";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "Champion";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "S/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Design";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "ePanel";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "History";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "Memo";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "Asset";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "Model#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Serial#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "자스민";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "Major Item";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F;
-            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).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "category";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "userprocess";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "pno";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "Project\r\nNo";
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "Process / Equipment";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqSite";
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "Site";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqPlant";
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "Plant";
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ReqPackage";
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "PKG";
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ReqLine";
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "Line";
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "part";
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "Request Team";
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "Project Title";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType3.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "finishrate";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "준수(%)";
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ProgressPrj";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "완료(%)";
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "Status";
-            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "Status";
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "kdate";
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "검토\r\n기한";
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "lasthistory_date";
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "업데이트";
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Width = 58F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "sdate";
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "Start Date";
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ddate";
-            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Label = "Due Date";
-            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType15;
-            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "edate";
-            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(18).Label = "Done Date";
-            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType5.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "cnt";
-            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(19).Label = "Q\'ty";
-            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(19).Width = 42F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "costo";
-            this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(20).Label = "Outsourced Cost ($K)/Set\r\n";
-            this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F;
-            numberCellType7.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costn";
-            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(21).Label = "In-house Cost ($K/Set)";
-            this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType8.MaximumValue = 999999999999999D;
-            numberCellType8.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "coste";
-            this.fpSpread1_Sheet1.Columns.Get(22).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(22).Label = "Cost Save ($k)/Set";
-            this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(22).Width = 67F;
-            numberCellType9.MaximumValue = 999999999999999D;
-            numberCellType9.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "sfi";
-            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(23).Label = "SFI";
-            this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(23).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16;
-            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "orderno";
-            this.fpSpread1_Sheet1.Columns.Get(24).Label = "SCR/CF";
-            this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion";
-            this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion";
-            this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_software";
-            this.fpSpread1_Sheet1.Columns.Get(26).Label = "S/W";
-            this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
-            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_design";
-            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(27).Label = "Design";
-            this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20;
-            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_epanel";
-            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).Label = "ePanel";
-            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "lasthistory";
-            this.fpSpread1_Sheet1.Columns.Get(29).Label = "History";
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType22;
-            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "memo";
-            this.fpSpread1_Sheet1.Columns.Get(30).Label = "Memo";
-            this.fpSpread1_Sheet1.Columns.Get(30).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType23;
-            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "asset";
-            this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(31).Label = "Asset";
-            this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType24;
-            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "model";
-            this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).Label = "Model#";
-            this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType25;
-            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "serial";
-            this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).Label = "Serial#";
-            this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType10.DecimalPlaces = 0;
-            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType10.MaximumValue = 2147483647D;
-            numberCellType10.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(34).DataField = "jasmin";
-            this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(34).Label = "자스민";
-            this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(35).DataField = "bCost";
-            this.fpSpread1_Sheet1.Columns.Get(35).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bFanOut";
-            this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bHighlight";
-            this.fpSpread1_Sheet1.Columns.Get(37).Label = "Major Item";
-            this.fpSpread1_Sheet1.Columns.Get(37).Tag = "Highlight";
-            this.fpSpread1_Sheet1.Columns.Get(37).Width = 39F;
-            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;
             // 
             // toolStrip1
             // 
@@ -2222,6 +1923,306 @@
             this.lbcnt6.Text = "000";
             this.lbcnt6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // 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 = 38;
+            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+            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, 3).ColumnSpan = 8;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Basic Info";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Process /\r\nEquipment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).ColumnSpan = 8;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Schedule";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Schedule";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).ColumnSpan = 5;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Original\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).StyleName = " ";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Input\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "Effect\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "Budget";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Human Resource";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).ColumnSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "Comment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "Comment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Ext.Info";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "Cost Save";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "Fan Out";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "Major Item";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Project\r\nNo";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Process / Equipment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "Site";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Plant";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "PKG";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Line";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Request Team";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Project Title";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "준수(%)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "완료(%)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Status";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "검토\r\n기한";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "업데이트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Start Date";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Due Date";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "Done Date";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Q\'ty";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "Outsourced Cost ($K)/Set\r\n";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "In-house Cost ($K/Set)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "Cost Save ($k)/Set";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "SFI";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "SCR/CF";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "Champion";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "S/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Design";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "ePanel";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "History";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "Memo";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "Asset";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "Model#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Serial#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "자스민";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "Major Item";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F;
+            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).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
+            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "category";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "userprocess";
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType2.DecimalPlaces = 0;
+            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType2.MaximumValue = 2147483647D;
+            numberCellType2.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "pno";
+            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Label = "Project\r\nNo";
+            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "Process / Equipment";
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqSite";
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "Site";
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqPlant";
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "Plant";
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ReqPackage";
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "PKG";
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ReqLine";
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "Line";
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "part";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "Request Team";
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name";
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "Project Title";
+            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType3.DecimalPlaces = 0;
+            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType3.MaximumValue = 2147483647D;
+            numberCellType3.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "finishrate";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "준수(%)";
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType4.DecimalPlaces = 0;
+            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType4.MaximumValue = 2147483647D;
+            numberCellType4.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ProgressPrj";
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "완료(%)";
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "Status";
+            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "Status";
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "kdate";
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "검토\r\n기한";
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "lasthistory_date";
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Label = "업데이트";
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Width = 58F;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "sdate";
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "Start Date";
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Width = 52F;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ddate";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Label = "Due Date";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).Label = "Done Date";
+            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType5.DecimalPlaces = 0;
+            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType5.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "cnt";
+            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(19).Label = "Q\'ty";
+            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(19).Width = 42F;
+            numberCellType6.MaximumValue = 999999999999999D;
+            numberCellType6.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "costo";
+            this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(20).Label = "Outsourced Cost ($K)/Set\r\n";
+            this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F;
+            numberCellType7.MaximumValue = 999999999999999D;
+            numberCellType7.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costn";
+            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(21).Label = "In-house Cost ($K/Set)";
+            this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType8.MaximumValue = 999999999999999D;
+            numberCellType8.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "coste";
+            this.fpSpread1_Sheet1.Columns.Get(22).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(22).Label = "Cost Save ($k)/Set";
+            this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(22).Width = 67F;
+            numberCellType9.MaximumValue = 999999999999999D;
+            numberCellType9.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "sfic";
+            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).Label = "SFI";
+            this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).Width = 52F;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "orderno";
+            this.fpSpread1_Sheet1.Columns.Get(24).Label = "SCR/CF";
+            this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion";
+            this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion";
+            this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_software";
+            this.fpSpread1_Sheet1.Columns.Get(26).Label = "S/W";
+            this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_design";
+            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(27).Label = "Design";
+            this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_epanel";
+            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(28).Label = "ePanel";
+            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "lasthistory";
+            this.fpSpread1_Sheet1.Columns.Get(29).Label = "History";
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "memo";
+            this.fpSpread1_Sheet1.Columns.Get(30).Label = "Memo";
+            this.fpSpread1_Sheet1.Columns.Get(30).Width = 77F;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "asset";
+            this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(31).Label = "Asset";
+            this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "model";
+            this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(32).Label = "Model#";
+            this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "serial";
+            this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(33).Label = "Serial#";
+            this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType10.DecimalPlaces = 0;
+            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType10.MaximumValue = 2147483647D;
+            numberCellType10.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(34).DataField = "jasmin";
+            this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(34).Label = "자스민";
+            this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(35).DataField = "bCost";
+            this.fpSpread1_Sheet1.Columns.Get(35).Width = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bFanOut";
+            this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bHighlight";
+            this.fpSpread1_Sheet1.Columns.Get(37).Label = "Major Item";
+            this.fpSpread1_Sheet1.Columns.Get(37).Tag = "Highlight";
+            this.fpSpread1_Sheet1.Columns.Get(37).Width = 39F;
+            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;
+            // 
             // fProjectList
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2244,7 +2245,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
@@ -2261,6 +2261,7 @@
             this.panel1.PerformLayout();
             this.tableLayoutPanel3.ResumeLayout(false);
             this.tableLayoutPanel4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -2401,7 +2402,6 @@
         private System.Windows.Forms.RichTextBox rtMemo;
         private System.Windows.Forms.BindingSource bsHistD;
         private dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter taHistD;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
         private System.Windows.Forms.Label label32;
@@ -2416,5 +2416,6 @@
         private System.Windows.Forms.Label label41;
         private System.Windows.Forms.Label lbcnt5;
         private System.Windows.Forms.Label lbcnt6;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FPJ0000/Project/fProjectList.cs

@@ -215,7 +215,7 @@ namespace FPJ0000
                 " [costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress]," +
                 " [memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[bHighlight],[div]," +
                 " dbo.getScheduleProgress(idx) as ProgressPrj,'' AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial," +
-                " [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate,sfi_shiftcount, sfi_type, sfi_savetime, sfi_savecount," +
+                " [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate,sfic,sfi_shiftcount, sfi_type, sfi_savetime, sfi_savecount," +
                 " championid,designid,assemblyid,epanelid,softwareid,userAssembly,effect_tangible,effect_intangible," +
                 "dbo.getUserName2(championid,usermanager) as name_champion," +
                 "dbo.getUserName2(designid,usermain) as name_design," +

SubProject/FPJ0000/Project/fProjectList.resx

@@ -339,7 +339,7 @@
     <value>248, 17</value>
   </metadata>
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1122, 17</value>
+    <value>17, 56</value>
   </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>455, 17</value>

SubProject/FPJ0000/Project/fProjectListUser.cs

@@ -68,7 +68,6 @@ namespace FPJ0000
                     col.Locked = true;
             }
             timer1.Start();
-
         }
 
         void refreshData()

SubProject/FPJ0000/dsPRJ.Designer.cs

@@ -1131,6 +1131,8 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnsfi_shiftcount;
             
+            private global::System.Data.DataColumn columnsfic;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public ProjectsDataTable() : 
@@ -1869,6 +1871,14 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn sficColumn {
+                get {
+                    return this.columnsfic;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1992,7 +2002,8 @@ namespace FPJ0000 {
                         string sfi_type, 
                         double sfi_savetime, 
                         double sfi_savecount, 
-                        double sfi_shiftcount) {
+                        double sfi_shiftcount, 
+                        double sfic) {
                 ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -2081,7 +2092,8 @@ namespace FPJ0000 {
                         sfi_type,
                         sfi_savetime,
                         sfi_savecount,
-                        sfi_shiftcount};
+                        sfi_shiftcount,
+                        sfic};
                 rowProjectsRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowProjectsRow);
                 return rowProjectsRow;
@@ -2174,7 +2186,8 @@ namespace FPJ0000 {
                         string sfi_type, 
                         double sfi_savetime, 
                         double sfi_savecount, 
-                        double sfi_shiftcount) {
+                        double sfi_shiftcount, 
+                        double sfic) {
                 ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -2263,7 +2276,8 @@ namespace FPJ0000 {
                         sfi_type,
                         sfi_savetime,
                         sfi_savecount,
-                        sfi_shiftcount};
+                        sfi_shiftcount,
+                        sfic};
                 rowProjectsRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowProjectsRow);
                 return rowProjectsRow;
@@ -2380,6 +2394,7 @@ namespace FPJ0000 {
                 this.columnsfi_savetime = base.Columns["sfi_savetime"];
                 this.columnsfi_savecount = base.Columns["sfi_savecount"];
                 this.columnsfi_shiftcount = base.Columns["sfi_shiftcount"];
+                this.columnsfic = base.Columns["sfic"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2559,6 +2574,8 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnsfi_savecount);
                 this.columnsfi_shiftcount = new global::System.Data.DataColumn("sfi_shiftcount", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnsfi_shiftcount);
+                this.columnsfic = new global::System.Data.DataColumn("sfic", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnsfic);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -14166,6 +14183,22 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double sfic {
+                get {
+                    if (this.IssficNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableProjects.sficColumn]));
+                    }
+                }
+                set {
+                    this[this.tableProjects.sficColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsnameNull() {
@@ -15161,6 +15194,18 @@ namespace FPJ0000 {
             public void Setsfi_shiftcountNull() {
                 this[this.tableProjects.sfi_shiftcountColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IssficNull() {
+                return this.IsNull(this.tableProjects.sficColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetsficNull() {
+                this[this.tableProjects.sficColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -24684,6 +24729,7 @@ namespace FPJ0000.dsPRJTableAdapters {
             tableMapping.ColumnMappings.Add("sfi_savetime", "sfi_savetime");
             tableMapping.ColumnMappings.Add("sfi_savecount", "sfi_savecount");
             tableMapping.ColumnMappings.Add("sfi_shiftcount", "sfi_shiftcount");
+            tableMapping.ColumnMappings.Add("sfic", "sfic");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -24692,113 +24738,120 @@ namespace FPJ0000.dsPRJTableAdapters {
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [orderno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [pno], [kdate], [jasmin], [bHighlight], [effect_tangible], [effect_intangible], [sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno, @kdate, @jasmin, @bHighlight, @effect_tangible, @effect_intangible, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount)";
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects
+                      (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, 
+                      remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, 
+                      bCost, bFanOut, div, crdue, model, serial, bdate, qdate, cdate, championid, designid, assemblyid, epanelid, softwareid, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, 
+                      pno, kdate, jasmin, bHighlight, effect_tangible, effect_intangible, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic)
+VALUES         (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut,@div,@crdue,@model,@serial,@bdate,@qdate,@cdate,@championid,@designid,@assemblyid,@epanelid,@softwareid,@userAssembly,@ReqLine,@ReqSite,@ReqPackage,@ReqPlant,@pno,@kdate,@jasmin,@bHighlight,@effect_tangible,@effect_intangible,@sfi,@sfi_type,@sfi_savetime,@sfi_savecount,@sfi_shiftcount,@sfic)";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usermain", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usermain", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usersub", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usersub", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@level", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costo", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costo", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costn", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costn", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cnt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_req", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark_req", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_req", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "remark_req", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_ans", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark_ans", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_ans", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "remark_ans", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 300, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@crdue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@crdue", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@championid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@championid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@designid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@designid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assemblyid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assemblyid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_tangible", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "effect_tangible", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_tangible", global::System.Data.SqlDbType.VarChar, 1000, global::System.Data.ParameterDirection.Input, 0, 0, "effect_tangible", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_intangible", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "effect_intangible", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_intangible", global::System.Data.SqlDbType.VarChar, 1000, global::System.Data.ParameterDirection.Input, 0, 0, "effect_intangible", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = "UPDATE Projects\r\nSET        status = @status, pdate = @pdate, name = @name, userm" +
+            this._adapter.UpdateCommand.CommandText = "UPDATE         Projects\r\nSET                status = @status, pdate = @pdate, nam" +
-                "ain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate" +
+                "e = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate" +
-                " = @edate, odate = @odate, memo = @memo, \r\n               wuid = @wuid, wdate = " +
+                " = @sdate, edate = @edate, odate = @odate, \r\n                      memo = @memo," +
-                "@wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, pa" +
+                " wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userMana" +
-                "rt = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, \r\n  " +
+                "ger, level = @level, part = @part, process = @process, \r\n                      c" +
-                "             remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate," +
+                "osto = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans " +
-                " progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = " +
+                "= @remark_ans, ddate = @ddate, progress = @progress, import = @import, \r\n       " +
-                "@path, userhw2 = @userhw2, \r\n               orderno = @orderno, gcode = @gcode, " +
+                "               asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2," +
-                "category = @category, userprocess = @userprocess, CMP_Background = @CMP_Backgrou" +
+                " orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userpr" +
-                "nd, CMP_Description = @CMP_Description, \r\n               CMP_Before = @CMP_Befor" +
+                "ocess, \r\n                      CMP_Background = @CMP_Background, CMP_Description" +
-                "e, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue" +
+                " = @CMP_Description, CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @" +
-                " = @crdue, model = @model, serial = @serial, bdate = @bdate, \r\n               qd" +
+                "bCost, \r\n                      bFanOut = @bFanOut, div = @div, crdue = @crdue, m" +
-                "ate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, as" +
+                "odel = @model, serial = @serial, bdate = @bdate, qdate = @qdate, cdate = @cdate," +
-                "semblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, \r\n      " +
+                " championid = @championid, \r\n                      designid = @designid, assembl" +
-                "         userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, R" +
+                "yid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, userAssembly " +
-                "eqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmi" +
+                "= @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, \r\n                     " +
-                "n = @jasmin, \r\n               bHighlight = @bHighlight, effect_tangible = @effec" +
+                " ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jas" +
-                "t_tangible, effect_intangible = @effect_intangible, sfi = @sfi, sfi_type = @sfi_" +
+                "min = @jasmin, bHighlight = @bHighlight, effect_tangible = @effect_tangible, \r\n " +
-                "type, sfi_savetime = @sfi_savetime, \r\n               sfi_savecount = @sfi_saveco" +
+                "                     effect_intangible = @effect_intangible, sfi = @sfi, sfi_typ" +
-                "unt, sfi_shiftcount = @sfi_shiftcount\r\nWHERE  (idx = @Original_idx);       \r\nSEL" +
+                "e = @sfi_type, sfi_savetime = @sfi_savetime, sfi_savecount = @sfi_savecount, sfi" +
-                "ECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, " +
+                "_shiftcount = @sfi_shiftcount, \r\n                      sfic = @sfic\r\nWHERE      " +
-                "memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, c" +
+                "     (idx = @Original_idx);        \r\nSELECT idx, status, pdate, name, usermain, " +
-                "nt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2" +
+                "usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManage" +
-                ", orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess," +
+                "r, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progr" +
-                " CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, cr" +
+                "ess, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS la" +
-                "due, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS w" +
+                "sthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Be" +
-                "we, \'\' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFin" +
+                "fore, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS Pr" +
-                "ishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, d" +
+                "ogressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qda" +
-                "bo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_d" +
+                "te, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, desig" +
-                "esign, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) A" +
+                "nid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champ" +
-                "S name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLi" +
+                "ion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS na" +
-                "ne, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx =" +
+                "me_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwarei" +
-                " @idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN " +
+                "d) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, " +
-                "\'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([statu" +
+                "kdate, jasmin FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검" +
-                "s] = \'취소\') THEN \'9\' ELSE \'5\' END)";
+                "토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN" +
+                " ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -24868,6 +24921,7 @@ namespace FPJ0000.dsPRJTableAdapters {
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
@@ -24885,29 +24939,31 @@ namespace FPJ0000.dsPRJTableAdapters {
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT  idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat" +
+            this._commandCollection[0].CommandText = "SELECT          idx, status, pdate, name, usermain, usersub, reqstaff, sdate, eda" +
-                "e, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn" +
+                "te, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, cost" +
-                ", cnt, remark_req, remark_ans, ddate, \r\n               progress, import, asset, " +
+                "o, costn, cnt, remark_req, \r\n                      remark_ans, ddate, progress, " +
-                "isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, ca" +
+                "import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthis" +
-                "tegory, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, \r\n " +
+                "tory, gcode, category, userprocess, CMP_Background, \r\n                      CMP_" +
-                "              bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS Progr" +
+                "Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleP" +
-                "essPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate," +
+                "rogressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model," +
-                " cdate, championid, \r\n               dbo.getProjectFinishRate(gcode, idx) AS fin" +
+                " \r\n                      serial, bdate, qdate, cdate, championid, dbo.getProject" +
-                "ishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid)" +
+                "FinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid" +
-                " AS name_champion, dbo.getUserName(designid) \r\n               AS name_design, db" +
+                ", dbo.getUserName(championid) \r\n                      AS name_champion, dbo.getU" +
-                "o.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_ep" +
+                "serName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, " +
-                "anel, dbo.getUserName(softwareid) AS name_software, userAssembly, \r\n            " +
+                "dbo.getUserName(epanelid) AS name_epanel, \r\n                      dbo.getUserNam" +
-                "   ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistor" +
+                "e(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqP" +
-                "yD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,\r\n      " +
+                "lant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, \r\n          " +
-                "             (SELECT  MAX(pdate) AS Expr1\r\n                    FROM     Projects" +
+                "            bHighlight, effect_tangible, effect_intangible,\r\n                   " +
-                "History\r\n                    WHERE  (pidx = Projects.idx)) AS lasthistory_date, " +
+                "       (SELECT          MAX(pdate) AS Expr1\r\n                             FROM  " +
-                "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount\r\nFROM     Projects WI" +
+                "           ProjectsHistory\r\n                             WHERE            (pidx " +
-                "TH (nolock)\r\nWHERE  (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @user" +
+                "= Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount" +
-                "name OR\r\n               ISNULL(usermain, \'\') LIKE @username OR\r\n               I" +
+                ", sfi_shiftcount, sfic\r\nFROM            Projects WITH (nolock)\r\nWHERE           " +
-                "SNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcod" +
+                "(status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n           " +
-                "e)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\'" +
+                "           ISNULL(usermain, \'\') LIKE @username OR\r\n                      ISNULL(" +
-                " WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] " +
+                "usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nOR" +
-                "= \'취소\') \r\n               THEN \'9\' ELSE \'5\' END)";
+                "DER BY     (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' W" +
+                "HEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = " +
+                "\'취소\') \r\n                      THEN \'9\' ELSE \'5\' END)";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -24919,42 +24975,12 @@ namespace FPJ0000.dsPRJTableAdapters {
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[2].Connection = this.Connection;
-            this._commandCollection[2].CommandText = @"SELECT  CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, 
+            this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)";
-               bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) 
-               AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
-                   (SELECT  MAX(pdate) AS Expr1
-                    FROM     ProjectsHistory
-                    WHERE  (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, 
-               dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, 
-               process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, 
-               userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws
-FROM     Projects WITH (nolock)
-WHERE  (idx = @idx)";
             this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
-            this._commandCollection[3].CommandText = "SELECT  CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getSchedulePr" +
+            this._commandCollection[3].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)";
-                "ogressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid," +
-                " asset, bCost, bFanOut, \r\n               bHighlight, bdate, category, cdate, cha" +
-                "mpionid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangibl" +
-                "e, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) \r\n           " +
-                "    AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(" +
-                "idx) AS lasthistory,\r\n                   (SELECT  MAX(pdate) AS Expr1\r\n         " +
-                "           FROM     ProjectsHistory\r\n                    WHERE  (pidx = Projects" +
-                ".idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid" +
-                ") AS name_assembly, dbo.getUserName(championid) AS name_champion, \r\n            " +
-                "   dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_e" +
-                "panel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path," +
-                " pdate, pidx, pno, \r\n               process, progress, qdate, remark_ans, remark" +
-                "_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftc" +
-                "ount, sfi_type, softwareid, status, userAssembly, userManager, \r\n               " +
-                "userhw2, usermain, userprocess, usersub, wdate, wuid, \'\' AS wwd, \'\' AS wwe, \'\' A" +
-                "S wwo, \'\' AS wws\r\nFROM     Projects WITH (nolock)\r\nWHERE  (ISNULL(name, N\'\') LIK" +
-                "E @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR\r\n               (I" +
-                "SNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search" +
-                ") OR\r\n               (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(mem" +
-                "o, N\'\') LIKE @search)";
             this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -25225,7 +25251,8 @@ WHERE  (idx = @idx)";
                     string sfi_type, 
                     global::System.Nullable<double> sfi_savetime, 
                     global::System.Nullable<double> sfi_savecount, 
-                    global::System.Nullable<double> sfi_shiftcount) {
+                    global::System.Nullable<double> sfi_shiftcount, 
+                    global::System.Nullable<double> sfic) {
             if ((status == null)) {
                 this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -25629,6 +25656,12 @@ WHERE  (idx = @idx)";
             else {
                 this.Adapter.InsertCommand.Parameters[67].Value = global::System.DBNull.Value;
             }
+            if ((sfic.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[68].Value = ((double)(sfic.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[68].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -25718,6 +25751,7 @@ WHERE  (idx = @idx)";
                     global::System.Nullable<double> sfi_savetime, 
                     global::System.Nullable<double> sfi_savecount, 
                     global::System.Nullable<double> sfi_shiftcount, 
+                    global::System.Nullable<double> sfic, 
                     int Original_idx, 
                     int idx) {
             if ((status == null)) {
@@ -26123,8 +26157,14 @@ WHERE  (idx = @idx)";
             else {
                 this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[68].Value = ((int)(Original_idx));
+            if ((sfic.HasValue == true)) {
-            this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(idx));
+                this.Adapter.UpdateCommand.Parameters[68].Value = ((double)(sfic.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_idx));
+            this.Adapter.UpdateCommand.Parameters[70].Value = ((int)(idx));
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {

SubProject/FPJ0000/dsPRJ.xsd

@@ -20,97 +20,104 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [orderno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [pno], [kdate], [jasmin], [bHighlight], [effect_tangible], [effect_intangible], [sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno, @kdate, @jasmin, @bHighlight, @effect_tangible, @effect_intangible, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount)</CommandText>
+                    <CommandText>INSERT INTO Projects
+                      (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, 
+                      remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, 
+                      bCost, bFanOut, div, crdue, model, serial, bdate, qdate, cdate, championid, designid, assemblyid, epanelid, softwareid, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, 
+                      pno, kdate, jasmin, bHighlight, effect_tangible, effect_intangible, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic)
+VALUES         (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut,@div,@crdue,@model,@serial,@bdate,@qdate,@cdate,@championid,@designid,@assemblyid,@epanelid,@softwareid,@userAssembly,@ReqLine,@ReqSite,@ReqPackage,@ReqPlant,@pno,@kdate,@jasmin,@bHighlight,@effect_tangible,@effect_intangible,@sfi,@sfi_type,@sfi_savetime,@sfi_savecount,@sfi_shiftcount,@sfic)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <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="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usermain" ColumnName="usermain" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usersub" ColumnName="usersub" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="reqstaff" ColumnName="reqstaff" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="odate" ColumnName="odate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Projects" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="rev" ColumnName="rev" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userManager" ColumnName="userManager" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="part" ColumnName="part" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costo" ColumnName="costo" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costn" ColumnName="costn" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cnt" ColumnName="cnt" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_req" ColumnName="remark_req" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_ans" ColumnName="remark_ans" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ddate" ColumnName="ddate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="progress" ColumnName="progress" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="asset" ColumnName="asset" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="isdel" ColumnName="isdel" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="path" ColumnName="path" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="div" ColumnName="div" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="crdue" ColumnName="crdue" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@bdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="bdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bdate" ColumnName="bdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@bdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="bdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@qdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="qdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="qdate" ColumnName="qdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@qdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="qdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cdate" ColumnName="cdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@championid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="championid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="championid" ColumnName="championid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@championid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="championid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@designid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="designid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="designid" ColumnName="designid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@designid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="designid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@assemblyid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="assemblyid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="assemblyid" ColumnName="assemblyid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@assemblyid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="assemblyid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@epanelid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="epanelid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="epanelid" ColumnName="epanelid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@epanelid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="epanelid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@softwareid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="softwareid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="softwareid" ColumnName="softwareid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@softwareid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="softwareid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@userAssembly" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userAssembly" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userAssembly" ColumnName="userAssembly" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userAssembly" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userAssembly" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ReqLine" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ReqLine" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqLine" ColumnName="ReqLine" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqLine" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqLine" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ReqSite" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ReqSite" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqSite" ColumnName="ReqSite" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqSite" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqSite" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ReqPackage" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ReqPackage" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPackage" ColumnName="ReqPackage" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPackage" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPackage" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ReqPlant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ReqPlant" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPlant" ColumnName="ReqPlant" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPlant" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPlant" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pno" ColumnName="pno" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pno" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@kdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="kdate" ColumnName="kdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@kdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="kdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@jasmin" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jasmin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="jasmin" ColumnName="jasmin" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@jasmin" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="jasmin" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@bHighlight" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bHighlight" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bHighlight" ColumnName="bHighlight" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bHighlight" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bHighlight" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@effect_tangible" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="effect_tangible" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="effect_tangible" ColumnName="effect_tangible" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@effect_tangible" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="effect_tangible" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@effect_intangible" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="effect_intangible" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="effect_intangible" ColumnName="effect_intangible" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@effect_intangible" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="effect_intangible" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@sfi" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="sfi" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi" ColumnName="sfi" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@sfi_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sfi_type" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_type" ColumnName="sfi_type" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(1)" DbType="AnsiString" Direction="Input" ParameterName="@sfi_type" Precision="0" ProviderType="VarChar" Scale="0" Size="1" SourceColumn="sfi_type" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@sfi_savetime" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="sfi_savetime" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_savetime" ColumnName="sfi_savetime" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_savetime" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_savetime" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@sfi_savecount" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="sfi_savecount" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_savecount" ColumnName="sfi_savecount" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_savecount" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_savecount" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@sfi_shiftcount" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="sfi_shiftcount" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_shiftcount" ColumnName="sfi_shiftcount" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_shiftcount" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_shiftcount" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfic" ColumnName="sfic" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfic" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfic" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, 
+                    <CommandText>SELECT          idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, 
-               progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, 
+                      remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, 
-               bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, 
+                      CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, 
-               dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) 
+                      serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) 
-               AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, 
+                      AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, 
-               ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,
+                      dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, 
-                   (SELECT  MAX(pdate) AS Expr1
+                      bHighlight, effect_tangible, effect_intangible,
-                    FROM     ProjectsHistory
+                          (SELECT          MAX(pdate) AS Expr1
-                    WHERE  (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount
+                             FROM             ProjectsHistory
-FROM     Projects WITH (nolock)
+                             WHERE            (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic
-WHERE  (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
+FROM            Projects WITH (nolock)
-               ISNULL(usermain, '') LIKE @username OR
+WHERE           (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
-               ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
+                      ISNULL(usermain, '') LIKE @username OR
-ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') 
+                      ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
-               THEN '9' ELSE '5' END)</CommandText>
+ORDER BY     (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') 
+                      THEN '9' ELSE '5' END)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="state" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="username" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@username" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -119,90 +126,92 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>UPDATE Projects
+                    <CommandText>UPDATE         Projects
-SET        status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, 
+SET                status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, 
-               wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, 
+                      memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, 
-               remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, 
+                      costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, 
-               orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, 
+                      asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, 
-               CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue = @crdue, model = @model, serial = @serial, bdate = @bdate, 
+                      CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, 
-               qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, 
+                      bFanOut = @bFanOut, div = @div, crdue = @crdue, model = @model, serial = @serial, bdate = @bdate, qdate = @qdate, cdate = @cdate, championid = @championid, 
-               userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmin = @jasmin, 
+                      designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, 
-               bHighlight = @bHighlight, effect_tangible = @effect_tangible, effect_intangible = @effect_intangible, sfi = @sfi, sfi_type = @sfi_type, sfi_savetime = @sfi_savetime, 
+                      ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmin = @jasmin, bHighlight = @bHighlight, effect_tangible = @effect_tangible, 
-               sfi_savecount = @sfi_savecount, sfi_shiftcount = @sfi_shiftcount
+                      effect_intangible = @effect_intangible, sfi = @sfi, sfi_type = @sfi_type, sfi_savetime = @sfi_savetime, sfi_savecount = @sfi_savecount, sfi_shiftcount = @sfi_shiftcount, 
-WHERE  (idx = @Original_idx);       
+                      sfic = @sfic
+WHERE           (idx = @Original_idx);        
 SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="usermain" ColumnName="usermain" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usermain" ColumnName="usermain" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="usersub" ColumnName="usersub" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usersub" ColumnName="usersub" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="reqstaff" ColumnName="reqstaff" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="reqstaff" ColumnName="reqstaff" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="odate" ColumnName="odate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="odate" ColumnName="odate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Projects" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="rev" ColumnName="rev" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="rev" ColumnName="rev" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userManager" ColumnName="userManager" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userManager" ColumnName="userManager" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="part" ColumnName="part" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="part" ColumnName="part" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="costo" ColumnName="costo" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costo" ColumnName="costo" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="costn" ColumnName="costn" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costn" ColumnName="costn" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cnt" ColumnName="cnt" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cnt" ColumnName="cnt" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="remark_req" ColumnName="remark_req" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_req" ColumnName="remark_req" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="remark_ans" ColumnName="remark_ans" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_ans" ColumnName="remark_ans" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ddate" ColumnName="ddate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ddate" ColumnName="ddate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="progress" ColumnName="progress" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="progress" ColumnName="progress" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="asset" ColumnName="asset" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="asset" ColumnName="asset" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="isdel" ColumnName="isdel" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="isdel" ColumnName="isdel" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="path" ColumnName="path" DataSourceName="" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="path" ColumnName="path" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="div" ColumnName="div" DataSourceName="" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="div" ColumnName="div" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="crdue" ColumnName="crdue" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="crdue" ColumnName="crdue" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bdate" ColumnName="bdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@bdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="bdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bdate" ColumnName="bdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@bdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="bdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="qdate" ColumnName="qdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@qdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="qdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="qdate" ColumnName="qdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@qdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="qdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cdate" ColumnName="cdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cdate" ColumnName="cdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="championid" ColumnName="championid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@championid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="championid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="championid" ColumnName="championid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@championid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="championid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="designid" ColumnName="designid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@designid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="designid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="designid" ColumnName="designid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@designid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="designid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="assemblyid" ColumnName="assemblyid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@assemblyid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="assemblyid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="assemblyid" ColumnName="assemblyid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@assemblyid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="assemblyid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="epanelid" ColumnName="epanelid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@epanelid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="epanelid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="epanelid" ColumnName="epanelid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@epanelid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="epanelid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="softwareid" ColumnName="softwareid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@softwareid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="softwareid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="softwareid" ColumnName="softwareid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@softwareid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="softwareid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userAssembly" ColumnName="userAssembly" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userAssembly" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userAssembly" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userAssembly" ColumnName="userAssembly" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userAssembly" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userAssembly" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqLine" ColumnName="ReqLine" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqLine" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqLine" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqLine" ColumnName="ReqLine" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqLine" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqLine" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqSite" ColumnName="ReqSite" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqSite" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqSite" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqSite" ColumnName="ReqSite" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqSite" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqSite" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPackage" ColumnName="ReqPackage" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPackage" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPackage" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPackage" ColumnName="ReqPackage" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPackage" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPackage" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPlant" ColumnName="ReqPlant" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPlant" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPlant" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPlant" ColumnName="ReqPlant" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPlant" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPlant" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pno" ColumnName="pno" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pno" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pno" ColumnName="pno" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pno" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="kdate" ColumnName="kdate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@kdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="kdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="kdate" ColumnName="kdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@kdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="kdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="jasmin" ColumnName="jasmin" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@jasmin" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="jasmin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="jasmin" ColumnName="jasmin" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@jasmin" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="jasmin" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bHighlight" ColumnName="bHighlight" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bHighlight" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bHighlight" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bHighlight" ColumnName="bHighlight" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bHighlight" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bHighlight" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="effect_tangible" ColumnName="effect_tangible" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@effect_tangible" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="effect_tangible" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="effect_tangible" ColumnName="effect_tangible" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@effect_tangible" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="effect_tangible" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="effect_intangible" ColumnName="effect_intangible" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@effect_intangible" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="effect_intangible" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="effect_intangible" ColumnName="effect_intangible" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@effect_intangible" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="effect_intangible" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sfi" ColumnName="sfi" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi" ColumnName="sfi" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_type" ColumnName="sfi_type" DataSourceName="" DataTypeServer="varchar(1)" DbType="AnsiString" Direction="Input" ParameterName="@sfi_type" Precision="0" ProviderType="VarChar" Scale="0" Size="1" SourceColumn="sfi_type" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_type" ColumnName="sfi_type" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(1)" DbType="AnsiString" Direction="Input" ParameterName="@sfi_type" Precision="0" ProviderType="VarChar" Scale="0" Size="1" SourceColumn="sfi_type" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_savetime" ColumnName="sfi_savetime" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_savetime" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_savetime" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_savetime" ColumnName="sfi_savetime" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_savetime" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_savetime" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_savecount" ColumnName="sfi_savecount" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_savecount" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_savecount" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_savecount" ColumnName="sfi_savecount" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_savecount" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_savecount" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_shiftcount" ColumnName="sfi_shiftcount" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_shiftcount" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_shiftcount" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi_shiftcount" ColumnName="sfi_shiftcount" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi_shiftcount" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi_shiftcount" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfic" ColumnName="sfic" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfic" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfic" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -292,6 +301,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
               <Mapping SourceColumn="sfi_savetime" DataSetColumn="sfi_savetime" />
               <Mapping SourceColumn="sfi_savecount" DataSetColumn="sfi_savecount" />
               <Mapping SourceColumn="sfi_shiftcount" DataSetColumn="sfi_shiftcount" />
+              <Mapping SourceColumn="sfic" DataSetColumn="sfic" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
@@ -314,17 +324,7 @@ WHERE  (import = 1) AND (gcode = @gcode)</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" 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  CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, 
+                    <CommandText>SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)</CommandText>
-               bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) 
-               AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
-                   (SELECT  MAX(pdate) AS Expr1
-                    FROM     ProjectsHistory
-                    WHERE  (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, 
-               dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, 
-               process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, 
-               userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws
-FROM     Projects WITH (nolock)
-WHERE  (idx = @idx)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -334,19 +334,7 @@ WHERE  (idx = @idx)</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillSearch" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetSearch" GeneratorSourceName="FillSearch" GetMethodModifier="Public" GetMethodName="GetSearch" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetSearch" UserSourceName="FillSearch">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, 
+                    <CommandText>SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)</CommandText>
-               bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) 
-               AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
-                   (SELECT  MAX(pdate) AS Expr1
-                    FROM     ProjectsHistory
-                    WHERE  (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, 
-               dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, 
-               process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, 
-               userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws
-FROM     Projects WITH (nolock)
-WHERE  (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR
-               (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR
-               (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="search" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@search" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -3526,6 +3514,7 @@ WHERE  (idx = @idx)</CommandText>
               <xs:element name="sfi_savetime" msprop:Generator_ColumnPropNameInTable="sfi_savetimeColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sfi_savetime" msprop:Generator_UserColumnName="sfi_savetime" msprop:Generator_ColumnVarNameInTable="columnsfi_savetime" type="xs:double" minOccurs="0" />
               <xs:element name="sfi_savecount" msprop:Generator_ColumnPropNameInTable="sfi_savecountColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sfi_savecount" msprop:Generator_UserColumnName="sfi_savecount" msprop:Generator_ColumnVarNameInTable="columnsfi_savecount" type="xs:double" minOccurs="0" />
               <xs:element name="sfi_shiftcount" msprop:Generator_ColumnPropNameInTable="sfi_shiftcountColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sfi_shiftcount" msprop:Generator_UserColumnName="sfi_shiftcount" msprop:Generator_ColumnVarNameInTable="columnsfi_shiftcount" type="xs:double" minOccurs="0" />
+              <xs:element name="sfic" msprop:Generator_ColumnPropNameInTable="sficColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sfic" msprop:Generator_UserColumnName="sfic" msprop:Generator_ColumnVarNameInTable="columnsfic" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>