10-08

Project/EETGW.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Project</RootNamespace>
     <AssemblyName>GWEE</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <SignAssembly>False</SignAssembly>
@@ -41,6 +41,7 @@
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -51,6 +52,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -60,6 +62,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icons8-realtime-64.ico</ApplicationIcon>
@@ -79,6 +82,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\</OutputPath>
@@ -88,6 +92,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
@@ -124,8 +129,21 @@
     </Reference>
     <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     <Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="StackExchange.Redis.Extender, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\StackExchange.Redis.Extender.1.0.5\lib\StackExchange.Redis.Extender.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Services" />
@@ -339,6 +357,7 @@
     <None Include="dsMSSQL.xss">
       <DependentUpon>dsMSSQL.xsd</DependentUpon>
     </None>
+    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

Project/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Project.Properties {
     // 클래스에서 자동으로 생성되었습니다.
     // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
     // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

Project/StateMachine/_BW.cs

@@ -16,6 +16,32 @@ namespace Project
         {
             while(bBW)
             {
+                if(redisConnection == null)
+                {
+                    Console.WriteLine("redis conn : 10.131.36.205:6379");
+                    redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379");
+                }
+                else
+                {
+                    if (redisConnection.IsConnected)
+                    {
+                        if(this.db == null)
+                        {
+                            Console.WriteLine("redis connected setting db");
+                            this.db = redisConnection.GetDatabase();
+                            var getStr = this.db.StringGet("test");
+                            Console.WriteLine(getStr);
+                        }
+                    }
+                    else
+                    {
+                        Console.WriteLine("resetting redis connection");
+                        redisConnection.Dispose();
+                        redisConnection = null;
+                    }
+                }
+                
+
                 System.Threading.Thread.Sleep(5000);
             }
         }

Project/StateMachine/_TMDisplay.cs

@@ -23,6 +23,13 @@ namespace Project
             }
             else sbBWRun.BackColor = Color.Red;
              sbBCD.BackColor = Pub.barcode.IsInit ? Color.Lime : Color.Red;
+             if (redisConnection == null) this.sbRedis.ForeColor = Color.DimGray;
+             else if (redisConnection.IsConnected)
+             {
+                 if (db == null) this.sbRedis.ForeColor = Color.Blue;
+                 else this.sbRedis.ForeColor = Color.Green;
+             }
+             else this.sbRedis.ForeColor = Color.Red;
             
         }
     }

Project/app.config

@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Project.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="Project.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <connectionStrings>
-        <add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
+        <add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
-            providerName="System.Data.SqlClient" />
     </connectionStrings>
     <userSettings>
         <Project.Properties.Settings>
@@ -26,4 +25,16 @@ namespace HelloWorld
             </setting>
         </Project.Properties.Settings>
     </userSettings>
-</configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

Project/fMain.Designer.cs

@@ -84,6 +84,7 @@
             this.toolStrip = new System.Windows.Forms.ToolStrip();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+            this.sbRedis = new System.Windows.Forms.ToolStripStatusLabel();
             this.cmVision.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -151,13 +152,14 @@
             // sbBCD
             // 
             this.sbBCD.Name = "sbBCD";
-            this.sbBCD.Size = new System.Drawing.Size(11, 17);
+            this.sbBCD.Size = new System.Drawing.Size(35, 17);
-            this.sbBCD.Text = " ";
+            this.sbBCD.Text = " BCD";
             // 
             // statusStrip1
             // 
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.sbBWRun,
+            this.sbRedis,
             this.sbBCD,
             this.sbLogin});
             this.statusStrip1.Location = new System.Drawing.Point(1, 644);
@@ -514,6 +516,12 @@
             this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
             // 
+            // sbRedis
+            // 
+            this.sbRedis.Name = "sbRedis";
+            this.sbRedis.Size = new System.Drawing.Size(55, 17);
+            this.sbRedis.Text = "● REDIS";
+            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -600,6 +608,7 @@
         private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem customerToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton2;
+        private System.Windows.Forms.ToolStripStatusLabel sbRedis;
     }
 }
 

Project/fMain.cs

@@ -6,6 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using StackExchange.Redis;
 
 namespace Project
 {
@@ -46,12 +47,23 @@ namespace Project
                 e.Cancel = true;
                 return;
             }
+
+            //close redis
+            if (this.redisConnection != null && this.redisConnection.IsConnected && this.db != null)
+            {
+                this.redisConnection.Close();
+                this.redisConnection.Dispose();
+            }
+
             Pub.log.Add("Program Close");
             Pub.log.Flush();
             bBW = false;    //backgroundWorker
             if (bw.IsBusy) bw.CancelAsync();
         }
 
+        ConnectionMultiplexer redisConnection;
+        IDatabase db;
+
         private void __Load(object sender, EventArgs e)
         {
             this.Text = Application.ProductName + " v" + Application.ProductVersion;
@@ -69,8 +81,7 @@ namespace Project
             UpdateControls();
             
             tmDisplay.Start();  //display timer
-            
+          
-            bw.RunWorkerAsync(); //background worker
 
             Dialog.fLogin flogIn = new Dialog.fLogin();
             if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
@@ -80,6 +91,11 @@ namespace Project
 
             sbLogin.Text = string.Format("{0} {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
             Pub.log.Add("Program Start");
+
+
+            bw.RunWorkerAsync(); //background worker
+
+            
         }
 
 

Project/fMain.resx

@@ -153,16 +153,16 @@
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPY0iaV3E9aWbN/7SKvovplX3WDFAwrd5VbGad
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIaSURBVDhPY0iaW349aWbN/7Ty3ovplX3WDFAwrd5VbGad
-        +65pVS4WcH6N664pFW4qYAUwkDS/6lLSvKqLqZW9UakVfXcYGP4zTq10sZ9Z4/5254zoX7PrPN5PrnRz
+        +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9USkVfXcYGP4zTq10sZ9R7f52x/SoX7Nq3d9PrnRz
-        nVXn9mrnjJg/cxrcH88pteKFakcFqdW9fzJmlL8pmZr9Z+bKkv+7dtf/37Qi79+UZr9/VzcV/vt6rvX/
+        nVnn+mrn9Jg/cxrcHs8pteKFakcFqdU9f9JnlL0pmZL9Z+bKkv+7dtf/37g879/kJr9/VzYW/vt6rvX/
-        0cWpP4GGHl0VGsoM1YYAqY1dn1vWzvo/6+TS/337Z/1v3jrhf/ma1v/pCyv/x88p/5+3uPp/w6ra/7Vz
+        kUWpP2fXehxdFRrKDNWGACmNXZ9b1s76P+vk0v99+2f9b9464X/5mtb/6Qsr/8fPKf+ft7j6f8Oq2v+1
-        C34VT0w9Fje7PAaqFQLSWjqv1M6f/n/Xg70YePvd3f9XXdn4f+7pZf8nHJz7v2Zjz9+EeRVvoVohIKm5
+        cwt+FU1MORY3uzwGqhUC0lo6r9TOn/5/14O9GHj73d3/V13Z+H/u6WX/Jxyc+796Y8/f+HkVb6FaISCp
-        ZXFeb/9vmKaefTOx0iA859Sy/8kLqi5AtUJAUmtranpDzx+Yorg5ZVhpEAa5AuiC1VCtEJDS0SGTVtX3
+        uXlxbm//b5imnn0zsdIgPOfUsv/JC6ouQLVCQFJra2p6ffcfmKK4OWVYaRAGuSJ+XvlqqFYISOnokEmr
-        f/u93QQNaNo++UfcnNIWqFYEAMbE34XH14EV4fNC8Zr2j7FzylKh2hAgtaH7Xde6+XCF2PCmW9v/J86r
+        6vu//d5uggY0bp/8I25OaQtUKwKkVPX+XXh8HVgRPi8Ur2n/GDunLBWqDQFS6rvfda2bD1eIDW+6tf1/
-        /JEws8IUqg0BUpo7TiV1tfwFptDvMJw4v+JH4vxKBJ5X/jN5QU0/VAsqACbpjNTKvq1QLukgtaxXF2jI
+        wrzKHwkzK0yh2hAgubnjVGJXy19gCv0OwwnzK34kzAdqgOLEuWU/kxfU9EO1oIK0ir6M1Mq+rVAu6SC1
-        +5SqfgOoEOkgo3bi4YzqCf8yayb9T6vsR8EZNRP/p1dN/J1TNwW7F0AgvWrCjznrDgEVTvgOFYIDfHJw
+        rFcXmC/ep1T1G0CFSAcZtRMPZ1T3/8usmfQ/rbIfBWfUTATSE3/n1E3B7gUQSKvq/zFn3aH/6ZX936FC
-        kAU0Pa1ywu/s2sk9UCE4QJVjYAAAy1mkyv1iYtYAAAAASUVORK5CYII=
+        cIBPDg4ygaanVkz4nV07uQcqBAeocgwMAAhppHUfe4MbAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FCM0000/fLovItem.Designer.cs

@@ -34,11 +34,14 @@
             System.Windows.Forms.Label memoLabel;
             System.Windows.Forms.Label priceLabel;
             System.Windows.Forms.Label label1;
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.Label label2;
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.dsMSSQL = new FCM0000.dsMSSQL();
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
@@ -51,21 +54,19 @@
             this.btOK = new System.Windows.Forms.ToolStripButton();
             this.dv = new System.Windows.Forms.DataGridView();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.textBox3 = new System.Windows.Forms.TextBox();
+            this.textBox2 = new System.Windows.Forms.TextBox();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.manuTextBox = new System.Windows.Forms.TextBox();
             this.supplyTextBox = new System.Windows.Forms.TextBox();
             this.memoTextBox = new System.Windows.Forms.TextBox();
             this.priceTextBox = new System.Windows.Forms.TextBox();
-            this.model = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.dsMSSQL = new FCM0000.dsMSSQL();
             this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter();
             this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
-            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.textBox3 = new System.Windows.Forms.TextBox();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.model = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             manuLabel = new System.Windows.Forms.Label();
             supplyLabel = new System.Windows.Forms.Label();
             memoLabel = new System.Windows.Forms.Label();
@@ -74,16 +75,16 @@
             label2 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
-            this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
+            this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // manuLabel
             // 
             manuLabel.AutoSize = true;
-            manuLabel.Location = new System.Drawing.Point(16, 15);
+            manuLabel.Location = new System.Drawing.Point(18, 15);
             manuLabel.Name = "manuLabel";
             manuLabel.Size = new System.Drawing.Size(50, 18);
             manuLabel.TabIndex = 8;
@@ -92,7 +93,7 @@
             // supplyLabel
             // 
             supplyLabel.AutoSize = true;
-            supplyLabel.Location = new System.Drawing.Point(12, 54);
+            supplyLabel.Location = new System.Drawing.Point(14, 47);
             supplyLabel.Name = "supplyLabel";
             supplyLabel.Size = new System.Drawing.Size(54, 18);
             supplyLabel.TabIndex = 10;
@@ -101,7 +102,7 @@
             // memoLabel
             // 
             memoLabel.AutoSize = true;
-            memoLabel.Location = new System.Drawing.Point(11, 88);
+            memoLabel.Location = new System.Drawing.Point(13, 81);
             memoLabel.Name = "memoLabel";
             memoLabel.Size = new System.Drawing.Size(55, 18);
             memoLabel.TabIndex = 12;
@@ -109,8 +110,9 @@
             // 
             // priceLabel
             // 
+            priceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             priceLabel.AutoSize = true;
-            priceLabel.Location = new System.Drawing.Point(23, 249);
+            priceLabel.Location = new System.Drawing.Point(25, 426);
             priceLabel.Name = "priceLabel";
             priceLabel.Size = new System.Drawing.Size(43, 18);
             priceLabel.TabIndex = 18;
@@ -118,13 +120,24 @@
             // 
             // label1
             // 
+            label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(30, 288);
+            label1.Location = new System.Drawing.Point(32, 457);
             label1.Name = "label1";
             label1.Size = new System.Drawing.Size(36, 18);
             label1.TabIndex = 20;
             label1.Text = "cate";
             // 
+            // label2
+            // 
+            label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            label2.AutoSize = true;
+            label2.Location = new System.Drawing.Point(27, 395);
+            label2.Name = "label2";
+            label2.Size = new System.Drawing.Size(41, 18);
+            label2.TabIndex = 22;
+            label2.Text = "Scale";
+            // 
             // bn
             // 
             this.bn.AddNewItem = null;
@@ -143,17 +156,28 @@
             this.bindingNavigatorMoveLastItem,
             this.bindingNavigatorSeparator2,
             this.btOK});
-            this.bn.Location = new System.Drawing.Point(0, 327);
+            this.bn.Location = new System.Drawing.Point(0, 493);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(834, 25);
+            this.bn.Size = new System.Drawing.Size(884, 25);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
+            // bs
+            // 
+            this.bs.DataMember = "Items";
+            this.bs.DataSource = this.dsMSSQL;
+            this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
+            // 
+            // dsMSSQL
+            // 
+            this.dsMSSQL.DataSetName = "dsMSSQL";
+            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -244,15 +268,15 @@
             this.model,
             this.dataGridViewTextBoxColumn3});
             this.dv.DataSource = this.bs;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3);
+            dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3);
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dv.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dv.DefaultCellStyle = dataGridViewCellStyle3;
             this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dv.Location = new System.Drawing.Point(0, 0);
             this.dv.Name = "dv";
@@ -260,7 +284,7 @@
             this.dv.RowHeadersVisible = false;
             this.dv.RowTemplate.Height = 23;
             this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dv.Size = new System.Drawing.Size(544, 327);
+            this.dv.Size = new System.Drawing.Size(594, 493);
             this.dv.TabIndex = 1;
             this.dv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dv_KeyDown);
             // 
@@ -280,15 +304,36 @@
             this.panel1.Controls.Add(priceLabel);
             this.panel1.Controls.Add(this.priceTextBox);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel1.Location = new System.Drawing.Point(544, 0);
+            this.panel1.Location = new System.Drawing.Point(594, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(290, 327);
+            this.panel1.Size = new System.Drawing.Size(290, 493);
             this.panel1.TabIndex = 2;
             // 
+            // textBox3
+            // 
+            this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true));
+            this.textBox3.Location = new System.Drawing.Point(237, 392);
+            this.textBox3.Name = "textBox3";
+            this.textBox3.ReadOnly = true;
+            this.textBox3.Size = new System.Drawing.Size(38, 25);
+            this.textBox3.TabIndex = 24;
+            // 
+            // textBox2
+            // 
+            this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true));
+            this.textBox2.Location = new System.Drawing.Point(75, 392);
+            this.textBox2.Name = "textBox2";
+            this.textBox2.ReadOnly = true;
+            this.textBox2.Size = new System.Drawing.Size(156, 25);
+            this.textBox2.TabIndex = 23;
+            // 
             // textBox1
             // 
+            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
-            this.textBox1.Location = new System.Drawing.Point(75, 286);
+            this.textBox1.Location = new System.Drawing.Point(75, 455);
             this.textBox1.Name = "textBox1";
             this.textBox1.ReadOnly = true;
             this.textBox1.Size = new System.Drawing.Size(200, 25);
@@ -306,7 +351,7 @@
             // supplyTextBox
             // 
             this.supplyTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "supply", true));
-            this.supplyTextBox.Location = new System.Drawing.Point(75, 52);
+            this.supplyTextBox.Location = new System.Drawing.Point(75, 45);
             this.supplyTextBox.Name = "supplyTextBox";
             this.supplyTextBox.ReadOnly = true;
             this.supplyTextBox.Size = new System.Drawing.Size(200, 25);
@@ -314,69 +359,27 @@
             // 
             // memoTextBox
             // 
+            this.memoTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true));
-            this.memoTextBox.Location = new System.Drawing.Point(75, 86);
+            this.memoTextBox.Location = new System.Drawing.Point(75, 79);
             this.memoTextBox.Multiline = true;
             this.memoTextBox.Name = "memoTextBox";
             this.memoTextBox.ReadOnly = true;
-            this.memoTextBox.Size = new System.Drawing.Size(200, 120);
+            this.memoTextBox.Size = new System.Drawing.Size(200, 306);
             this.memoTextBox.TabIndex = 13;
             // 
             // priceTextBox
             // 
+            this.priceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true));
-            this.priceTextBox.Location = new System.Drawing.Point(75, 247);
+            this.priceTextBox.Location = new System.Drawing.Point(75, 424);
             this.priceTextBox.Name = "priceTextBox";
             this.priceTextBox.ReadOnly = true;
             this.priceTextBox.Size = new System.Drawing.Size(200, 25);
             this.priceTextBox.TabIndex = 19;
             // 
-            // model
-            // 
-            this.model.DataPropertyName = "model";
-            this.model.HeaderText = "model";
-            this.model.Name = "model";
-            this.model.ReadOnly = true;
-            this.model.Width = 74;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dataGridViewTextBoxColumn1.HeaderText = "IDX";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Width = 60;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "name";
-            this.dataGridViewTextBoxColumn2.HeaderText = "Name";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "sid";
-            this.dataGridViewTextBoxColumn3.HeaderText = "SID";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.Width = 59;
-            // 
-            // bs
-            // 
-            this.bs.DataMember = "Items";
-            this.bs.DataSource = this.dsMSSQL;
-            this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
-            // 
-            // dsMSSQL
-            // 
-            this.dsMSSQL.DataSetName = "dsMSSQL";
-            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
@@ -395,37 +398,47 @@
             this.tam.RequestItemTableAdapter = null;
             this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             // 
-            // label2
+            // dataGridViewTextBoxColumn1
             // 
-            label2.AutoSize = true;
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
-            label2.Location = new System.Drawing.Point(23, 218);
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            label2.Name = "label2";
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            label2.Size = new System.Drawing.Size(41, 18);
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
-            label2.TabIndex = 22;
+            this.dataGridViewTextBoxColumn1.HeaderText = "IDX";
-            label2.Text = "Scale";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Width = 60;
             // 
-            // textBox2
+            // dataGridViewTextBoxColumn2
             // 
-            this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true));
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "name";
-            this.textBox2.Location = new System.Drawing.Point(75, 215);
+            this.dataGridViewTextBoxColumn2.HeaderText = "Name";
-            this.textBox2.Name = "textBox2";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.textBox2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.textBox2.Size = new System.Drawing.Size(156, 25);
+            this.dataGridViewTextBoxColumn2.Width = 74;
-            this.textBox2.TabIndex = 23;
             // 
-            // textBox3
+            // model
             // 
-            this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true));
+            this.model.DataPropertyName = "model";
-            this.textBox3.Location = new System.Drawing.Point(237, 215);
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox3.Name = "textBox3";
+            this.model.DefaultCellStyle = dataGridViewCellStyle2;
-            this.textBox3.ReadOnly = true;
+            this.model.HeaderText = "model";
-            this.textBox3.Size = new System.Drawing.Size(38, 25);
+            this.model.Name = "model";
-            this.textBox3.TabIndex = 24;
+            this.model.ReadOnly = true;
+            this.model.Width = 74;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "sid";
+            this.dataGridViewTextBoxColumn3.HeaderText = "SID";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Width = 59;
             // 
             // fLovItem
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(834, 352);
+            this.ClientSize = new System.Drawing.Size(884, 518);
             this.Controls.Add(this.dv);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.bn);
@@ -436,11 +449,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -470,12 +483,12 @@
         private System.Windows.Forms.TextBox memoTextBox;
         private System.Windows.Forms.TextBox priceTextBox;
         private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.TextBox textBox3;
+        private System.Windows.Forms.TextBox textBox2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn model;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.TextBox textBox2;
 
     }
 }

SubProject/FCM0000/fLovItem.resx

@@ -132,6 +132,9 @@
   <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="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>321, 17</value>
   </metadata>
@@ -192,12 +195,6 @@
   <metadata name="model.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</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="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>216, 17</value>
-  </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>81, 17</value>
   </metadata>

SubProject/FCOMMON/DataBaseManager.cs

@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Data.SqlClient;
 
 namespace FCOMMON
 {
     public static class DBM
     {
-        public static System.Data.SqlClient.SqlConnection getCn()
+        public static SqlConnection getCn()
         {
             string cs = FCOMMON.info.CS;
-            System.Data.SqlClient.SqlConnection cn = new System.Data.SqlClient.SqlConnection();
+            SqlConnection cn = new SqlConnection();
             cn.ConnectionString = cs;
             return cn;
         }
@@ -21,6 +22,11 @@ namespace FCOMMON
             public string sid;
             public string model;
             public string supply;
+            public string name;
+            public string unit;
+            public float scale;
+            public string price;
+            public int supplyidx;
         }
 
         public static sItemInfo getItemInfo(int idx)
@@ -32,7 +38,7 @@ namespace FCOMMON
             retval.idx = -1;
 
             string sql = "select * from Items where idx = " + idx.ToString();
-            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var cmd = new SqlCommand(sql, cn);
             var rdr = cmd.ExecuteReader();
             while(rdr.Read())
             {
@@ -40,6 +46,79 @@ namespace FCOMMON
                 if(rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString();
                 if (rdr["model"] != DBNull.Value) retval.model = rdr["model"].ToString();
                 if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString();
+                if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString());
+
+                if (rdr["name"] != DBNull.Value) retval.name = rdr["name"].ToString();
+                if (rdr["unit"] != DBNull.Value) retval.unit = rdr["unit"].ToString();
+                if (rdr["scale"] != DBNull.Value) retval.scale = float.Parse(rdr["scale"].ToString());
+                if (rdr["price"] != DBNull.Value) retval.price = rdr["price"].ToString();
+
+            }
+
+            cn.Close();
+            cn.Dispose();
+            return retval;
+        }
+        public static int addItemInfo(sItemInfo info)
+        {
+            int retval = -1;
+            var cn = getCn();
+            cn.Open();
+
+            string sql = "insert into Items" +
+                " ([cate],[sid],[model],[supply],[supplyidx],[name],[unit],[scale],[price],[wuid],[wdate])" +
+                " values " +
+                " (@cate,@sid,@model,@supply,@supplyidx,@name,@unit,@scale,@price,@wuid,@wdate)";
+
+            var cmd = new SqlCommand(sql, cn);
+            cmd.Parameters.Add(new SqlParameter("@cate", "etc"));
+            cmd.Parameters.Add(new SqlParameter("@sid", info.sid));
+            cmd.Parameters.Add(new SqlParameter("@model", info.model));
+            cmd.Parameters.Add(new SqlParameter("@supply", info.supply));
+            cmd.Parameters.Add(new SqlParameter("@supplyidx",  info.supplyidx));
+            cmd.Parameters.Add(new SqlParameter("@name", info.name));
+            cmd.Parameters.Add(new SqlParameter("@unit", info.unit));
+            cmd.Parameters.Add(new SqlParameter("@scale", info.scale));
+            cmd.Parameters.Add(new SqlParameter("@price", info.price));
+            cmd.Parameters.Add(new SqlParameter("@wuid",  FCOMMON.info.Login.no));
+            cmd.Parameters.Add(new SqlParameter("@wdate", DateTime.Now));
+
+            var iCnt = cmd.ExecuteNonQuery();
+            if(iCnt == 1)
+            {
+                cmd.CommandText = "select isnull(idx,-1) from Items where [sid] = @sid";
+                cmd.Parameters.Clear();
+                cmd.Parameters.Add(new SqlParameter("sid", info.sid));
+                retval = (int)cmd.ExecuteScalar();
+            }
+            
+            cn.Close();
+            cn.Dispose();
+            return retval;
+        }
+        public static sItemInfo getItemInfo(string sid)
+        {
+            var cn = getCn();
+            cn.Open();
+
+            var retval = new sItemInfo();
+            retval.idx = -1;
+
+            string sql = "select * from Items where [sid] = '" + sid + "'";
+            var cmd = new SqlCommand(sql, cn);
+            var rdr = cmd.ExecuteReader();
+            while (rdr.Read())
+            {
+                retval.idx = (int)rdr["idx"];
+                if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString();
+                if (rdr["model"] != DBNull.Value) retval.model = rdr["model"].ToString();
+                if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString();
+                if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString());
+
+                if (rdr["name"] != DBNull.Value) retval.name = rdr["name"].ToString();
+                if (rdr["unit"] != DBNull.Value) retval.unit = rdr["unit"].ToString();
+                if (rdr["scale"] != DBNull.Value) retval.scale = float.Parse(rdr["scale"].ToString());
+                if (rdr["price"] != DBNull.Value) retval.price = rdr["price"].ToString();
             }
 
             cn.Close();
@@ -108,7 +187,7 @@ namespace FCOMMON
                     " where Grp = '{0}' and code = '{1}'";
 
           sql = string.Format(sql, GroupCode, code);
-          var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+          var cmd = new SqlCommand(sql, cn);
           var data = cmd.ExecuteScalar();
           cmd.Dispose();
           cn.Close();
@@ -131,7 +210,7 @@ namespace FCOMMON
             if (where != "") sql += " where " +  where;
             if (order != "") sql += " order by " + order;
             sql = string.Format(sql,table, col1, col2);
-            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var cmd = new SqlCommand(sql, cn);
             var rdr = cmd.ExecuteReader();
             while (rdr.Read())
             {
@@ -164,7 +243,7 @@ namespace FCOMMON
             if (desc) sql += " desc";
 
             sql = string.Format(sql, "[" + GroupColumn + "]", table);
-            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var cmd = new SqlCommand(sql, cn);
             var rdr = cmd.ExecuteReader();
             while (rdr.Read())
             {

SubProject/FCOMMON/Util.cs

@@ -20,6 +20,12 @@ namespace FCOMMON
     public  static  partial class Util
     {
 
+        public static void CopyData(System.Data.DataRow drFrom,  System.Data.DataRow drTo)
+        {
+            for (int i = 0; i < drFrom.ItemArray.Length; i++)
+                drTo[i] = drFrom[i];
+            drTo.EndEdit();
+        }
         public static int GetWorkWeek()
         {
             return GetWorkWeek(DateTime.Now);

SubProject/FEQ0000/Purchase/fPurchase.Designer.cs

@@ -30,24 +30,23 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
             this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
-            this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
@@ -57,14 +56,33 @@
             this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.btSave = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
             this.lbSum = new System.Windows.Forms.ToolStripLabel();
             this.dv1 = new System.Windows.Forms.DataGridView();
+            this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.viewThisUserDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+            this.copyDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.lbStt = new System.Windows.Forms.ToolStripLabel();
+            this.dtSD = new System.Windows.Forms.ToolStripTextBox();
+            this.lbEnd = new System.Windows.Forms.ToolStripLabel();
+            this.dtED = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbState = new System.Windows.Forms.ToolStripComboBox();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
+            this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
+            this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dvc_statename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dvc_state = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -85,21 +103,10 @@
             this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
-            this.viewThisUserDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.tbFind = new System.Windows.Forms.ToolStripTextBox();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.btFind = new System.Windows.Forms.ToolStripButton();
-            this.lbStt = new System.Windows.Forms.ToolStripLabel();
-            this.dtSD = new System.Windows.Forms.ToolStripTextBox();
-            this.lbEnd = new System.Windows.Forms.ToolStripLabel();
-            this.dtED = new System.Windows.Forms.ToolStripTextBox();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
-            this.cmbState = new System.Windows.Forms.ToolStripComboBox();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
-            this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
-            this.btSearch = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -151,16 +158,20 @@
             this.toolStripButton1,
             this.btSave,
             this.toolStripSeparator1,
+            this.toolStripSeparator4,
+            this.lbSum,
             this.toolStripLabel5,
-            this.lbSum});
+            this.toolStripLabel2,
-            this.bn.Location = new System.Drawing.Point(0, 514);
+            this.tbFind,
+            this.btFind});
+            this.bn.Location = new System.Drawing.Point(0, 555);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(811, 26);
+            this.bn.Size = new System.Drawing.Size(864, 26);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -171,15 +182,6 @@
             this.bindingNavigatorCountItem.Text = "/{0}";
             this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
             // 
-            // bindingNavigatorDeleteItem
-            // 
-            this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
-            this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
-            this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
-            this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 23);
-            this.bindingNavigatorDeleteItem.Text = "Delete(&D)";
-            this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
-            // 
             // bindingNavigatorMoveFirstItem
             // 
             this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -249,6 +251,15 @@
             this.bindingNavigatorAddNewItem.Text = "Add(&A)";
             this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
             // 
+            // bindingNavigatorDeleteItem
+            // 
+            this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
+            this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
+            this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 23);
+            this.bindingNavigatorDeleteItem.Text = "Delete(&D)";
+            this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
+            // 
             // toolStripButton1
             // 
             this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -275,12 +286,14 @@
             // 
             // toolStripLabel5
             // 
+            this.toolStripLabel5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripLabel5.Name = "toolStripLabel5";
             this.toolStripLabel5.Size = new System.Drawing.Size(58, 23);
             this.toolStripLabel5.Text = "Sub Total";
             // 
             // lbSum
             // 
+            this.lbSum.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.lbSum.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbSum.Name = "lbSum";
             this.lbSum.Size = new System.Drawing.Size(22, 23);
@@ -295,7 +308,8 @@
             this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
+            this.dvc_statename,
+            this.dvc_state,
             this.dataGridViewTextBoxColumn4,
             this.dataGridViewTextBoxColumn7,
             this.dataGridViewTextBoxColumn6,
@@ -325,203 +339,19 @@
             this.dv1.ReadOnly = true;
             this.dv1.RowTemplate.Height = 23;
             this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dv1.Size = new System.Drawing.Size(811, 489);
+            this.dv1.Size = new System.Drawing.Size(864, 530);
             this.dv1.TabIndex = 2;
             this.dv1.DoubleClick += new System.EventHandler(this.dv1_DoubleClick);
             // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
-            this.dataGridViewTextBoxColumn2.HeaderText = "Date";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "stateName";
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle12;
-            this.dataGridViewTextBoxColumn3.HeaderText = "State";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "process";
-            this.dataGridViewTextBoxColumn4.HeaderText = "process";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "request";
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle13;
-            this.dataGridViewTextBoxColumn7.HeaderText = "request";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "sc";
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle14;
-            this.dataGridViewTextBoxColumn6.HeaderText = "sc#";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "receive";
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle15;
-            this.dataGridViewTextBoxColumn5.HeaderText = "receive";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "sid";
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle16;
-            this.dataGridViewTextBoxColumn8.HeaderText = "sid#";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            this.dataGridViewTextBoxColumn9.DataPropertyName = "pumname";
-            this.dataGridViewTextBoxColumn9.HeaderText = "Item";
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            // 
-            // pumidx
-            // 
-            this.pumidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pumidx.DataPropertyName = "pumidx";
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.pumidx.DefaultCellStyle = dataGridViewCellStyle17;
-            this.pumidx.HeaderText = "*";
-            this.pumidx.Name = "pumidx";
-            this.pumidx.ReadOnly = true;
-            this.pumidx.Width = 50;
-            // 
-            // dataGridViewTextBoxColumn10
-            // 
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale";
-            this.dataGridViewTextBoxColumn10.HeaderText = "Model";
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn11
-            // 
-            this.dataGridViewTextBoxColumn11.DataPropertyName = "pumunit";
-            this.dataGridViewTextBoxColumn11.HeaderText = "Unit";
-            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-            this.dataGridViewTextBoxColumn11.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn12
-            // 
-            this.dataGridViewTextBoxColumn12.DataPropertyName = "pumqty";
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle18.Format = "N0";
-            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle18;
-            this.dataGridViewTextBoxColumn12.HeaderText = "Qty";
-            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-            this.dataGridViewTextBoxColumn12.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn13
-            // 
-            this.dataGridViewTextBoxColumn13.DataPropertyName = "pumprice";
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle19.Format = "N0";
-            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle19;
-            this.dataGridViewTextBoxColumn13.HeaderText = "Price";
-            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
-            this.dataGridViewTextBoxColumn13.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn14
-            // 
-            this.dataGridViewTextBoxColumn14.DataPropertyName = "pumamt";
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle20.Format = "N0";
-            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle20;
-            this.dataGridViewTextBoxColumn14.HeaderText = "Amt";
-            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
-            this.dataGridViewTextBoxColumn14.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn15
-            // 
-            this.dataGridViewTextBoxColumn15.DataPropertyName = "supply";
-            this.dataGridViewTextBoxColumn15.HeaderText = "Supply";
-            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
-            this.dataGridViewTextBoxColumn15.ReadOnly = true;
-            // 
-            // supplyidx
-            // 
-            this.supplyidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.supplyidx.DataPropertyName = "supplyidx";
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.supplyidx.DefaultCellStyle = dataGridViewCellStyle21;
-            this.supplyidx.HeaderText = "*";
-            this.supplyidx.Name = "supplyidx";
-            this.supplyidx.ReadOnly = true;
-            this.supplyidx.Width = 50;
-            // 
-            // dataGridViewTextBoxColumn17
-            // 
-            this.dataGridViewTextBoxColumn17.DataPropertyName = "project";
-            this.dataGridViewTextBoxColumn17.HeaderText = "Project";
-            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
-            this.dataGridViewTextBoxColumn17.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn19
-            // 
-            this.dataGridViewTextBoxColumn19.DataPropertyName = "asset";
-            this.dataGridViewTextBoxColumn19.HeaderText = "Asset";
-            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
-            this.dataGridViewTextBoxColumn19.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn20
-            // 
-            this.dataGridViewTextBoxColumn20.DataPropertyName = "edate";
-            this.dataGridViewTextBoxColumn20.HeaderText = "ExDate";
-            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
-            this.dataGridViewTextBoxColumn20.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn21
-            // 
-            this.dataGridViewTextBoxColumn21.DataPropertyName = "indate";
-            this.dataGridViewTextBoxColumn21.HeaderText = "InDate";
-            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
-            this.dataGridViewTextBoxColumn21.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn22
-            // 
-            this.dataGridViewTextBoxColumn22.DataPropertyName = "po";
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle22;
-            this.dataGridViewTextBoxColumn22.HeaderText = "PO";
-            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
-            this.dataGridViewTextBoxColumn22.ReadOnly = true;
-            // 
-            // dataGridViewTextBoxColumn23
-            // 
-            this.dataGridViewTextBoxColumn23.DataPropertyName = "dept";
-            this.dataGridViewTextBoxColumn23.HeaderText = "Dept";
-            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
-            this.dataGridViewTextBoxColumn23.ReadOnly = true;
-            // 
             // cm1
             // 
             this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.autoResizeColumnsToolStripMenuItem,
-            this.viewThisUserDataToolStripMenuItem});
+            this.viewThisUserDataToolStripMenuItem,
+            this.toolStripMenuItem1,
+            this.copyDataToolStripMenuItem});
             this.cm1.Name = "contextMenuStrip1";
-            this.cm1.Size = new System.Drawing.Size(186, 48);
+            this.cm1.Size = new System.Drawing.Size(186, 76);
             // 
             // autoResizeColumnsToolStripMenuItem
             // 
@@ -537,6 +367,18 @@
             this.viewThisUserDataToolStripMenuItem.Text = "View This User data";
             this.viewThisUserDataToolStripMenuItem.Click += new System.EventHandler(this.viewThisUserDataToolStripMenuItem_Click);
             // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(182, 6);
+            // 
+            // copyDataToolStripMenuItem
+            // 
+            this.copyDataToolStripMenuItem.Name = "copyDataToolStripMenuItem";
+            this.copyDataToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
+            this.copyDataToolStripMenuItem.Text = "Copy Data";
+            this.copyDataToolStripMenuItem.Click += new System.EventHandler(this.copyDataToolStripMenuItem_Click);
+            // 
             // toolStrip1
             // 
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -553,7 +395,7 @@
             this.btSearch});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(811, 25);
+            this.toolStrip1.Size = new System.Drawing.Size(864, 25);
             this.toolStrip1.TabIndex = 3;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -568,7 +410,8 @@
             // 
             this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.dtSD.Name = "dtSD";
-            this.dtSD.Size = new System.Drawing.Size(100, 25);
+            this.dtSD.Size = new System.Drawing.Size(90, 25);
+            this.dtSD.Text = "1982-11-23";
             this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // lbEnd
@@ -582,7 +425,8 @@
             // 
             this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.dtED.Name = "dtED";
-            this.dtED.Size = new System.Drawing.Size(100, 25);
+            this.dtED.Size = new System.Drawing.Size(90, 25);
+            this.dtED.Text = "1982-11-23";
             this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // toolStripSeparator2
@@ -631,14 +475,238 @@
             this.btSearch.Text = "Refresh(&R)";
             this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
             // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
+            this.dataGridViewTextBoxColumn2.HeaderText = "Date";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            // 
+            // dvc_statename
+            // 
+            this.dvc_statename.DataPropertyName = "stateName";
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dvc_statename.DefaultCellStyle = dataGridViewCellStyle23;
+            this.dvc_statename.HeaderText = "State";
+            this.dvc_statename.Name = "dvc_statename";
+            this.dvc_statename.ReadOnly = true;
+            // 
+            // dvc_state
+            // 
+            this.dvc_state.DataPropertyName = "state";
+            this.dvc_state.HeaderText = "state";
+            this.dvc_state.Name = "dvc_state";
+            this.dvc_state.ReadOnly = true;
+            this.dvc_state.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "process";
+            this.dataGridViewTextBoxColumn4.HeaderText = "process";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "request";
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle24;
+            this.dataGridViewTextBoxColumn7.HeaderText = "request";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "sc";
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle25;
+            this.dataGridViewTextBoxColumn6.HeaderText = "sc#";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "receive";
+            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle26;
+            this.dataGridViewTextBoxColumn5.HeaderText = "receive";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "sid";
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle27;
+            this.dataGridViewTextBoxColumn8.HeaderText = "sid#";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "pumname";
+            this.dataGridViewTextBoxColumn9.HeaderText = "Item";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            // 
+            // pumidx
+            // 
+            this.pumidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pumidx.DataPropertyName = "pumidx";
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.pumidx.DefaultCellStyle = dataGridViewCellStyle28;
+            this.pumidx.HeaderText = "*";
+            this.pumidx.Name = "pumidx";
+            this.pumidx.ReadOnly = true;
+            this.pumidx.Width = 50;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale";
+            this.dataGridViewTextBoxColumn10.HeaderText = "Model";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "pumunit";
+            this.dataGridViewTextBoxColumn11.HeaderText = "Unit";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "pumqty";
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle29.Format = "N0";
+            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle29;
+            this.dataGridViewTextBoxColumn12.HeaderText = "Qty";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn13
+            // 
+            this.dataGridViewTextBoxColumn13.DataPropertyName = "pumprice";
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle30.Format = "N0";
+            this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle30;
+            this.dataGridViewTextBoxColumn13.HeaderText = "Price";
+            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.dataGridViewTextBoxColumn13.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn14
+            // 
+            this.dataGridViewTextBoxColumn14.DataPropertyName = "pumamt";
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle31.Format = "N0";
+            this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle31;
+            this.dataGridViewTextBoxColumn14.HeaderText = "Amt";
+            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
+            this.dataGridViewTextBoxColumn14.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn15
+            // 
+            this.dataGridViewTextBoxColumn15.DataPropertyName = "supply";
+            this.dataGridViewTextBoxColumn15.HeaderText = "Supply";
+            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
+            this.dataGridViewTextBoxColumn15.ReadOnly = true;
+            // 
+            // supplyidx
+            // 
+            this.supplyidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.supplyidx.DataPropertyName = "supplyidx";
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.supplyidx.DefaultCellStyle = dataGridViewCellStyle32;
+            this.supplyidx.HeaderText = "*";
+            this.supplyidx.Name = "supplyidx";
+            this.supplyidx.ReadOnly = true;
+            this.supplyidx.Width = 50;
+            // 
+            // dataGridViewTextBoxColumn17
+            // 
+            this.dataGridViewTextBoxColumn17.DataPropertyName = "project";
+            this.dataGridViewTextBoxColumn17.HeaderText = "Project";
+            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
+            this.dataGridViewTextBoxColumn17.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn19
+            // 
+            this.dataGridViewTextBoxColumn19.DataPropertyName = "asset";
+            this.dataGridViewTextBoxColumn19.HeaderText = "Asset";
+            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
+            this.dataGridViewTextBoxColumn19.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn20
+            // 
+            this.dataGridViewTextBoxColumn20.DataPropertyName = "edate";
+            this.dataGridViewTextBoxColumn20.HeaderText = "ExDate";
+            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
+            this.dataGridViewTextBoxColumn20.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn21
+            // 
+            this.dataGridViewTextBoxColumn21.DataPropertyName = "indate";
+            this.dataGridViewTextBoxColumn21.HeaderText = "InDate";
+            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
+            this.dataGridViewTextBoxColumn21.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn22
+            // 
+            this.dataGridViewTextBoxColumn22.DataPropertyName = "po";
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle33;
+            this.dataGridViewTextBoxColumn22.HeaderText = "PO";
+            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
+            this.dataGridViewTextBoxColumn22.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn23
+            // 
+            this.dataGridViewTextBoxColumn23.DataPropertyName = "dept";
+            this.dataGridViewTextBoxColumn23.HeaderText = "Dept";
+            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
+            this.dataGridViewTextBoxColumn23.ReadOnly = true;
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 26);
+            // 
+            // toolStripLabel2
+            // 
+            this.toolStripLabel2.Name = "toolStripLabel2";
+            this.toolStripLabel2.Size = new System.Drawing.Size(43, 23);
+            this.toolStripLabel2.Text = "Search";
+            // 
+            // tbFind
+            // 
+            this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFind.Name = "tbFind";
+            this.tbFind.Size = new System.Drawing.Size(100, 26);
+            this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
+            // 
+            // btFind
+            // 
+            this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image")));
+            this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btFind.Name = "btFind";
+            this.btFind.Size = new System.Drawing.Size(23, 23);
+            this.btFind.Text = "toolStripButton2";
+            this.btFind.Click += new System.EventHandler(this.btFind_Click);
+            // 
             // fPurchase
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(811, 540);
+            this.ClientSize = new System.Drawing.Size(864, 581);
             this.Controls.Add(this.dv1);
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.bn);
+            this.DoubleBuffered = true;
             this.Name = "fPurchase";
             this.Text = "Purchase List";
             this.Load += new System.EventHandler(this.@__Load);
@@ -695,8 +763,11 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private System.Windows.Forms.ToolStripComboBox cmbState;
         private System.Windows.Forms.ToolStripMenuItem viewThisUserDataToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem copyDataToolStripMenuItem;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dvc_statename;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dvc_state;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
@@ -717,5 +788,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel2;
+        private System.Windows.Forms.ToolStripTextBox tbFind;
+        private System.Windows.Forms.ToolStripButton btFind;
     }
 }

SubProject/FEQ0000/Purchase/fPurchase.cs

@@ -27,6 +27,48 @@ namespace FEQ0000
                 dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
                 btSave.Visible = false;
             }
+            this.dv1.CellFormatting += dv1_CellFormatting;
+        }
+
+        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;
+            }
         }
 
         void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
@@ -35,7 +77,7 @@ namespace FEQ0000
             e.Row["wuid"] = FCOMMON.info.Login.no;
             e.Row["wdate"] = DateTime.Now;
             e.Row["pumunit"] = "EA";
-            e.Row["state"] = "01";
+            e.Row["state"] = "00";
             e.Row["pumqty"] = 0;
             e.Row["pumprice"] = 0;
             e.Row["pumamt"] = 0;
@@ -53,9 +95,10 @@ namespace FEQ0000
             var stList = FCOMMON.DBM.getCodeList("04");
             this.cmbState.Items.Clear();
             cmbState.Items.Add("-- All --");
+            cmbState.Items.Add("-- incomplete --");
             foreach (var item in stList)
                 cmbState.Items.Add(item);
-            this.cmbState.SelectedIndex = 0;
+            this.cmbState.SelectedIndex = 1;
 
             refreshData();
         }
@@ -73,13 +116,32 @@ namespace FEQ0000
             try
             {
                 string state = "%";
-                if (cmbState.SelectedIndex > 0)
+                if (cmbState.SelectedIndex > 1) state = cmbState.Text.Split(',')[0].Substring(1);
-                {
-                    state = cmbState.Text.Split(',')[0].Substring(1);
-                }
                 string request = "%";
                 if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%";
-                this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, request, state);
+
+                System.Data.SqlClient.SqlDataAdapter da = new System.Data.SqlClient.SqlDataAdapter();
+                System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
+                cmd.CommandText = " select *, dbo.getCodeName('04', state) AS stateName" +
+                                   " from purchase " +
+                                   " where pdate between @sd and @ed " +
+                                   " and (isnull(request,'') like @req or isnull(receive,'') like @req)";
+
+                if (cmbState.SelectedIndex != 1) cmd.CommandText += " and state like @st";
+                else cmd.CommandText += " and state < '04'";
+                cmd.CommandText += " ORDER BY pdate DESC, idx DESC";
+
+                cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text));
+                cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@ed", dtED.Text));
+                cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@req", request));
+                cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@st", state));
+                cmd.Connection = this.ta.Connection;
+                da.SelectCommand = cmd;
+
+                this.dsPurchase.Purchase.Clear();
+                da.Fill(this.dsPurchase.Purchase);
+                this.dsPurchase.AcceptChanges();
+                //this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, request, state);
                 if (!tbRequest.Text.isEmpty()) this.dv1.AutoResizeColumns();
                 showSummary();
             }
@@ -121,12 +183,30 @@ namespace FEQ0000
         private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
         {
             var newdr = this.dsPurchase.Purchase.NewPurchaseRow();
+        repeat:
             fPurchase_Add f = new fPurchase_Add(newdr);
             if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
+                //존재하지 않는 sid 는 추가를 해준다.
+                var newidx = AddItemInfoGetIndex(newdr);
+                if (newidx != -1)
+                {
+                    newdr.pumidx = newidx;
+                    newdr.EndEdit();
+                }
+
                 this.dsPurchase.Purchase.AddPurchaseRow(newdr);
                 this.ta.Update(newdr);
                 newdr.AcceptChanges();
+                if (f.repeatAdd)
+                {
+                    var newdro = this.dsPurchase.Purchase.NewPurchaseRow();
+                    FCOMMON.Util.CopyData(newdr, newdro);
+                    newdro.idx = -1;
+                    newdro.wdate = DateTime.Now;
+                    newdr = newdro; //change
+                    goto repeat;
+                }
             }
             else newdr.Delete();
         }
@@ -151,6 +231,14 @@ namespace FEQ0000
             fPurchase_Add f = new fPurchase_Add(dr);
             if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
+                //존재하지 않는 sid 는 추가를 해준다.
+                var newidx = AddItemInfoGetIndex(dr);
+                if (newidx != -1)
+                {
+                    dr.pumidx = newidx;
+                    dr.EndEdit();
+                }
+
                 this.ta.Update(dr);
                 dr.AcceptChanges();
             }
@@ -208,7 +296,7 @@ namespace FEQ0000
             try
             {
                 int cnt = ta.Update(this.dsPurchase);
-                if(cnt != 1)
+                if (cnt != 1)
                     FCOMMON.Util.MsgE(cnt.ToString() + "건의 자료가 삭제되었습니다.");
             }
             catch (Exception ex)
@@ -216,5 +304,109 @@ namespace FEQ0000
                 FCOMMON.Util.MsgE("delete error\n" + ex.Message);
             }
         }
+
+        private int AddItemInfoGetIndex(dsPurchase.PurchaseRow newdr)
+        {
+            //이 시드가 아이템목록에 없다면 추가 하고 idx를 조회한 후 설정해준다.
+            if (newdr.sid == "신규") return -1;
+            int retval = -1;
+            var sid = newdr.sid;
+            var iteminfo = FCOMMON.DBM.getItemInfo(sid);
+            if (iteminfo.idx < 0)
+            {
+                FCOMMON.DBM.sItemInfo newitem = new FCOMMON.DBM.sItemInfo();
+                newitem.sid = newdr.sid;
+                newitem.name = newdr.pumname;
+                newitem.price = newdr.pumprice.ToString();
+                newitem.model = newdr.pumscale;
+                newitem.unit = newdr.pumunit;
+                newitem.scale = 1f;
+                newitem.supply = newdr.supply;
+                newitem.supplyidx = newdr.supplyidx;
+                retval = FCOMMON.DBM.addItemInfo(newitem);
+            }
+            return retval;
+        }
+
+        private void copyDataToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var drv = this.bs.Current as DataRowView;
+            if (drv == null) return;
+            var dr = drv.Row as dsPurchase.PurchaseRow;
+
+
+
+            //현재 데이터를 입력하여 신규 추가를 한다.
+            var newdr = this.dsPurchase.Purchase.NewPurchaseRow();
+            FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr);
+            newdr.wdate = DateTime.Now;
+            newdr.wuid = FCOMMON.info.Login.no;
+            newdr.state = "00";
+            newdr.request = FCOMMON.info.Login.nameK;
+            newdr.receive = FCOMMON.info.Login.nameK;
+            newdr.idx = -1;
+            newdr.EndEdit();
+
+        repeat:
+            fPurchase_Add f = new fPurchase_Add(newdr);
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                //존재하지 않는 sid 는 추가를 해준다.
+                var newidx = AddItemInfoGetIndex(newdr);
+                if (newidx != -1)
+                {
+                    newdr.pumidx = newidx;
+                    newdr.EndEdit();
+                }
+
+                this.dsPurchase.Purchase.AddPurchaseRow(newdr);
+                this.ta.Update(newdr);
+                newdr.AcceptChanges();
+
+                if (f.repeatAdd)
+                {
+                    var newdro = this.dsPurchase.Purchase.NewPurchaseRow();
+                    FCOMMON.Util.CopyData(newdr, newdro);
+                    newdro.idx = -1;
+                    newdro.wdate = DateTime.Now;
+                    newdr = newdro; //change
+                    goto repeat;
+                }
+
+            }
+            else newdr.Delete();
+        }
+
+        private void btFind_Click(object sender, EventArgs e)
+        {
+            var search = tbFind.Text.Trim();
+            try
+            {
+                if(search.isEmpty())
+                {
+                    this.bs.Filter = "";
+                    tbFind.BackColor = Color.White;
+                }
+                else
+                {
+                    string filter = "sid like ? or process like ? or sc like ? or pumname like ? or pumscale like ? or project like ?";
+                    filter = filter.Replace("?", "'%" + search + "%'");
+                    this.bs.Filter = filter;
+                    tbFind.BackColor = Color.Lime; 
+                }
+                tbFind.SelectAll();
+                tbFind.Focus();
+            }
+            catch (Exception ex)
+            {
+                this.tbFind.BackColor = Color.Tomato;
+                FCOMMON.Util.MsgE(ex.Message);
+            }
+        }
+
+        private void tbFind_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter) btFind.PerformClick();
+        }
     }
 }

SubProject/FEQ0000/Purchase/fPurchase.resx

@@ -212,6 +212,20 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1
+        qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO
+        b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY
+        hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1
+        9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon
+        GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="dvc_state.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pumidx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

SubProject/FEQ0000/Purchase/rPurchase.cs

@@ -35,7 +35,7 @@ namespace FEQ0000.Purchase
         }
         void refreshData()
         {
-            this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, "%","%");
+            this.ta.FillDate(this.dsPurchase.Purchase, dtSD.Text, dtED.Text);
 
             //Set DataSource
             Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();

SubProject/FEQ0000/dsPurchase.Designer.cs

@@ -2125,56 +2125,36 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, 
                wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName
 FROM     Purchase
-WHERE  (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR
-               ISNULL(receive, '') LIKE @request) AND (ISNULL(state, '') LIKE @state)
 ORDER BY pdate DESC, idx DESC";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
-            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", 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("@ed", 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("@request", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", 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 = "DELETE FROM [Purchase] WHERE import = 1";
             this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[2].Connection = this.Connection;
+            this._commandCollection[2].CommandText = @"SELECT  idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, 
+               wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName
+FROM     Purchase
+where pdate between @sd and @ed
+ORDER BY pdate DESC, idx DESC";
+            this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
-        public virtual int Fill(dsPurchase.PurchaseDataTable dataTable, string sd, string ed, string request, string state) {
+        public virtual int Fill(dsPurchase.PurchaseDataTable dataTable) {
             this.Adapter.SelectCommand = this.CommandCollection[0];
-            if ((sd == null)) {
-                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(sd));
-            }
-            if ((ed == null)) {
-                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed));
-            }
-            if ((request == null)) {
-                throw new global::System.ArgumentNullException("request");
-            }
-            else {
-                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(request));
-            }
-            if ((state == null)) {
-                throw new global::System.ArgumentNullException("state");
-            }
-            else {
-                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(state));
-            }
             if ((this.ClearBeforeFill == true)) {
                 dataTable.Clear();
             }
@@ -2186,8 +2166,19 @@ ORDER BY pdate DESC, idx DESC";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
-        public virtual dsPurchase.PurchaseDataTable GetData(string sd, string ed, string request, string state) {
+        public virtual dsPurchase.PurchaseDataTable GetData() {
             this.Adapter.SelectCommand = this.CommandCollection[0];
+            dsPurchase.PurchaseDataTable dataTable = new dsPurchase.PurchaseDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
+        public virtual int FillDate(dsPurchase.PurchaseDataTable dataTable, string sd, string ed) {
+            this.Adapter.SelectCommand = this.CommandCollection[2];
             if ((sd == null)) {
                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -2200,17 +2191,30 @@ ORDER BY pdate DESC, idx DESC";
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed));
             }
-            if ((request == null)) {
+            if ((this.ClearBeforeFill == true)) {
-                throw new global::System.ArgumentNullException("request");
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual dsPurchase.PurchaseDataTable GetDate(string sd, string ed) {
+            this.Adapter.SelectCommand = this.CommandCollection[2];
+            if ((sd == null)) {
+                this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(request));
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(sd));
             }
-            if ((state == null)) {
+            if ((ed == null)) {
-                throw new global::System.ArgumentNullException("state");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(state));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed));
             }
             dsPurchase.PurchaseDataTable dataTable = new dsPurchase.PurchaseDataTable();
             this.Adapter.Fill(dataTable);

SubProject/FEQ0000/dsPurchase.xsd

@@ -103,15 +103,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
                     <CommandText>SELECT  idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, 
                wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName
 FROM     Purchase
-WHERE  (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR
-               ISNULL(receive, '') LIKE @request) AND (ISNULL(state, '') LIKE @state)
 ORDER BY pdate DESC, idx DESC</CommandText>
-                    <Parameters>
+                    <Parameters />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="request" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@request" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="state" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
@@ -237,6 +230,21 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
                   </DbCommand>
                 </DeleteCommand>
               </DbSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDate" GeneratorSourceName="FillDate" GetMethodModifier="Public" GetMethodName="GetDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDate" UserSourceName="FillDate">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, 
+               wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName
+FROM     Purchase
+where pdate between @sd and @ed
+ORDER BY pdate DESC, idx DESC</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
             </Sources>
           </TableAdapter>
         </Tables>

packages/repositories.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
+  <repository path="..\Project\packages.config" />
   <repository path="..\SubProject\FBS0000\packages.config" />
   <repository path="..\SubProject\FCM0000\packages.config" />
 </repositories>