공정 항목 추가 (업무일지, 프로젝트)

구매내역에 s/c 정렬 기능 추가

EETGW.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 15
-VisualStudioVersion = 12.0.40629.0
+VisualStudioVersion = 15.0.28307.902
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EETGW", "Project\EETGW.csproj", "{65F3E762-800C-499E-862F-A535642EC59F}"
 EndProject
@@ -31,6 +31,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FTPClass", "Sub\arftp\FTPCl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MailManager", "MailManager\MailManager.csproj", "{0D8E0019-909A-4879-9088-B2927509264E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FTP_DB_Adapt", "FTP_DB_Adapt\FTP_DB_Adapt\FTP_DB_Adapt.csproj", "{BECE73DE-15C8-42B0-9F93-9484D745DF3A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,6 +115,14 @@ Global
 		{0D8E0019-909A-4879-9088-B2927509264E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D8E0019-909A-4879-9088-B2927509264E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D8E0019-909A-4879-9088-B2927509264E}.Release|x86.ActiveCfg = Release|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Debug|x86.Build.0 = Debug|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{BECE73DE-15C8-42B0-9F93-9484D745DF3A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MailManager/MailManager.csproj

@@ -32,6 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ArSetting.Net4">
+      <HintPath>..\DLL\ArSetting.Net4.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -41,6 +44,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CSetting.cs" />
     <Compile Include="DataSet1.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -72,6 +76,9 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="History.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

MailManager/Program.cs

@@ -8,14 +8,33 @@ namespace MailManager
 {
     class Program
     {
-
+        static CSetting setting = new CSetting();
         static DateTime ChkAutoDate = DateTime.Now.AddDays(-1);
         static void Main(string[] args)
         {
-            //먼저 보낼 메일이 있다면 전송을 한다
+            setting = new CSetting();
+            setting.Load();
+            if (setting.Xml.Exist() == false)
+            {
+                Console.WriteLine("new setting file make");
+                setting.Save();
+            }
+
+            var cn = false;
 
             while (true)
             {
+                if(cn ==false)
+                {
+                    cn = connechk();
+                    if(cn==false)
+                    {
+                        Console.WriteLine("wait for next connect");
+                        System.Threading.Thread.Sleep(60000);
+                    }
+
+                    continue;
+                } 
 
                 try
                 {
@@ -25,6 +44,7 @@ namespace MailManager
                 catch (Exception ex)
                 {
                     Console.WriteLine("send error:" + ex.Message);
+                    System.Threading.Thread.Sleep(60000);
                 }
 
                 System.Threading.Thread.Sleep(1000);
@@ -37,12 +57,35 @@ namespace MailManager
                 catch (Exception ex)
                 {
                     Console.WriteLine("MakeAutoMail error:" + ex.Message);
+                    System.Threading.Thread.Sleep(60000);
                 }
 
                 System.Threading.Thread.Sleep(1000);
             }
         }
 
+        static Boolean connechk()
+        {
+            var retval = false;
+            Properties.Settings.Default["cs"] = setting.connstr; // "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
+            var client = new SqlConnection(setting.connstr);
+            try
+            {
+                Console.WriteLine("connectino check");
+                client.Open();
+                Console.WriteLine("connection ok");
+                client.Close();
+                retval = true;
+            }
+            catch (Exception ex)
+            {
+                
+                Console.WriteLine("conn error: " + ex.ToString());
+                if (ex.ToString().ToLower().IndexOf("fail") != -1)
+                    Console.WriteLine(setting.connstr);
+            }
+            return retval;
+        }
         static void SendMail()
         {
             Console.WriteLine("Check Send Mail Data");
@@ -59,7 +102,6 @@ namespace MailManager
                 var list_bcc = getMaillist(dr.bcc);
                 var list_cc = getMaillist(dr.cc);
 
-
                 string sendMsg = "";
                 if (list_from == "")
                 {

MailManager/Properties/AssemblyInfo.cs

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

MailManager/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace MailManager.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -27,18 +27,7 @@ namespace MailManager.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
+            "user;Password=Amkor123!")]
-        public string gwcs {
-            get {
-                return ((string)(this["gwcs"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=EEmicro123!")]
         public string CS {
             get {
                 return ((string)(this["CS"]));

MailManager/Properties/Settings.settings

@@ -2,20 +2,13 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="MailManager.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
-    </Setting>
     <Setting Name="CS" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
     </Setting>
   </Settings>
 </SettingsFile>

MailManager/app.config

@@ -3,8 +3,7 @@
     <configSections>
     </configSections>
     <connectionStrings>
-        <add name="MailManager.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!" />
+        <add name="MailManager.Properties.Settings.CS" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
-        <add name="MailManager.Properties.Settings.CS" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
 </configuration>

Project/Dialog/fLogin.cs

@@ -113,6 +113,7 @@ namespace Project.Dialog
                 var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
                 var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
                 FCOMMON.info.Login.gcode = gcode;
+                FCOMMON.info.Login.process = userdr.processs;
                 FCOMMON.info.Login.permission = 0;
                 FCOMMON.info.Login.gpermission = int.Parse(gperm);
 

Project/History.txt

@@ -1,4 +1,8 @@
-191129	chi	휴가내역 추가
+200106	chi	구매내역목록에서 정렬 기능 추가 (등록일,완료일,S/C)
+			업무일지 및 프로젝트에 담당자 공정추가하고 해당 공정별 데이터 분리 작업
+			업무일지 기록 시간 출력물 2번을 제외한 1,3번 숨김
+
+191129	chi	휴가내역 추가
 * 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인\
 191024	chi 프로젝트 공유폴더 눌렀을떄 \\ 가 연속으로 붙는현상 수정
 191018	chi	열저장방식 변경(필드명으로 저장)

Project/Properties/AssemblyInfo.cs

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

Project/_Common/fUserInfo.Designer.cs

@@ -43,6 +43,7 @@
             System.Windows.Forms.Label label2;
             System.Windows.Forms.Label label3;
             System.Windows.Forms.Label label4;
+            System.Windows.Forms.Label label5;
             this.idTextBox = new System.Windows.Forms.TextBox();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new Project.dsMSSQL();
@@ -62,6 +63,7 @@
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.textBox3 = new System.Windows.Forms.TextBox();
             this.tbKJPath = new System.Windows.Forms.TextBox();
+            this.textBox4 = new System.Windows.Forms.TextBox();
             idLabel = new System.Windows.Forms.Label();
             passwordLabel = new System.Windows.Forms.Label();
             nameLabel = new System.Windows.Forms.Label();
@@ -76,6 +78,7 @@
             label2 = new System.Windows.Forms.Label();
             label3 = new System.Windows.Forms.Label();
             label4 = new System.Windows.Forms.Label();
+            label5 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.SuspendLayout();
@@ -287,9 +290,8 @@
             // 
             this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true));
             this.memoTextBox.Location = new System.Drawing.Point(407, 156);
-            this.memoTextBox.Multiline = true;
             this.memoTextBox.Name = "memoTextBox";
-            this.memoTextBox.Size = new System.Drawing.Size(189, 63);
+            this.memoTextBox.Size = new System.Drawing.Size(189, 29);
             this.memoTextBox.TabIndex = 25;
             // 
             // button1
@@ -324,6 +326,7 @@
             this.tam.LineCodeTableAdapter = null;
             this.tam.ProjectsTableAdapter = null;
             this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            this.tam.UserGroupTableAdapter = null;
             this.tam.UsersTableAdapter = this.ta;
             // 
             // textBox1
@@ -359,10 +362,29 @@
             this.tbKJPath.Size = new System.Drawing.Size(177, 29);
             this.tbKJPath.TabIndex = 28;
             // 
+            // label5
+            // 
+            label5.AutoSize = true;
+            label5.Location = new System.Drawing.Point(360, 193);
+            label5.Name = "label5";
+            label5.Size = new System.Drawing.Size(42, 21);
+            label5.TabIndex = 29;
+            label5.Text = "공정";
+            // 
+            // textBox4
+            // 
+            this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "processs", true));
+            this.textBox4.Location = new System.Drawing.Point(407, 190);
+            this.textBox4.Name = "textBox4";
+            this.textBox4.Size = new System.Drawing.Size(189, 29);
+            this.textBox4.TabIndex = 30;
+            // 
             // fUserInfo
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(601, 326);
+            this.Controls.Add(label5);
+            this.Controls.Add(this.textBox4);
             this.Controls.Add(label4);
             this.Controls.Add(this.tbKJPath);
             this.Controls.Add(label3);
@@ -426,5 +448,6 @@
         private System.Windows.Forms.TextBox textBox2;
         private System.Windows.Forms.TextBox textBox3;
         private System.Windows.Forms.TextBox tbKJPath;
+        private System.Windows.Forms.TextBox textBox4;
     }
 }

Project/_Common/fUserInfo.resx

@@ -177,4 +177,7 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>248, 17</value>
   </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
 </root>

Project/_Common/fUserList.Designer.cs

@@ -53,19 +53,6 @@
             this.btDevel = new System.Windows.Forms.ToolStripDropDownButton();
             this.한글이름분리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.dv1 = new System.Windows.Forms.DataGridView();
-            this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.nameEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.deptDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.gradeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.indateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.outdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
@@ -78,6 +65,22 @@
             this.cmbdept = new System.Windows.Forms.ToolStripComboBox();
             this.btRef = new System.Windows.Forms.ToolStripButton();
             this.textBox1 = new System.Windows.Forms.TextBox();
+            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
+            this.tbProcess = new System.Windows.Forms.ToolStripTextBox();
+            this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.processs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.nameEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.deptDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.gradeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.indateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.outdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -134,14 +137,14 @@
             this.usersBindingNavigatorSaveItem,
             this.toolStripSeparator1,
             this.btDevel});
-            this.bn.Location = new System.Drawing.Point(0, 419);
+            this.bn.Location = new System.Drawing.Point(0, 540);
             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(755, 25);
+            this.bn.Size = new System.Drawing.Size(908, 25);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -267,6 +270,7 @@
             this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dvc_id,
+            this.processs,
             this.dvc_level,
             this.nameDataGridViewTextBoxColumn,
             this.nameEDataGridViewTextBoxColumn,
@@ -285,9 +289,116 @@
             this.dv1.Location = new System.Drawing.Point(0, 25);
             this.dv1.Name = "dv1";
             this.dv1.RowTemplate.Height = 23;
-            this.dv1.Size = new System.Drawing.Size(755, 373);
+            this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.dv1.Size = new System.Drawing.Size(908, 494);
             this.dv1.TabIndex = 1;
             // 
+            // cm1
+            // 
+            this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.autoResizeColumnToolStripMenuItem,
+            this.toolStripMenuItem2,
+            this.iDChangeToolStripMenuItem,
+            this.passwordChangeToolStripMenuItem,
+            this.toolStripMenuItem1,
+            this.mailToolStripMenuItem});
+            this.cm1.Name = "cm1";
+            this.cm1.Size = new System.Drawing.Size(181, 104);
+            // 
+            // autoResizeColumnToolStripMenuItem
+            // 
+            this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem";
+            this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column";
+            this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
+            // 
+            // iDChangeToolStripMenuItem
+            // 
+            this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem";
+            this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.iDChangeToolStripMenuItem.Text = "ID Change";
+            this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click);
+            // 
+            // passwordChangeToolStripMenuItem
+            // 
+            this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem";
+            this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.passwordChangeToolStripMenuItem.Text = "Password Change";
+            this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
+            // 
+            // mailToolStripMenuItem
+            // 
+            this.mailToolStripMenuItem.Name = "mailToolStripMenuItem";
+            this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.mailToolStripMenuItem.Text = "Mail";
+            this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripLabel1,
+            this.cmbdept,
+            this.toolStripLabel2,
+            this.tbProcess,
+            this.btRef});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(908, 25);
+            this.toolStrip1.TabIndex = 2;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // toolStripLabel1
+            // 
+            this.toolStripLabel1.Name = "toolStripLabel1";
+            this.toolStripLabel1.Size = new System.Drawing.Size(31, 22);
+            this.toolStripLabel1.Text = "소속";
+            // 
+            // cmbdept
+            // 
+            this.cmbdept.Name = "cmbdept";
+            this.cmbdept.Size = new System.Drawing.Size(400, 25);
+            // 
+            // btRef
+            // 
+            this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
+            this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btRef.Name = "btRef";
+            this.btRef.Size = new System.Drawing.Size(66, 22);
+            this.btRef.Text = "Refresh";
+            this.btRef.Click += new System.EventHandler(this.btRef_Click);
+            // 
+            // textBox1
+            // 
+            this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
+            this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.textBox1.Location = new System.Drawing.Point(0, 519);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(908, 21);
+            this.textBox1.TabIndex = 3;
+            // 
+            // toolStripLabel2
+            // 
+            this.toolStripLabel2.Name = "toolStripLabel2";
+            this.toolStripLabel2.Size = new System.Drawing.Size(31, 22);
+            this.toolStripLabel2.Text = "공정";
+            // 
+            // tbProcess
+            // 
+            this.tbProcess.Name = "tbProcess";
+            this.tbProcess.Size = new System.Drawing.Size(100, 25);
+            this.tbProcess.Text = "%";
+            this.tbProcess.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // dvc_id
             // 
             this.dvc_id.DataPropertyName = "id";
@@ -298,6 +409,12 @@
             this.dvc_id.Name = "dvc_id";
             this.dvc_id.Width = 40;
             // 
+            // processs
+            // 
+            this.processs.DataPropertyName = "processs";
+            this.processs.HeaderText = "processs";
+            this.processs.Name = "processs";
+            // 
             // dvc_level
             // 
             this.dvc_level.DataPropertyName = "level";
@@ -385,102 +502,11 @@
             this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
             this.memoDataGridViewTextBoxColumn.Width = 66;
             // 
-            // cm1
-            // 
-            this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.autoResizeColumnToolStripMenuItem,
-            this.toolStripMenuItem2,
-            this.iDChangeToolStripMenuItem,
-            this.passwordChangeToolStripMenuItem,
-            this.toolStripMenuItem1,
-            this.mailToolStripMenuItem});
-            this.cm1.Name = "cm1";
-            this.cm1.Size = new System.Drawing.Size(181, 104);
-            // 
-            // autoResizeColumnToolStripMenuItem
-            // 
-            this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem";
-            this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column";
-            this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click);
-            // 
-            // toolStripMenuItem2
-            // 
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
-            // 
-            // iDChangeToolStripMenuItem
-            // 
-            this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem";
-            this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.iDChangeToolStripMenuItem.Text = "ID Change";
-            this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click);
-            // 
-            // passwordChangeToolStripMenuItem
-            // 
-            this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem";
-            this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.passwordChangeToolStripMenuItem.Text = "Password Change";
-            this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click);
-            // 
-            // toolStripMenuItem1
-            // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
-            // 
-            // mailToolStripMenuItem
-            // 
-            this.mailToolStripMenuItem.Name = "mailToolStripMenuItem";
-            this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.mailToolStripMenuItem.Text = "Mail";
-            this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
-            // 
-            // toolStrip1
-            // 
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripLabel1,
-            this.cmbdept,
-            this.btRef});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(755, 25);
-            this.toolStrip1.TabIndex = 2;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // toolStripLabel1
-            // 
-            this.toolStripLabel1.Name = "toolStripLabel1";
-            this.toolStripLabel1.Size = new System.Drawing.Size(43, 22);
-            this.toolStripLabel1.Text = "Depart";
-            // 
-            // cmbdept
-            // 
-            this.cmbdept.Name = "cmbdept";
-            this.cmbdept.Size = new System.Drawing.Size(300, 25);
-            // 
-            // btRef
-            // 
-            this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
-            this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btRef.Name = "btRef";
-            this.btRef.Size = new System.Drawing.Size(66, 22);
-            this.btRef.Text = "Refresh";
-            this.btRef.Click += new System.EventHandler(this.btRef_Click);
-            // 
-            // textBox1
-            // 
-            this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
-            this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.textBox1.Location = new System.Drawing.Point(0, 398);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(755, 21);
-            this.textBox1.TabIndex = 3;
-            // 
             // fUserList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(755, 444);
+            this.ClientSize = new System.Drawing.Size(908, 565);
             this.Controls.Add(this.dv1);
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.toolStrip1);
@@ -536,7 +562,11 @@
         private System.Windows.Forms.ToolStripButton btRef;
         private System.Windows.Forms.ToolStripMenuItem autoResizeColumnToolStripMenuItem;
         private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel2;
+        private System.Windows.Forms.ToolStripTextBox tbProcess;
         private System.Windows.Forms.DataGridViewTextBoxColumn dvc_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn processs;
         private System.Windows.Forms.DataGridViewTextBoxColumn dvc_level;
         private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn nameEDataGridViewTextBoxColumn;
@@ -549,6 +579,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn hpDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
     }
 }

Project/_Common/fUserList.cs

@@ -155,8 +155,9 @@ namespace Project._Common
         private void btRef_Click(object sender, EventArgs e)
         {
             //read data
+            if (tbProcess.Text.Trim() == "") tbProcess.Text = "%";
             this.dsMSSQL.Users.Clear();
-            this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text );
+            this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text, tbProcess.Text.Trim());
             this.dsMSSQL.Users.AcceptChanges();
         }
 

Project/_Common/fUserList.resx

@@ -219,6 +219,9 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="processs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>387, 17</value>
   </metadata>

Project/dsMSSQL.xsd

@@ -9,7 +9,7 @@
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="UsersTableAdapter" GeneratorDataComponentClassName="UsersTableAdapter" Name="Users" UserDataComponentName="UsersTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM [Users] WHERE (([id] = @Original_id) AND ((@IsNull_password = 1 AND [password] IS NULL) OR ([password] = @Original_password)) AND ((@IsNull_nameE = 1 AND [nameE] IS NULL) OR ([nameE] = @Original_nameE)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_outdate = 1 AND [outdate] IS NULL) OR ([outdate] = @Original_outdate)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_hp = 1 AND [hp] IS NULL) OR ([hp] = @Original_hp)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_ads_employNo = 1 AND [ads_employNo] IS NULL) OR ([ads_employNo] = @Original_ads_employNo)) AND ((@IsNull_ads_title = 1 AND [ads_title] IS NULL) OR ([ads_title] = @Original_ads_title)) AND ((@IsNull_ads_created = 1 AND [ads_created] IS NULL) OR ([ads_created] = @Original_ads_created)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))</CommandText>
@@ -54,101 +54,78 @@
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [Users] ([id], [password], [nameE], [name], [dept], [grade], [email], [level], [indate], [outdate], [tel], [hp], [place], [ads_employNo], [ads_title], [ads_created], [memo], [wuid], [wdate]) VALUES (@id, @password, @nameE, @name, @dept, @grade, @email, @level, @indate, @outdate, @tel, @hp, @place, @ads_employNo, @ads_title, @ads_created, @memo, @wuid, @wdate);
+                    <CommandText>INSERT INTO Users
+               (id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs, gcode)
+VALUES  (@id,@password,@nameE,@name,@dept,@grade,@email,@level,@indate,@outdate,@tel,@hp,@place,@ads_employNo,@ads_title,@ads_created,@memo,@wuid,@wdate,@processs,@gcode); 
 SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate FROM Users WHERE (id = @id) ORDER BY name</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="id" ColumnName="id" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@password" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="password" ColumnName="password" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@password" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@nameE" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="nameE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="nameE" ColumnName="nameE" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@nameE" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="nameE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="dept" ColumnName="dept" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grade" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grade" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="grade" ColumnName="grade" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@grade" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="grade" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@email" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="email" ColumnName="email" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@email" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@level" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@level" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@indate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="indate" ColumnName="indate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@indate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@outdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="outdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="outdate" ColumnName="outdate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@outdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="outdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tel" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tel" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="tel" ColumnName="tel" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@tel" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="tel" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@hp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="hp" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="hp" ColumnName="hp" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@hp" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="hp" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="place" ColumnName="place" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ads_employNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ads_employNo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ads_employNo" ColumnName="ads_employNo" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ads_employNo" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ads_employNo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ads_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ads_title" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ads_title" ColumnName="ads_title" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@ads_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="ads_title" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ads_created" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ads_created" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ads_created" ColumnName="ads_created" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ads_created" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ads_created" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="processs" ColumnName="processs" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@processs" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="processs" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate
+                    <CommandText>SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs, gcode
 FROM     Users
-WHERE  (ISNULL(dept, '') LIKE @dept)
+WHERE  (ISNULL(dept, N'') LIKE @dept) AND (ISNULL(processs, N'') LIKE @process)
 ORDER BY name</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="dept" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="process" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@process" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [Users] SET [id] = @id, [password] = @password, [nameE] = @nameE, [name] = @name, [dept] = @dept, [grade] = @grade, [email] = @email, [level] = @level, [indate] = @indate, [outdate] = @outdate, [tel] = @tel, [hp] = @hp, [place] = @place, [ads_employNo] = @ads_employNo, [ads_title] = @ads_title, [ads_created] = @ads_created, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([id] = @Original_id) AND ((@IsNull_password = 1 AND [password] IS NULL) OR ([password] = @Original_password)) AND ((@IsNull_nameE = 1 AND [nameE] IS NULL) OR ([nameE] = @Original_nameE)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_outdate = 1 AND [outdate] IS NULL) OR ([outdate] = @Original_outdate)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_hp = 1 AND [hp] IS NULL) OR ([hp] = @Original_hp)) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_ads_employNo = 1 AND [ads_employNo] IS NULL) OR ([ads_employNo] = @Original_ads_employNo)) AND ((@IsNull_ads_title = 1 AND [ads_title] IS NULL) OR ([ads_title] = @Original_ads_title)) AND ((@IsNull_ads_created = 1 AND [ads_created] IS NULL) OR ([ads_created] = @Original_ads_created)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
+                    <CommandText>UPDATE Users
+SET        id = @id, password = @password, nameE = @nameE, name = @name, dept = @dept, grade = @grade, email = @email, level = @level, indate = @indate, outdate = @outdate, tel = @tel, 
+               hp = @hp, place = @place, ads_employNo = @ads_employNo, ads_title = @ads_title, ads_created = @ads_created, memo = @memo, wuid = @wuid, wdate = @wdate, processs = @process, 
+               gcode = @gcode
+WHERE  (id = @Original_id);  
 SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate FROM Users WHERE (id = @id) ORDER BY name</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="id" ColumnName="id" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@password" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="password" ColumnName="password" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@password" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@nameE" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="nameE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="nameE" ColumnName="nameE" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@nameE" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="nameE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="dept" ColumnName="dept" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grade" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grade" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="grade" ColumnName="grade" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@grade" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="grade" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@email" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="email" ColumnName="email" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@email" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@level" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@level" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@indate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="indate" ColumnName="indate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@indate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@outdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="outdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="outdate" ColumnName="outdate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@outdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="outdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tel" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tel" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="tel" ColumnName="tel" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@tel" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="tel" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@hp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="hp" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="hp" ColumnName="hp" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@hp" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="hp" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="place" ColumnName="place" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@place" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ads_employNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ads_employNo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ads_employNo" ColumnName="ads_employNo" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ads_employNo" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ads_employNo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ads_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ads_title" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ads_title" ColumnName="ads_title" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@ads_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="ads_title" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ads_created" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ads_created" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ads_created" ColumnName="ads_created" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ads_created" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ads_created" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="processs" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@process" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="processs" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_password" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="password" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_password" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_id" ColumnName="id" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_nameE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="nameE" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_nameE" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="nameE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_dept" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grade" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grade" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_grade" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grade" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_email" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="email" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_email" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@Original_level" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_indate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="indate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_indate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_outdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="outdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_outdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="outdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_tel" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="tel" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_tel" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tel" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_hp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="hp" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_hp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="hp" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_place" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="place" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_place" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="place" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ads_employNo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ads_employNo" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ads_employNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ads_employNo" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ads_title" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ads_title" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ads_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ads_title" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ads_created" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ads_created" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ads_created" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ads_created" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -174,17 +151,19 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
               <Mapping SourceColumn="ads_title" DataSetColumn="ads_title" />
               <Mapping SourceColumn="ads_created" DataSetColumn="ads_created" />
               <Mapping SourceColumn="ads_employNo" DataSetColumn="ads_employNo" />
+              <Mapping SourceColumn="processs" DataSetColumn="processs" />
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByNamePw" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByNamePw" GeneratorSourceName="FillByNamePw" GetMethodModifier="Public" GetMethodName="GetByNamePw" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByNamePw" UserSourceName="FillByNamePw">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate
+                    <CommandText>SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs, gcode
 FROM     Users
-WHERE  [name] = @username and  (password = @encpw)</CommandText>
+WHERE  (name = @username) AND (password = @encpw)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="username" ColumnName="name" DataSourceName="GroupWare.dbo.Users" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@username" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="username" ColumnName="name" DataSourceName="EE.dbo.Users" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@username" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="encpw" ColumnName="password" DataSourceName="GroupWare.dbo.Users" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@encpw" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="encpw" ColumnName="password" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@encpw" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -192,12 +171,12 @@ WHERE  [name] = @username and  (password = @encpw)</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetID" GeneratorSourceName="FillID" GetMethodModifier="Public" GetMethodName="GetID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetID" UserSourceName="FillID">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate
+                    <CommandText>SELECT  id, password, nameE, name, dept, grade, email, level, indate, outdate, tel, hp, place, ads_employNo, ads_title, ads_created, memo, wuid, wdate, processs, gcode
 FROM     Users
-where id = @id
+WHERE  (id = @id)
 ORDER BY name</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="id" ColumnName="id" DataSourceName="GroupWare.dbo.Users" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="id" ColumnName="id" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -205,10 +184,14 @@ ORDER BY name</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillIDPW" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetIDPW" GeneratorSourceName="FillIDPW" GetMethodModifier="Public" GetMethodName="GetIDPW" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetIDPW" UserSourceName="FillIDPW">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT ads_created, ads_employNo, ads_title, dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, tel, wdate, wuid FROM Users WHERE (password = @encpw) AND (level &gt; 0) AND (email = @idkey) OR (password = @encpw) AND (level &gt; 0) AND (id = @idkey) OR (password = @encpw) AND (level &gt; 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') })</CommandText>
+                    <CommandText>SELECT  ads_created, ads_employNo, ads_title, dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, tel, wdate, wuid, processs, gcode
+FROM     Users
+WHERE  (password = @encpw) AND (level &gt; 0) AND (email = @idkey) OR
+               (password = @encpw) AND (level &gt; 0) AND (id = @idkey) OR
+               (password = @encpw) AND (level &gt; 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') })</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="encpw" ColumnName="password" DataSourceName="GroupWare.dbo.Users" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@encpw" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="encpw" ColumnName="password" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@encpw" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="password" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="idkey" ColumnName="email" DataSourceName="GroupWare.dbo.Users" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@idkey" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="idkey" ColumnName="email" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@idkey" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="email" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -929,6 +912,20 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

Project/dsMSSQL.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="28" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Users" ZOrder="2" X="38" Y="90" Height="554" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
     <Shape ID="DesignTable:Projects" ZOrder="7" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />

SubProject/FBS0000/Holiday/fHolyday.Designer.cs

@@ -31,12 +31,9 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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 FBS0000.dsMSSQL();
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -48,7 +45,13 @@
             this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
-            this.boardBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
+            this.sbUse = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
+            this.sbGen = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel();
+            this.sbJan = new System.Windows.Forms.ToolStripLabel();
             this.dv1 = new System.Windows.Forms.DataGridView();
             this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -62,32 +65,19 @@
             this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
             this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.ta = new FBS0000.dsMSSQLTableAdapters.vHoliday_uselistTableAdapter();
-            this.dsMSSQL = new FBS0000.dsMSSQL();
+            this.pdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager();
+            this.dvc_cate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
-            this.dvc_user = new System.Windows.Forms.DataGridViewComboBoxColumn();
-            this.dvc_cate = new System.Windows.Forms.DataGridViewComboBoxColumn();
-            this.sdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.edateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.termDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.termDr = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dvc_result = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.contents = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.sbGen = new System.Windows.Forms.ToolStripLabel();
-            this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
-            this.sbUse = new System.Windows.Forms.ToolStripLabel();
-            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
-            this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel();
-            this.sbJan = new System.Windows.Forms.ToolStripLabel();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
             this.cm1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -110,7 +100,6 @@
             this.bindingNavigatorSeparator2,
             this.bindingNavigatorAddNewItem,
             this.bindingNavigatorDeleteItem,
-            this.boardBindingNavigatorSaveItem,
             this.toolStripSeparator1,
             this.toolStripLabel7,
             this.sbUse,
@@ -129,6 +118,16 @@
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
+            // bs
+            // 
+            this.bs.DataMember = "vHoliday_uselist";
+            this.bs.DataSource = this.dsMSSQL;
+            // 
+            // dsMSSQL
+            // 
+            this.dsMSSQL.DataSetName = "dsMSSQL";
+            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -209,17 +208,54 @@
             this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
             this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
             this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
-            this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(75, 28);
+            this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(131, 28);
-            this.bindingNavigatorAddNewItem.Text = "추가(&A)";
+            this.bindingNavigatorAddNewItem.Text = "휴가 발생 등록(&A)";
             this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
             // 
-            // boardBindingNavigatorSaveItem
+            // toolStripSeparator1
             // 
-            this.boardBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("boardBindingNavigatorSaveItem.Image")));
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.boardBindingNavigatorSaveItem.Name = "boardBindingNavigatorSaveItem";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
-            this.boardBindingNavigatorSaveItem.Size = new System.Drawing.Size(74, 28);
+            // 
-            this.boardBindingNavigatorSaveItem.Text = "저장(&S)";
+            // toolStripLabel7
-            this.boardBindingNavigatorSaveItem.Click += new System.EventHandler(this.boardBindingNavigatorSaveItem_Click);
+            // 
+            this.toolStripLabel7.Name = "toolStripLabel7";
+            this.toolStripLabel7.Size = new System.Drawing.Size(31, 28);
+            this.toolStripLabel7.Text = "사용";
+            // 
+            // sbUse
+            // 
+            this.sbUse.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.sbUse.Name = "sbUse";
+            this.sbUse.Size = new System.Drawing.Size(19, 28);
+            this.sbUse.Text = "0";
+            // 
+            // toolStripLabel5
+            // 
+            this.toolStripLabel5.Name = "toolStripLabel5";
+            this.toolStripLabel5.Size = new System.Drawing.Size(31, 28);
+            this.toolStripLabel5.Text = "발생";
+            // 
+            // sbGen
+            // 
+            this.sbGen.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.sbGen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+            this.sbGen.Name = "sbGen";
+            this.sbGen.Size = new System.Drawing.Size(19, 28);
+            this.sbGen.Text = "0";
+            // 
+            // toolStripLabel8
+            // 
+            this.toolStripLabel8.Name = "toolStripLabel8";
+            this.toolStripLabel8.Size = new System.Drawing.Size(31, 28);
+            this.toolStripLabel8.Text = "잔량";
+            // 
+            // sbJan
+            // 
+            this.sbJan.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.sbJan.Name = "sbJan";
+            this.sbJan.Size = new System.Drawing.Size(19, 28);
+            this.sbJan.Text = "0";
             // 
             // dv1
             // 
@@ -229,13 +265,10 @@
             this.dv1.ColumnHeadersHeight = 30;
             this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dvc_user,
+            this.pdate,
             this.dvc_cate,
-            this.sdateDataGridViewTextBoxColumn,
-            this.edateDataGridViewTextBoxColumn,
             this.termDataGridViewTextBoxColumn,
             this.termDr,
-            this.dvc_result,
             this.contents});
             this.dv1.ContextMenuStrip = this.cm1;
             this.dv1.DataSource = this.bs;
@@ -298,8 +331,8 @@
             // toolStripLabel1
             // 
             this.toolStripLabel1.Name = "toolStripLabel1";
-            this.toolStripLabel1.Size = new System.Drawing.Size(34, 28);
+            this.toolStripLabel1.Size = new System.Drawing.Size(31, 28);
-            this.toolStripLabel1.Text = "Term";
+            this.toolStripLabel1.Text = "기간";
             // 
             // tbSD
             // 
@@ -326,8 +359,8 @@
             // toolStripLabel3
             // 
             this.toolStripLabel3.Name = "toolStripLabel3";
-            this.toolStripLabel3.Size = new System.Drawing.Size(30, 28);
+            this.toolStripLabel3.Size = new System.Drawing.Size(43, 28);
-            this.toolStripLabel3.Text = "User";
+            this.toolStripLabel3.Text = "담당자";
             // 
             // cmbUser
             // 
@@ -340,77 +373,34 @@
             this.toolStripButton1.Image = global::FBS0000.Properties.Resources.action_refresh;
             this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(86, 28);
+            this.toolStripButton1.Size = new System.Drawing.Size(74, 28);
-            this.toolStripButton1.Text = "Search(&R)";
+            this.toolStripButton1.Text = "검색(&R)";
             this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
             // 
-            // bs
-            // 
-            this.bs.DataMember = "Holyday";
-            this.bs.DataSource = this.dsMSSQL;
-            // 
-            // dsMSSQL
-            // 
-            this.dsMSSQL.DataSetName = "dsMSSQL";
-            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
-            // tam
-            // 
-            this.tam.BackupDataSetBeforeUpdate = false;
-            this.tam.BoardTableAdapter = null;
-            this.tam.HolydayTableAdapter = this.ta;
-            this.tam.minutesTableAdapter = null;
-            this.tam.UpdateOrder = FBS0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
-            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
             // 
-            // dvc_user
+            // pdate
             // 
-            this.dvc_user.DataPropertyName = "uid";
+            this.pdate.DataPropertyName = "pdate";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.pdate.HeaderText = "등록일";
-            this.dvc_user.DefaultCellStyle = dataGridViewCellStyle1;
+            this.pdate.Name = "pdate";
-            this.dvc_user.HeaderText = "사용자";
+            this.pdate.ReadOnly = true;
-            this.dvc_user.Name = "dvc_user";
-            this.dvc_user.ReadOnly = true;
-            this.dvc_user.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.dvc_user.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             // 
             // dvc_cate
             // 
             this.dvc_cate.DataPropertyName = "cate";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.dvc_cate.HeaderText = "cate";
-            this.dvc_cate.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dvc_cate.HeaderText = "구분";
             this.dvc_cate.Name = "dvc_cate";
             this.dvc_cate.ReadOnly = true;
-            this.dvc_cate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dvc_cate.Visible = false;
-            this.dvc_cate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            // 
-            // sdateDataGridViewTextBoxColumn
-            // 
-            this.sdateDataGridViewTextBoxColumn.DataPropertyName = "sdate";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.sdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
-            this.sdateDataGridViewTextBoxColumn.HeaderText = "시작일";
-            this.sdateDataGridViewTextBoxColumn.Name = "sdateDataGridViewTextBoxColumn";
-            this.sdateDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // edateDataGridViewTextBoxColumn
-            // 
-            this.edateDataGridViewTextBoxColumn.DataPropertyName = "edate";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.edateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
-            this.edateDataGridViewTextBoxColumn.HeaderText = "종료일";
-            this.edateDataGridViewTextBoxColumn.Name = "edateDataGridViewTextBoxColumn";
-            this.edateDataGridViewTextBoxColumn.ReadOnly = true;
             // 
             // termDataGridViewTextBoxColumn
             // 
             this.termDataGridViewTextBoxColumn.DataPropertyName = "term";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.termDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
+            this.termDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
             this.termDataGridViewTextBoxColumn.HeaderText = "사용";
             this.termDataGridViewTextBoxColumn.Name = "termDataGridViewTextBoxColumn";
             this.termDataGridViewTextBoxColumn.ReadOnly = true;
@@ -422,17 +412,6 @@
             this.termDr.Name = "termDr";
             this.termDr.ReadOnly = true;
             // 
-            // dvc_result
-            // 
-            this.dvc_result.DataPropertyName = "result";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.dvc_result.DefaultCellStyle = dataGridViewCellStyle6;
-            this.dvc_result.HeaderText = "결과";
-            this.dvc_result.Name = "dvc_result";
-            this.dvc_result.ReadOnly = true;
-            this.dvc_result.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.dvc_result.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            // 
             // contents
             // 
             this.contents.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
@@ -441,51 +420,6 @@
             this.contents.Name = "contents";
             this.contents.ReadOnly = true;
             // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
-            // 
-            // sbGen
-            // 
-            this.sbGen.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.sbGen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.sbGen.Name = "sbGen";
-            this.sbGen.Size = new System.Drawing.Size(19, 28);
-            this.sbGen.Text = "0";
-            // 
-            // toolStripLabel5
-            // 
-            this.toolStripLabel5.Name = "toolStripLabel5";
-            this.toolStripLabel5.Size = new System.Drawing.Size(31, 28);
-            this.toolStripLabel5.Text = "발생";
-            // 
-            // sbUse
-            // 
-            this.sbUse.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.sbUse.Name = "sbUse";
-            this.sbUse.Size = new System.Drawing.Size(19, 28);
-            this.sbUse.Text = "0";
-            // 
-            // toolStripLabel7
-            // 
-            this.toolStripLabel7.Name = "toolStripLabel7";
-            this.toolStripLabel7.Size = new System.Drawing.Size(31, 28);
-            this.toolStripLabel7.Text = "사용";
-            // 
-            // toolStripLabel8
-            // 
-            this.toolStripLabel8.Name = "toolStripLabel8";
-            this.toolStripLabel8.Size = new System.Drawing.Size(31, 28);
-            this.toolStripLabel8.Text = "잔량";
-            // 
-            // sbJan
-            // 
-            this.sbJan.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.sbJan.Name = "sbJan";
-            this.sbJan.Size = new System.Drawing.Size(19, 28);
-            this.sbJan.Text = "0";
-            // 
             // fHolyday
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -495,17 +429,17 @@
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.bn);
             this.Name = "fHolyday";
-            this.Text = "Holiday List";
+            this.Text = "휴가 사용 내역";
             this.Load += new System.EventHandler(this.@__Load);
             ((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.dv1)).EndInit();
             this.cm1.ResumeLayout(false);
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -515,7 +449,6 @@
 
         private dsMSSQL dsMSSQL;
         private System.Windows.Forms.BindingSource bs;
-        private dsMSSQLTableAdapters.TableAdapterManager tam;
         private System.Windows.Forms.BindingNavigator bn;
         private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
         private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
@@ -528,9 +461,7 @@
         private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
         private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
         private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
-        private System.Windows.Forms.ToolStripButton boardBindingNavigatorSaveItem;
         private System.Windows.Forms.DataGridView dv1;
-        private dsMSSQLTableAdapters.HolydayTableAdapter ta;
         private System.Windows.Forms.ToolStrip toolStrip1;
         private System.Windows.Forms.ToolStripLabel toolStripLabel1;
         private System.Windows.Forms.ToolStripTextBox tbSD;
@@ -543,14 +474,6 @@
         private System.Windows.Forms.ToolStripMenuItem autoResizeComlumnsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem sendToMailToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
-        private System.Windows.Forms.DataGridViewComboBoxColumn dvc_user;
-        private System.Windows.Forms.DataGridViewComboBoxColumn dvc_cate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn sdateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn edateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn termDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn termDr;
-        private System.Windows.Forms.DataGridViewComboBoxColumn dvc_result;
-        private System.Windows.Forms.DataGridViewTextBoxColumn contents;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripLabel toolStripLabel7;
         private System.Windows.Forms.ToolStripLabel sbUse;
@@ -558,5 +481,11 @@
         private System.Windows.Forms.ToolStripLabel sbGen;
         private System.Windows.Forms.ToolStripLabel toolStripLabel8;
         private System.Windows.Forms.ToolStripLabel sbJan;
+        private dsMSSQLTableAdapters.vHoliday_uselistTableAdapter ta;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pdate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dvc_cate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn termDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn termDr;
+        private System.Windows.Forms.DataGridViewTextBoxColumn contents;
     }
 }

SubProject/FBS0000/Holiday/fHolyday.cs

@@ -17,28 +17,39 @@ namespace FBS0000
         public fHolyday()
         {
             InitializeComponent();
-            this.dsMSSQL.Holyday.TableNewRow += Holyday_TableNewRow;
+            this.dsMSSQL.vHoliday_uselist.TableNewRow += Holyday_TableNewRow;
+            this.dv1.CellFormatting += dv1_CellFormatting;
+        }
+
+        void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
+        {
+            if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
+            var col = this.dv1.Columns[e.ColumnIndex];
+            var cate = dv1.Rows[e.RowIndex].Cells["dvc_cate"].Value.ToString();
+            if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray;
+            else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black;
         }
 
         private void __Load(object sender, EventArgs e)
         {
+
             tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
             tbED.Text = DateTime.Now.AddDays(10).ToShortDateString();
 
-            var userlist = FCOMMON.DBM.getUserTable();
+            //var userlist = FCOMMON.DBM.getUserTable();
-            dvc_user.DataSource = userlist;
+            //dvc_user.DataSource = userlist;
-            dvc_user.ValueMember = "Key";
+            //dvc_user.ValueMember = "Key";
-            dvc_user.DisplayMember = "Value";
+            //dvc_user.DisplayMember = "Value";
 
-            var cateList = FCOMMON.DBM.getCodeTable("02");
+            //var cateList = FCOMMON.DBM.getCodeTable("02");
-            this.dvc_cate.DataSource = cateList;
+            //this.dvc_cate.DataSource = cateList;
-            dvc_cate.ValueMember = "Key";
+            //dvc_cate.ValueMember = "Key";
-            dvc_cate.DisplayMember = "Value";
+            //dvc_cate.DisplayMember = "Value";
 
-            var rrltList = FCOMMON.DBM.getCodeTable("03");
+            //var rrltList = FCOMMON.DBM.getCodeTable("03");
-            this.dvc_result.DataSource = rrltList;
+            //this.dvc_result.DataSource = rrltList;
-            dvc_result.ValueMember = "Key";
+            //dvc_result.ValueMember = "Key";
-            dvc_result.DisplayMember = "Value";
+            //dvc_result.DisplayMember = "Value";
 
             //udpate user list
             var userList = FCOMMON.DBM.getUserList();
@@ -71,11 +82,10 @@ namespace FBS0000
             e.Row["wuid"] = FCOMMON.info.Login.no;
             e.Row["uid"] = FCOMMON.info.Login.no;
             e.Row["wdate"] = DateTime.Now;
-            e.Row["cate"] = "10"; //기본 신청
+            e.Row["cate"] = "0"; //기본 신청
-            e.Row["sdate"] = DateTime.Now.ToShortDateString();
+            e.Row["pdate"] = DateTime.Now;
-            e.Row["edate"] = DateTime.Now.ToShortDateString();
+            e.Row["termDr"] = 1.0f;
-            e.Row["term"] = 1.0f;
+            e.Row["contents"] = string.Empty;
-            e.Row["Result"] = "00";
         }
 
 
@@ -87,24 +97,25 @@ namespace FBS0000
             {
                 uid = cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1);
             }
-            this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid);
+            var sd = DateTime.Parse(tbSD.Text + " 00:00:00");
+            var ed = DateTime.Parse(tbED.Text + " 23:59:59");
+            this.ta.Fill(this.dsMSSQL.vHoliday_uselist,uid,tbSD.Text,tbED.Text,FCOMMON.info.Login.gcode);
+
 
             //잔량계산
-            double sumdr = 0;
+            double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr);
-            double sumcr = 0;
+            double sumcr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.term);
-            double jan = 0;
+            double jan = sumdr - sumcr;
-            foreach( dsMSSQL.HolydayRow dr in this.dsMSSQL.Holyday.Rows)
-            {
-                if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
-                sumdr += dr.termDr;
-                sumcr += dr.term;
-            }
-            jan = sumdr - sumcr;
             sbGen.Text = sumdr.ToString("N0");
             sbUse.Text = sumcr.ToString("N0");
             sbJan.Text = jan.ToString("N0");
             if (jan < 0) sbJan.ForeColor = Color.Red;
             else sbJan.ForeColor = Color.Blue;
+
+            //색상변경
+
+
+            this.dv1.AutoResizeColumns();
         }
         private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e)
         {
@@ -114,27 +125,21 @@ namespace FBS0000
             if (dlg != System.Windows.Forms.DialogResult.Yes) return;
             try
             {
-                this.tam.UpdateAll(this.dsMSSQL);
+               
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 FCOMMON.Util.MsgE(ex.Message);
             }
-            
-
         }
 
         private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
         {
-            var newdr = this.dsMSSQL.Holyday.NewHolydayRow();
+            
-            var f = new fHolyday_Add(newdr);
+            var f = new fHolyday_Add();
-            if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK)
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
-                newdr.Delete();
+                RefreshData();
-            }
-            else
-            {
-                newdr.EndEdit();
-                this.dsMSSQL.Holyday.AddHolydayRow(newdr);
             }
         }
 
@@ -152,13 +157,22 @@ namespace FBS0000
         {
             var drv = this.bs.Current as DataRowView;
             if (drv == null) return;
-            var dr = drv.Row as dsMSSQL.HolydayRow;
+            var dr = drv.Row as dsMSSQL.vHoliday_uselistRow;
-            var f = new fHolyday_Add(dr);
+            if(dr.cate == "0")
-            if(f.ShowDialog() != System.Windows.Forms.DialogResult.OK)
             {
-                dr.RejectChanges();
+                var f = new fHolyday_Add(dr.idx);
+                if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    RefreshData();
                 }
             }
+            else
+            {
+                FCOMMON.Util.MsgI("이 데이터는 업무일지의 데이터가 입니다.\n\n" +
+                    "변경하려면 업무일지의 자료를 수정하세요" );
+            }
+            
+        }
 
         private void toolStripButton1_Click(object sender, EventArgs e)
         {

SubProject/FBS0000/Holiday/fHolyday.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>259, 17</value>
+    <value>186, 17</value>
   </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>122, 17</value>
@@ -191,32 +191,25 @@
         rkJggg==
 </value>
   </data>
-  <data name="boardBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <metadata name="pdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
-        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="termDr.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dvc_result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dvc_cate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="termDr.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="contents.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>493, 17</value>
+    <value>358, 17</value>
   </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>387, 17</value>
+    <value>252, 17</value>
-  </metadata>
-  <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>186, 17</value>
   </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>325, 17</value>
+    <value>433, 17</value>
   </metadata>
 </root>

SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs

@@ -29,112 +29,58 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.Label cateLabel;
-            System.Windows.Forms.Label resutLabel;
             System.Windows.Forms.Label sdateLabel;
-            System.Windows.Forms.Label edateLabel;
             System.Windows.Forms.Label contentsLabel;
             System.Windows.Forms.Label uidLabel;
-            System.Windows.Forms.Label tolistLabel;
+            System.Windows.Forms.Label label1;
             this.dsMSSQL = new FBS0000.dsMSSQL();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
             this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager();
             this.contentsTextBox = new System.Windows.Forms.TextBox();
-            this.tolistTextBox = new System.Windows.Forms.TextBox();
-            this.mailCheckBox = new System.Windows.Forms.CheckBox();
-            this.reasonTextBox = new System.Windows.Forms.TextBox();
             this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
-            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
-            this.cmbCate = new System.Windows.Forms.ComboBox();
             this.cmbUser = new System.Windows.Forms.ComboBox();
-            this.cmbRlt = new System.Windows.Forms.ComboBox();
             this.btOK = new System.Windows.Forms.Button();
             this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
-            this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
-            cateLabel = new System.Windows.Forms.Label();
-            resutLabel = new System.Windows.Forms.Label();
             sdateLabel = new System.Windows.Forms.Label();
-            edateLabel = new System.Windows.Forms.Label();
             contentsLabel = new System.Windows.Forms.Label();
             uidLabel = new System.Windows.Forms.Label();
-            tolistLabel = new System.Windows.Forms.Label();
+            label1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
             this.SuspendLayout();
             // 
-            // cateLabel
-            // 
-            cateLabel.AutoSize = true;
-            cateLabel.Location = new System.Drawing.Point(12, 73);
-            cateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            cateLabel.Name = "cateLabel";
-            cateLabel.Size = new System.Drawing.Size(72, 19);
-            cateLabel.TabIndex = 4;
-            cateLabel.Text = "Category";
-            // 
-            // resutLabel
-            // 
-            resutLabel.AutoSize = true;
-            resutLabel.Location = new System.Drawing.Point(372, 9);
-            resutLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            resutLabel.Name = "resutLabel";
-            resutLabel.Size = new System.Drawing.Size(54, 19);
-            resutLabel.TabIndex = 6;
-            resutLabel.Text = "Resut:";
-            // 
             // sdateLabel
             // 
             sdateLabel.AutoSize = true;
-            sdateLabel.Location = new System.Drawing.Point(42, 107);
+            sdateLabel.Location = new System.Drawing.Point(38, 50);
             sdateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             sdateLabel.Name = "sdateLabel";
             sdateLabel.Size = new System.Drawing.Size(42, 19);
-            sdateLabel.TabIndex = 8;
+            sdateLabel.TabIndex = 2;
             sdateLabel.Text = "Start";
             // 
-            // edateLabel
-            // 
-            edateLabel.AutoSize = true;
-            edateLabel.Location = new System.Drawing.Point(48, 140);
-            edateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            edateLabel.Name = "edateLabel";
-            edateLabel.Size = new System.Drawing.Size(36, 19);
-            edateLabel.TabIndex = 10;
-            edateLabel.Text = "End";
-            // 
             // contentsLabel
             // 
             contentsLabel.AutoSize = true;
-            contentsLabel.Location = new System.Drawing.Point(21, 173);
+            contentsLabel.Location = new System.Drawing.Point(17, 83);
             contentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             contentsLabel.Name = "contentsLabel";
             contentsLabel.Size = new System.Drawing.Size(63, 19);
-            contentsLabel.TabIndex = 16;
+            contentsLabel.TabIndex = 4;
             contentsLabel.Text = "Remark";
             // 
             // uidLabel
             // 
             uidLabel.AutoSize = true;
-            uidLabel.Location = new System.Drawing.Point(43, 41);
+            uidLabel.Location = new System.Drawing.Point(39, 16);
             uidLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             uidLabel.Name = "uidLabel";
             uidLabel.Size = new System.Drawing.Size(41, 19);
-            uidLabel.TabIndex = 18;
+            uidLabel.TabIndex = 0;
             uidLabel.Text = "User";
             // 
-            // tolistLabel
-            // 
-            tolistLabel.AutoSize = true;
-            tolistLabel.Location = new System.Drawing.Point(18, 364);
-            tolistLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            tolistLabel.Name = "tolistLabel";
-            tolistLabel.Size = new System.Drawing.Size(66, 19);
-            tolistLabel.TabIndex = 20;
-            tolistLabel.Text = "Mail List";
-            // 
             // dsMSSQL
             // 
             this.dsMSSQL.DataSetName = "dsMSSQL";
@@ -160,171 +106,87 @@
             // contentsTextBox
             // 
             this.contentsTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "contents", true));
-            this.contentsTextBox.Location = new System.Drawing.Point(91, 170);
+            this.contentsTextBox.Location = new System.Drawing.Point(87, 80);
             this.contentsTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.contentsTextBox.Multiline = true;
             this.contentsTextBox.Name = "contentsTextBox";
             this.contentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.contentsTextBox.Size = new System.Drawing.Size(301, 145);
+            this.contentsTextBox.Size = new System.Drawing.Size(301, 110);
-            this.contentsTextBox.TabIndex = 17;
+            this.contentsTextBox.TabIndex = 5;
-            // 
-            // tolistTextBox
-            // 
-            this.tolistTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "tolist", true));
-            this.tolistTextBox.Location = new System.Drawing.Point(91, 360);
-            this.tolistTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tolistTextBox.Name = "tolistTextBox";
-            this.tolistTextBox.Size = new System.Drawing.Size(301, 27);
-            this.tolistTextBox.TabIndex = 21;
-            // 
-            // mailCheckBox
-            // 
-            this.mailCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bs, "mail", true));
-            this.mailCheckBox.Location = new System.Drawing.Point(91, 324);
-            this.mailCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.mailCheckBox.Name = "mailCheckBox";
-            this.mailCheckBox.Size = new System.Drawing.Size(257, 38);
-            this.mailCheckBox.TabIndex = 23;
-            this.mailCheckBox.Text = "Send Mail";
-            this.mailCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // reasonTextBox
-            // 
-            this.reasonTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reason", true));
-            this.reasonTextBox.Location = new System.Drawing.Point(408, 121);
-            this.reasonTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.reasonTextBox.Multiline = true;
-            this.reasonTextBox.Name = "reasonTextBox";
-            this.reasonTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.reasonTextBox.Size = new System.Drawing.Size(279, 266);
-            this.reasonTextBox.TabIndex = 27;
             // 
             // dateTimePicker1
             // 
             this.dateTimePicker1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true));
-            this.dateTimePicker1.Location = new System.Drawing.Point(91, 102);
+            this.dateTimePicker1.Location = new System.Drawing.Point(87, 45);
             this.dateTimePicker1.Name = "dateTimePicker1";
             this.dateTimePicker1.Size = new System.Drawing.Size(301, 27);
-            this.dateTimePicker1.TabIndex = 28;
+            this.dateTimePicker1.TabIndex = 3;
             this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
             // 
-            // dateTimePicker2
-            // 
-            this.dateTimePicker2.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "edate", true));
-            this.dateTimePicker2.Location = new System.Drawing.Point(91, 135);
-            this.dateTimePicker2.Name = "dateTimePicker2";
-            this.dateTimePicker2.Size = new System.Drawing.Size(301, 27);
-            this.dateTimePicker2.TabIndex = 29;
-            this.dateTimePicker2.ValueChanged += new System.EventHandler(this.dateTimePicker2_ValueChanged);
-            // 
-            // cmbCate
-            // 
-            this.cmbCate.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.bs, "cate", true));
-            this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbCate.FormattingEnabled = true;
-            this.cmbCate.Location = new System.Drawing.Point(91, 69);
-            this.cmbCate.Name = "cmbCate";
-            this.cmbCate.Size = new System.Drawing.Size(301, 27);
-            this.cmbCate.TabIndex = 32;
-            // 
             // cmbUser
             // 
             this.cmbUser.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.bs, "uid", true));
             this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbUser.FormattingEnabled = true;
-            this.cmbUser.Location = new System.Drawing.Point(91, 37);
+            this.cmbUser.Location = new System.Drawing.Point(87, 12);
             this.cmbUser.Name = "cmbUser";
             this.cmbUser.Size = new System.Drawing.Size(301, 27);
-            this.cmbUser.TabIndex = 33;
+            this.cmbUser.TabIndex = 1;
-            // 
-            // cmbRlt
-            // 
-            this.cmbRlt.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.bs, "result", true));
-            this.cmbRlt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbRlt.FormattingEnabled = true;
-            this.cmbRlt.Location = new System.Drawing.Point(409, 89);
-            this.cmbRlt.Name = "cmbRlt";
-            this.cmbRlt.Size = new System.Drawing.Size(278, 27);
-            this.cmbRlt.TabIndex = 34;
             // 
             // btOK
             // 
-            this.btOK.Location = new System.Drawing.Point(91, 399);
+            this.btOK.Location = new System.Drawing.Point(87, 233);
             this.btOK.Name = "btOK";
-            this.btOK.Size = new System.Drawing.Size(596, 38);
+            this.btOK.Size = new System.Drawing.Size(301, 38);
-            this.btOK.TabIndex = 35;
+            this.btOK.TabIndex = 8;
             this.btOK.Text = "OK";
             this.btOK.UseVisualStyleBackColor = true;
             this.btOK.Click += new System.EventHandler(this.btOK_Click);
             // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new System.Drawing.Point(38, 200);
+            label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label1.Name = "label1";
+            label1.Size = new System.Drawing.Size(34, 19);
+            label1.TabIndex = 6;
+            label1.Text = "day";
+            // 
             // numericUpDown1
             // 
-            this.numericUpDown1.BackColor = System.Drawing.Color.HotPink;
+            this.numericUpDown1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "termDr", true));
-            this.numericUpDown1.DecimalPlaces = 1;
+            this.numericUpDown1.Location = new System.Drawing.Point(87, 198);
-            this.numericUpDown1.Font = new System.Drawing.Font("Tahoma", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.numericUpDown1.Location = new System.Drawing.Point(409, 37);
-            this.numericUpDown1.Maximum = new decimal(new int[] {
-            99999,
-            0,
-            0,
-            0});
             this.numericUpDown1.Name = "numericUpDown1";
-            this.numericUpDown1.Size = new System.Drawing.Size(94, 46);
+            this.numericUpDown1.Size = new System.Drawing.Size(301, 27);
-            this.numericUpDown1.TabIndex = 36;
+            this.numericUpDown1.TabIndex = 7;
             this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // numericUpDown2
-            // 
-            this.numericUpDown2.BackColor = System.Drawing.Color.Lime;
-            this.numericUpDown2.DecimalPlaces = 1;
-            this.numericUpDown2.Font = new System.Drawing.Font("Tahoma", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.numericUpDown2.Location = new System.Drawing.Point(509, 37);
-            this.numericUpDown2.Maximum = new decimal(new int[] {
-            99999,
-            0,
-            0,
-            0});
-            this.numericUpDown2.Name = "numericUpDown2";
-            this.numericUpDown2.Size = new System.Drawing.Size(94, 46);
-            this.numericUpDown2.TabIndex = 37;
-            this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
             // fHolyday_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(704, 449);
+            this.ClientSize = new System.Drawing.Size(398, 280);
-            this.Controls.Add(this.numericUpDown2);
             this.Controls.Add(this.numericUpDown1);
+            this.Controls.Add(label1);
             this.Controls.Add(this.btOK);
-            this.Controls.Add(this.cmbRlt);
             this.Controls.Add(this.cmbUser);
-            this.Controls.Add(this.cmbCate);
-            this.Controls.Add(this.dateTimePicker2);
             this.Controls.Add(this.dateTimePicker1);
-            this.Controls.Add(cateLabel);
-            this.Controls.Add(resutLabel);
             this.Controls.Add(sdateLabel);
-            this.Controls.Add(edateLabel);
             this.Controls.Add(contentsLabel);
             this.Controls.Add(this.contentsTextBox);
             this.Controls.Add(uidLabel);
-            this.Controls.Add(tolistLabel);
-            this.Controls.Add(this.tolistTextBox);
-            this.Controls.Add(this.mailCheckBox);
-            this.Controls.Add(this.reasonTextBox);
             this.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "fHolyday_Add";
-            this.Text = "fHolyday_Add";
+            this.Text = "휴가 발생 등록";
             this.Load += new System.EventHandler(this.@__Load);
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -337,16 +199,9 @@
         private dsMSSQLTableAdapters.HolydayTableAdapter ta;
         private dsMSSQLTableAdapters.TableAdapterManager tam;
         private System.Windows.Forms.TextBox contentsTextBox;
-        private System.Windows.Forms.TextBox tolistTextBox;
-        private System.Windows.Forms.CheckBox mailCheckBox;
-        private System.Windows.Forms.TextBox reasonTextBox;
         private System.Windows.Forms.DateTimePicker dateTimePicker1;
-        private System.Windows.Forms.DateTimePicker dateTimePicker2;
-        private System.Windows.Forms.ComboBox cmbCate;
         private System.Windows.Forms.ComboBox cmbUser;
-        private System.Windows.Forms.ComboBox cmbRlt;
         private System.Windows.Forms.Button btOK;
         private System.Windows.Forms.NumericUpDown numericUpDown1;
-        private System.Windows.Forms.NumericUpDown numericUpDown2;
     }
 }

SubProject/FBS0000/Holiday/fHolyday_Add.cs

@@ -13,24 +13,35 @@ namespace FBS0000
     {
         Boolean bInit = false;
         dsMSSQL.HolydayRow dr;
-        public fHolyday_Add(dsMSSQL.HolydayRow dr_)
+
+        public fHolyday_Add(int idx)
         {
             InitializeComponent();
-            dr = dr_;
+            if(idx == -1)
-            this.cmbCate.DataSource = FCOMMON.DBM.getCodeTable("02"); ;
+            {
-            this.cmbCate.DisplayMember = "KeyValue";
+                dr = this.dsMSSQL.Holyday.NewHolydayRow();
-            this.cmbCate.ValueMember = "Key";
+                dr.sdate = DateTime.Parse( DateTime.Now.Year.ToString() + "-01-01");
-
+                dr.edate = dr.sdate;
-            this.cmbRlt.DataSource = FCOMMON.DBM.getCodeTable("03"); ;
+                dr.wuid = FCOMMON.info.Login.no;
-            this.cmbRlt.DisplayMember = "KeyValue";
+                dr.wdate = DateTime.Now;
-            this.cmbRlt.ValueMember = "Key";
+                dr.term = 0.0;
+                dr.cate = "10";
+                dr.gcode = FCOMMON.info.Login.gcode;
+                dr.uid = FCOMMON.info.Login.no;
+                this.dsMSSQL.Holyday.AddHolydayRow(dr);
+            }   
+            else
+            {
+                ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx);
+                this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow;
+            }
 
             this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); ;
-            this.cmbUser.DisplayMember = "KeyValue";
+            this.cmbUser.DisplayMember = "dispName";
-            this.cmbUser.ValueMember = "Key";
+            this.cmbUser.ValueMember = "id";
-
             this.bs.DataSource = dr;
         }
+        public fHolyday_Add() : this(-1) { }
 
 
         private void __Load(object sender, EventArgs e)
@@ -40,32 +51,47 @@ namespace FBS0000
 
         private void btOK_Click(object sender, EventArgs e)
         {
-            this.Invalidate();
+            //기본값처리
+       
+
+            this.Validate();
             this.bs.EndEdit();
-            if(dr.cate.CompareTo("20") >= 0)
+            this.dr.EndEdit();
+
+            try
             {
-                dr.term *= -1;
+                
-                dr.EndEdit();
+                this.ta.Update(this.dr);
-            }
+                dr.AcceptChanges();
                 DialogResult = System.Windows.Forms.DialogResult.OK;
+            }
+            catch (Exception eX)
+            {
+                FCOMMON.Util.MsgE(eX.Message);
+            }
+
+            
+            
         }
 
         private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
         {
             if (!bInit) return;
-            if(dateTimePicker1.Value > this.dateTimePicker2.Value)
+
-                this.dateTimePicker2.Value = dateTimePicker1.Value;
+            
-            RefreshTerm();
+            //if(dateTimePicker1.Value > this.dateTimePicker2.Value)
+            //    this.dateTimePicker2.Value = dateTimePicker1.Value;
+            //RefreshTerm();
           
 
         }
 
         void RefreshTerm()
         {
-            var ts = dateTimePicker2.Value - dateTimePicker1.Value;
+            //var ts = dateTimePicker2.Value - dateTimePicker1.Value;
-            var days = Math.Ceiling(ts.TotalDays) + 1;
+            //var days = Math.Ceiling(ts.TotalDays) + 1;
-            this.numericUpDown1.Value = (decimal)days;
+            //this.numericUpDown1.Value = (decimal)days;
-            this.dr.term = days;
+            //this.dr.term = days;
         }
         private void dateTimePicker2_ValueChanged(object sender, EventArgs e)
         {

SubProject/FBS0000/Holiday/fHolyday_Add.resx

@@ -117,27 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="cateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="resutLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="sdateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="edateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="contentsLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="uidLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="tolistLabel.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>17, 17</value>
   </metadata>
@@ -150,4 +138,7 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>248, 17</value>
   </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
 </root>

SubProject/FBS0000/dsMSSQL.xsd

@@ -54,7 +54,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  minutes.*
 FROM     minutes</CommandText>
                     <Parameters />
@@ -93,7 +93,7 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_sub" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="sub" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="GroupWare.dbo.minutes" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -114,14 +114,12 @@ SELECT idx, stime, etime, title, place, contents, project, main, sub, memo, wuid
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.minutes" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIDX" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyIDX" GeneratorSourceName="FillByIDX" GetMethodModifier="Public" GetMethodName="GetbyIDX" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyIDX" UserSourceName="FillByIDX">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.minutes" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIDX" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyIDX" GeneratorSourceName="FillByIDX" GetMethodModifier="Public" GetMethodName="GetbyIDX" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyIDX" UserSourceName="FillByIDX">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, stime, etime, title, place, contents, project, main, sub, memo, wuid, wdate
+                    <CommandText>SELECT contents, etime, idx, main, memo, place, project, stime, sub, title, wdate, wuid FROM minutes WHERE (idx = @idx)</CommandText>
-FROM     minutes
-WHERE  (idx = @idx)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="GroupWare.dbo.minutes" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -171,12 +169,12 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate
 FROM     Board
 WHERE  (bidx = @bidx)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="bidx" ColumnName="bidx" DataSourceName="GroupWare.dbo.Board" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@bidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="bidx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bidx" ColumnName="bidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@bidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="bidx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -209,7 +207,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_guid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="guid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="GroupWare.dbo.Board" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -231,10 +229,10 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="HolydayTableAdapter" GeneratorDataComponentClassName="HolydayTableAdapter" Name="Holyday" UserDataComponentName="HolydayTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)))</CommandText>
+                    <CommandText>DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -256,92 +254,111 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_mailsend" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_termDr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_termDr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr);
+                    <CommandText>INSERT INTO Holyday
+               (cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode)
+VALUES  (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode);  
 SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@result" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="result" ColumnName="result" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@result" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@term" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="term" ColumnName="term" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@term" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@title" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="title" ColumnName="title" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@title" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@contents" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="contents" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="contents" ColumnName="contents" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@contents" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="contents" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="tolist" ColumnName="tolist" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@mail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mail" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="mail" ColumnName="mail" DataSourceName="EE.dbo.Holyday" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@mail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="mail" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="mailsend" ColumnName="mailsend" DataSourceName="EE.dbo.Holyday" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@reason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="reason" ColumnName="reason" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@reason" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@termDr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="termDr" ColumnName="termDr" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@termDr" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr
+                    <CommandText>SELECT  idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode
 FROM     Holyday
 WHERE  (sdate &gt;= @sd) AND (edate &lt;= @ed) AND (wuid LIKE @uid)
 ORDER BY sdate, edate</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="GroupWare.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="edate" DataSourceName="GroupWare.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="edate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="uid" ColumnName="wuid" DataSourceName="GroupWare.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="uid" ColumnName="wuid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @uid, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reason, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)));
+                    <CommandText>UPDATE Holyday
-SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate</CommandText>
+SET        cate = @cate, result = @result, sdate = @sdate, edate = @edate, term = @term, title = @title, contents = @contents, uid = @uid, tolist = @tolist, mail = @mail, mailsend = @mailsend, 
+               reason = @reason, wuid = @wuid, wdate = @wdate, termDr = @termDr, gcode = @gcode
+WHERE  (idx = @Original_idx) AND (@IsNull_cate = 1 AND cate IS NULL OR
+               cate = @Original_cate) AND (@IsNull_result = 1 AND result IS NULL OR
+               result = @Original_result) AND (@IsNull_sdate = 1 AND sdate IS NULL OR
+               sdate = @Original_sdate) AND (@IsNull_edate = 1 AND edate IS NULL OR
+               edate = @Original_edate) AND (@IsNull_term = 1 AND term IS NULL OR
+               term = @Original_term) AND (@IsNull_title = 1 AND title IS NULL OR
+               title = @Original_title) AND (@IsNull_uid = 1 AND uid IS NULL OR
+               uid = @Original_uid) AND (@IsNull_mail = 1 AND mail IS NULL OR
+               mail = @Original_mail) AND (@IsNull_mailsend = 1 AND mailsend IS NULL OR
+               mailsend = @Original_mailsend) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsNull_termDr = 1 AND termDr IS NULL OR
+               termDr = @Original_termDr) AND (gcode = @Original_gcode); 
+SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@result" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="result" ColumnName="result" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@result" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@term" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="term" ColumnName="term" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@term" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@title" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="title" ColumnName="title" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@title" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@contents" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="contents" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="contents" ColumnName="contents" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@contents" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="contents" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="tolist" ColumnName="tolist" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@mail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mail" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="mail" ColumnName="mail" DataSourceName="EE.dbo.Holyday" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@mail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="mail" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="mailsend" ColumnName="mailsend" DataSourceName="EE.dbo.Holyday" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@reason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="reason" ColumnName="reason" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@reason" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@termDr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="termDr" ColumnName="termDr" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@termDr" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Holyday" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_cate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_result" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_cate" ColumnName="cate" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_result" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_result" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_result" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_result" ColumnName="result" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@Original_result" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_sdate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_sdate" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Date" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="Date" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_edate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_term" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="term" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_edate" ColumnName="edate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_term" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_term" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_term" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="term" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_title" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="title" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_term" ColumnName="term" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Original_term" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_title" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_title" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="title" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_title" ColumnName="title" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@Original_title" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_uid" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_mail" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="mail" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_mail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mail" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_mail" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_mail" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="mail" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_mailsend" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_mail" ColumnName="mail" DataSourceName="EE.dbo.Holyday" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Original_mail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="mail" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_mailsend" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_mailsend" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="mailsend" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_mailsend" ColumnName="mailsend" DataSourceName="EE.dbo.Holyday" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Original_mailsend" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="mailsend" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_wuid" ColumnName="wuid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_termDr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_wdate" ColumnName="wdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_termDr" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_termDr" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_termDr" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="termDr" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="GroupWare.dbo.Holyday" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Original_termDr" ColumnName="termDr" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Original_termDr" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Holyday" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -364,8 +381,72 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
               <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="termDr" DataSetColumn="termDr" />
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetbyIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyIdx" UserSourceName="FillByIdx">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode
+FROM     Holyday
+WHERE  gcode =@gcode and idx = @idx
+</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Holyday" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vHoliday_uselistTableAdapter" GeneratorDataComponentClassName="vHoliday_uselistTableAdapter" Name="vHoliday_uselist" UserDataComponentName="vHoliday_uselistTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vHoliday_uselist" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  idx, cate, gcode, pdate, term, termDr, contents, uid, wuid, wdate
+FROM     vHoliday_uselist
+WHERE  (uid = @user) AND (pdate BETWEEN @sd AND @ed) AND (gcode = @gcode)
+ORDER BY pdate DESC</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="user" ColumnName="uid" DataSourceName="EE.dbo.vHoliday_uselist" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.vHoliday_uselist" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.vHoliday_uselist" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vHoliday_uselist" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="idx" DataSetColumn="idx" />
+              <Mapping SourceColumn="cate" DataSetColumn="cate" />
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
+              <Mapping SourceColumn="pdate" DataSetColumn="pdate" />
+              <Mapping SourceColumn="term" DataSetColumn="term" />
+              <Mapping SourceColumn="termDr" DataSetColumn="termDr" />
+              <Mapping SourceColumn="contents" DataSetColumn="contents" />
+              <Mapping SourceColumn="uid" DataSetColumn="uid" />
+              <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
+              <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
+            </Mappings>
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vHoliday_uselist" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetbyIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyIdx" UserSourceName="FillByIdx">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  idx, cate, gcode, pdate, term, termDr, contents, uid, wuid, wdate
+FROM     vHoliday_uselist
+WHERE  gcode = @gcode and idx =@idx
+</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vHoliday_uselist" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.vHoliday_uselist" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
         </Tables>
         <Sources />
@@ -435,7 +516,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_RowClassName="BoardRow" msprop:Generator_UserTableName="Board" msprop:Generator_RowEvArgName="BoardRowChangeEvent">
+        <xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_UserTableName="Board" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_RowEvArgName="BoardRowChangeEvent" msprop:Generator_RowClassName="BoardRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -554,6 +635,59 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
               </xs:element>
               <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
               <xs:element name="termDr" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="termDr" msprop:Generator_ColumnVarNameInTable="columntermDr" msprop:Generator_ColumnPropNameInTable="termDrColumn" msprop:Generator_UserColumnName="termDr" type="xs:double" minOccurs="0" />
+              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="vHoliday_uselist" msprop:Generator_TableClassName="vHoliday_uselistDataTable" msprop:Generator_TableVarName="tablevHoliday_uselist" msprop:Generator_TablePropName="vHoliday_uselist" msprop:Generator_RowDeletingName="vHoliday_uselistRowDeleting" msprop:Generator_RowChangingName="vHoliday_uselistRowChanging" msprop:Generator_RowEvHandlerName="vHoliday_uselistRowChangeEventHandler" msprop:Generator_RowDeletedName="vHoliday_uselistRowDeleted" msprop:Generator_UserTableName="vHoliday_uselist" msprop:Generator_RowChangedName="vHoliday_uselistRowChanged" msprop:Generator_RowEvArgName="vHoliday_uselistRowChangeEvent" msprop:Generator_RowClassName="vHoliday_uselistRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="1" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="term" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="term" msprop:Generator_ColumnVarNameInTable="columnterm" msprop:Generator_ColumnPropNameInTable="termColumn" msprop:Generator_UserColumnName="term" type="xs:double" minOccurs="0" />
+              <xs:element name="termDr" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="termDr" msprop:Generator_ColumnVarNameInTable="columntermDr" msprop:Generator_ColumnPropNameInTable="termDrColumn" msprop:Generator_UserColumnName="termDr" type="xs:double" />
+              <xs:element name="contents" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_ColumnVarNameInTable="columncontents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_UserColumnName="contents" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -571,5 +705,10 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
       <xs:selector xpath=".//mstns:Holyday" />
       <xs:field xpath="mstns:idx" />
     </xs:unique>
+    <xs:unique name="vHoliday_uselist_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:vHoliday_uselist" />
+      <xs:field xpath="mstns:idx" />
+      <xs:field xpath="mstns:cate" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

SubProject/FBS0000/dsMSSQL.xss

@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
+
-<!--<autogenerated>
-     This code was generated by a tool to store the dataset designer's layout information.
-     Changes to this file may cause incorrect behavior and will be lost if
-     the code is regenerated.
-</autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="297" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
-  <Shapes>
-    <Shape ID="DesignTable:minutes" ZOrder="3" X="314" Y="92" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Board" ZOrder="2" X="571" Y="62" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:Holyday" ZOrder="1" X="821" Y="82" Height="457" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="389" />
-  </Shapes>
-  <Connectors />
-</DiagramLayout>

SubProject/FCM0000/DSInventory.xsd

@@ -323,7 +323,7 @@ WHERE  (idx = @Original_idx)</CommandText>
   <xs:element name="DSInventory" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSInventory" msprop:Generator_UserDSName="DSInventory">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_RowEvArgName="InventoryRowChangeEvent" msprop:Generator_RowClassName="InventoryRow">
+        <xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_RowClassName="InventoryRow" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowEvArgName="InventoryRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -414,7 +414,7 @@ WHERE  (idx = @Original_idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vInventory" msprop:Generator_TableClassName="vInventoryDataTable" msprop:Generator_TableVarName="tablevInventory" msprop:Generator_TablePropName="vInventory" msprop:Generator_RowDeletingName="vInventoryRowDeleting" msprop:Generator_RowChangingName="vInventoryRowChanging" msprop:Generator_RowEvHandlerName="vInventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="vInventoryRowDeleted" msprop:Generator_UserTableName="vInventory" msprop:Generator_RowChangedName="vInventoryRowChanged" msprop:Generator_RowEvArgName="vInventoryRowChangeEvent" msprop:Generator_RowClassName="vInventoryRow">
+        <xs:element name="vInventory" msprop:Generator_TableClassName="vInventoryDataTable" msprop:Generator_TableVarName="tablevInventory" msprop:Generator_RowChangedName="vInventoryRowChanged" msprop:Generator_TablePropName="vInventory" msprop:Generator_RowDeletingName="vInventoryRowDeleting" msprop:Generator_RowChangingName="vInventoryRowChanging" msprop:Generator_RowEvHandlerName="vInventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="vInventoryRowDeleted" msprop:Generator_RowClassName="vInventoryRow" msprop:Generator_UserTableName="vInventory" msprop:Generator_RowEvArgName="vInventoryRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -453,7 +453,7 @@ WHERE  (idx = @Original_idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="item" msprop:Generator_ColumnVarNameInTable="columnitem" msprop:Generator_ColumnPropNameInRow="item" msprop:Generator_ColumnPropNameInTable="itemColumn" msprop:Generator_UserColumnName="item" type="xs:int" minOccurs="0" />
+              <xs:element name="item" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="item" msprop:Generator_ColumnVarNameInTable="columnitem" msprop:Generator_ColumnPropNameInTable="itemColumn" msprop:Generator_UserColumnName="item" type="xs:int" minOccurs="0" />
               <xs:element name="serial" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="serial" msprop:Generator_ColumnVarNameInTable="columnserial" msprop:Generator_ColumnPropNameInTable="serialColumn" msprop:Generator_UserColumnName="serial" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">

SubProject/FCM0000/DSInventory.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="50" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="50" ViewPortY="142" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Inventory" ZOrder="2" X="105" Y="50" Height="611" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="427" />
     <Shape ID="DesignTable:vInventory" ZOrder="1" X="337" Y="55" Height="320" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="230" />

SubProject/FCM0000/DSReport.xsd

@@ -69,11 +69,11 @@ GROUP BY Items.idx, Items.name, Items.sid, Items.model, Items.supply</CommandTex
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply
+                    <CommandText>SELECT  Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item
 FROM     Inventory LEFT OUTER JOIN
                Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx
 WHERE  (Inventory.gcode = @gcode) AND (Inventory.pdate &lt;= @baseDate) AND (ISNULL(Inventory.place, N'') LIKE @place)
-GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place</CommandText>
+GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="baseDate" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@baseDate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -92,20 +92,21 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place</Comm
               <Mapping SourceColumn="Qty" DataSetColumn="Qty" />
               <Mapping SourceColumn="Amt" DataSetColumn="Amt" />
               <Mapping SourceColumn="supply" DataSetColumn="supply" />
+              <Mapping SourceColumn="item" DataSetColumn="item" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="FillByItemIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyItemIdx" GeneratorSourceName="FillByItemIdx" GetMethodModifier="Public" GetMethodName="GetbyItemIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyItemIdx" UserSourceName="FillByItemIdx">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT  Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply
+                    <CommandText>SELECT  Inventory.place, MAX(Inventory.pdate) AS lastDate, Items.name, Items.sid, Items.model, SUM(Inventory.dr_qty) AS Qty, SUM(Inventory.dr_amt) AS Amt, Items.supply, Inventory.item
 FROM     Inventory LEFT OUTER JOIN
                Items ON Inventory.gcode = Items.gcode AND Inventory.item = Items.idx
 WHERE  (Inventory.gcode = @gcode) AND (Inventory.pdate &lt;= @baseDate) AND (Items.idx = @item)
-GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place</CommandText>
+GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place, Inventory.item</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="baseDate" ColumnName="pdate" DataSourceName="GroupWare.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@baseDate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="baseDate" ColumnName="pdate" DataSourceName="EE.dbo.Inventory" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@baseDate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="item" ColumnName="idx" DataSourceName="GroupWare.dbo.Items" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="item" ColumnName="idx" DataSourceName="EE.dbo.Items" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@item" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -120,76 +121,76 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place</Comm
   <xs:element name="DSReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSReport" msprop:Generator_UserDSName="DSReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="PersonInvStock" msprop:Generator_TableClassName="PersonInvStockDataTable" msprop:Generator_TableVarName="tablePersonInvStock" msprop:Generator_TablePropName="PersonInvStock" msprop:Generator_RowDeletingName="PersonInvStockRowDeleting" msprop:Generator_RowChangingName="PersonInvStockRowChanging" msprop:Generator_RowEvHandlerName="PersonInvStockRowChangeEventHandler" msprop:Generator_RowDeletedName="PersonInvStockRowDeleted" msprop:Generator_UserTableName="PersonInvStock" msprop:Generator_RowChangedName="PersonInvStockRowChanged" msprop:Generator_RowEvArgName="PersonInvStockRowChangeEvent" msprop:Generator_RowClassName="PersonInvStockRow">
+        <xs:element name="PersonInvStock" msprop:Generator_TableClassName="PersonInvStockDataTable" msprop:Generator_TableVarName="tablePersonInvStock" msprop:Generator_RowChangedName="PersonInvStockRowChanged" msprop:Generator_TablePropName="PersonInvStock" msprop:Generator_RowDeletingName="PersonInvStockRowDeleting" msprop:Generator_RowChangingName="PersonInvStockRowChanging" msprop:Generator_RowEvHandlerName="PersonInvStockRowChangeEventHandler" msprop:Generator_RowDeletedName="PersonInvStockRowDeleted" msprop:Generator_RowClassName="PersonInvStockRow" msprop:Generator_UserTableName="PersonInvStock" msprop:Generator_RowEvArgName="PersonInvStockRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_UserColumnName="username" minOccurs="0">
+              <xs:element name="username" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_UserColumnName="username" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="project" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_UserColumnName="project" minOccurs="0">
+              <xs:element name="project" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_UserColumnName="project" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pdate" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+              <xs:element name="pdate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ItemName" msprop:Generator_ColumnVarNameInTable="columnItemName" msprop:Generator_ColumnPropNameInRow="ItemName" msprop:Generator_ColumnPropNameInTable="ItemNameColumn" msprop:Generator_UserColumnName="ItemName" minOccurs="0">
+              <xs:element name="ItemName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemName" msprop:Generator_ColumnVarNameInTable="columnItemName" msprop:Generator_ColumnPropNameInTable="ItemNameColumn" msprop:Generator_UserColumnName="ItemName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="stock" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnstock" msprop:Generator_ColumnPropNameInRow="stock" msprop:Generator_ColumnPropNameInTable="stockColumn" msprop:Generator_UserColumnName="stock" type="xs:int" minOccurs="0" />
+              <xs:element name="stock" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="stock" msprop:Generator_ColumnVarNameInTable="columnstock" msprop:Generator_ColumnPropNameInTable="stockColumn" msprop:Generator_UserColumnName="stock" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="jagosummary" msprop:Generator_TableClassName="jagosummaryDataTable" msprop:Generator_TableVarName="tablejagosummary" msprop:Generator_RowChangedName="jagosummaryRowChanged" msprop:Generator_TablePropName="jagosummary" msprop:Generator_RowDeletingName="jagosummaryRowDeleting" msprop:Generator_RowChangingName="jagosummaryRowChanging" msprop:Generator_RowEvHandlerName="jagosummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryRowDeleted" msprop:Generator_RowClassName="jagosummaryRow" msprop:Generator_UserTableName="jagosummary" msprop:Generator_RowEvArgName="jagosummaryRowChangeEvent">
+        <xs:element name="jagosummary" msprop:Generator_TableClassName="jagosummaryDataTable" msprop:Generator_TableVarName="tablejagosummary" msprop:Generator_TablePropName="jagosummary" msprop:Generator_RowDeletingName="jagosummaryRowDeleting" msprop:Generator_RowChangingName="jagosummaryRowChanging" msprop:Generator_RowEvHandlerName="jagosummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryRowDeleted" msprop:Generator_UserTableName="jagosummary" msprop:Generator_RowChangedName="jagosummaryRowChanged" msprop:Generator_RowEvArgName="jagosummaryRowChangeEvent" msprop:Generator_RowClassName="jagosummaryRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" minOccurs="0" />
-              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnlastDate" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:Generator_UserColumnName="lastDate" minOccurs="0">
+              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_ColumnVarNameInTable="columnlastDate" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:Generator_UserColumnName="lastDate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="sid" msprop:Generator_ColumnVarNameInTable="columnsid" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:Generator_UserColumnName="sid" minOccurs="0">
+              <xs:element name="sid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_ColumnVarNameInTable="columnsid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:Generator_UserColumnName="sid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
+              <xs:element name="model" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Qty" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnQty" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:Generator_UserColumnName="Qty" type="xs:int" minOccurs="0" />
+              <xs:element name="Qty" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:Generator_UserColumnName="Qty" type="xs:int" minOccurs="0" />
-              <xs:element name="Amt" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnAmt" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:Generator_UserColumnName="Amt" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Amt" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_ColumnVarNameInTable="columnAmt" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:Generator_UserColumnName="Amt" type="xs:decimal" minOccurs="0" />
-              <xs:element name="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:Generator_UserColumnName="supply" minOccurs="0">
+              <xs:element name="supply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:Generator_UserColumnName="supply" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -199,53 +200,54 @@ GROUP BY Items.name, Items.sid, Items.model, Items.supply, Inventory.place</Comm
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="jagosummaryPlace" msprop:Generator_TableClassName="jagosummaryPlaceDataTable" msprop:Generator_TableVarName="tablejagosummaryPlace" msprop:Generator_RowChangedName="jagosummaryPlaceRowChanged" msprop:Generator_TablePropName="jagosummaryPlace" msprop:Generator_RowDeletingName="jagosummaryPlaceRowDeleting" msprop:Generator_RowChangingName="jagosummaryPlaceRowChanging" msprop:Generator_RowEvHandlerName="jagosummaryPlaceRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryPlaceRowDeleted" msprop:Generator_RowClassName="jagosummaryPlaceRow" msprop:Generator_UserTableName="jagosummaryPlace" msprop:Generator_RowEvArgName="jagosummaryPlaceRowChangeEvent">
+        <xs:element name="jagosummaryPlace" msprop:Generator_TableClassName="jagosummaryPlaceDataTable" msprop:Generator_TableVarName="tablejagosummaryPlace" msprop:Generator_TablePropName="jagosummaryPlace" msprop:Generator_RowDeletingName="jagosummaryPlaceRowDeleting" msprop:Generator_RowChangingName="jagosummaryPlaceRowChanging" msprop:Generator_RowEvHandlerName="jagosummaryPlaceRowChangeEventHandler" msprop:Generator_RowDeletedName="jagosummaryPlaceRowDeleted" msprop:Generator_UserTableName="jagosummaryPlace" msprop:Generator_RowChangedName="jagosummaryPlaceRowChanged" msprop:Generator_RowEvArgName="jagosummaryPlaceRowChangeEvent" msprop:Generator_RowClassName="jagosummaryPlaceRow">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="place" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_ColumnPropNameInRow="place" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_UserColumnName="place" minOccurs="0">
+              <xs:element name="place" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="place" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_UserColumnName="place" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnlastDate" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:Generator_UserColumnName="lastDate" minOccurs="0">
+              <xs:element name="lastDate" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lastDate" msprop:Generator_ColumnVarNameInTable="columnlastDate" msprop:Generator_ColumnPropNameInTable="lastDateColumn" msprop:Generator_UserColumnName="lastDate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="sid" msprop:Generator_ColumnVarNameInTable="columnsid" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:Generator_UserColumnName="sid" minOccurs="0">
+              <xs:element name="sid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sid" msprop:Generator_ColumnVarNameInTable="columnsid" msprop:Generator_ColumnPropNameInTable="sidColumn" msprop:Generator_UserColumnName="sid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
+              <xs:element name="model" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Qty" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnQty" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:Generator_UserColumnName="Qty" type="xs:int" minOccurs="0" />
+              <xs:element name="Qty" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:Generator_UserColumnName="Qty" type="xs:int" minOccurs="0" />
-              <xs:element name="Amt" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnAmt" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:Generator_UserColumnName="Amt" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Amt" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Amt" msprop:Generator_ColumnVarNameInTable="columnAmt" msprop:Generator_ColumnPropNameInTable="AmtColumn" msprop:Generator_UserColumnName="Amt" type="xs:decimal" minOccurs="0" />
-              <xs:element name="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:Generator_UserColumnName="supply" minOccurs="0">
+              <xs:element name="supply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="supply" msprop:Generator_ColumnVarNameInTable="columnsupply" msprop:Generator_ColumnPropNameInTable="supplyColumn" msprop:Generator_UserColumnName="supply" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="item" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="item" msprop:Generator_ColumnVarNameInTable="columnitem" msprop:Generator_ColumnPropNameInTable="itemColumn" msprop:Generator_UserColumnName="item" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FCM0000/DSReport.xss

@@ -4,10 +4,10 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="77" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="1" ViewPortY="77" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:PersonInvStock" ZOrder="3" X="67" Y="127" Height="229" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:jagosummary" ZOrder="2" X="256" Y="131" Height="229" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:jagosummary" ZOrder="2" X="256" Y="131" Height="362" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:jagosummaryPlace" ZOrder="1" X="509" Y="141" Height="305" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
   </Shapes>
   <Connectors />

SubProject/FCM0000/FCM0000.csproj

@@ -114,6 +114,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>DSMail.xsd</DependentUpon>
     </Compile>
+    <Compile Include="DSReport.cs">
+      <DependentUpon>DSReport.xsd</DependentUpon>
+    </Compile>
     <Compile Include="Mail\fAutoSendSetting.cs">
       <SubType>Form</SubType>
     </Compile>

SubProject/FCM0000/Inventory/fInventory.Designer.cs

@@ -30,19 +30,19 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fInventory));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -68,6 +68,8 @@
             this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.dtED = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbPlace = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
             this.cmbInvType = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
@@ -91,8 +93,9 @@
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dSInventory = new FCM0000.DSInventory();
             this.ta = new FCM0000.DSInventoryTableAdapters.vInventoryTableAdapter();
-            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
-            this.cmbPlace = new System.Windows.Forms.ToolStripComboBox();
+            this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -340,6 +343,23 @@
             this.dtED.Text = "1982-11-23";
             this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // toolStripLabel7
+            // 
+            this.toolStripLabel7.Name = "toolStripLabel7";
+            this.toolStripLabel7.Size = new System.Drawing.Size(43, 34);
+            this.toolStripLabel7.Text = "저장소";
+            // 
+            // cmbPlace
+            // 
+            this.cmbPlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbPlace.Items.AddRange(new object[] {
+            "전체",
+            "입고",
+            "출고",
+            "정정"});
+            this.cmbPlace.Name = "cmbPlace";
+            this.cmbPlace.Size = new System.Drawing.Size(75, 37);
+            // 
             // toolStripLabel6
             // 
             this.toolStripLabel6.Name = "toolStripLabel6";
@@ -409,6 +429,9 @@
             // 
             this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.cm.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.입고등록ToolStripMenuItem,
+            this.출고등록ToolStripMenuItem,
+            this.toolStripMenuItem3,
             this.columnSizeToolStripMenuItem,
             this.exportListToolStripMenuItem,
             this.인쇄ToolStripMenuItem,
@@ -418,7 +441,7 @@
             this.toolStripMenuItem1,
             this.보관소별재고확인ToolStripMenuItem});
             this.cm.Name = "contextMenuStrip1";
-            this.cm.Size = new System.Drawing.Size(299, 232);
+            this.cm.Size = new System.Drawing.Size(299, 332);
             // 
             // columnSizeToolStripMenuItem
             // 
@@ -513,89 +536,89 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "보관소";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType21;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
             this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 62F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType22;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "invtype";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "구분";
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType23;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Label = "SID";
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 92F;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType24;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "itemName";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "품명";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType25;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "itemModel";
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명";
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType26;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "SID";
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType27;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "serial";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "S/N";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 83F;
-            numberCellType4.DecimalPlaces = 0;
+            numberCellType7.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
+            numberCellType7.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
+            numberCellType7.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "dr_qty";
             this.fpSpread1_Sheet1.Columns.Get(7).ForeColor = System.Drawing.Color.Blue;
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "수량";
             this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(7).Width = 77F;
-            numberCellType5.DecimalPlaces = 0;
+            numberCellType8.DecimalPlaces = 0;
-            numberCellType5.MaximumValue = 999999999999999D;
+            numberCellType8.MaximumValue = 999999999999999D;
-            numberCellType5.MinimumValue = -999999999999999D;
+            numberCellType8.MinimumValue = -999999999999999D;
-            numberCellType5.NegativeRed = true;
+            numberCellType8.NegativeRed = true;
-            numberCellType5.NullDisplay = "--";
+            numberCellType8.NullDisplay = "--";
-            numberCellType5.Separator = ",";
+            numberCellType8.Separator = ",";
-            numberCellType5.ShowSeparator = true;
+            numberCellType8.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "dr_amt";
             this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.Blue;
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "금액";
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Width = 75F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType28;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userName";
             this.fpSpread1_Sheet1.Columns.Get(9).Label = "사용자";
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType29;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "place";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "보관소";
             this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo";
             this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고";
             this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 151F;
-            numberCellType6.DecimalPlaces = 0;
+            numberCellType9.DecimalPlaces = 0;
-            numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType6.MaximumValue = 2147483647D;
+            numberCellType9.MaximumValue = 2147483647D;
-            numberCellType6.MinimumValue = -2147483648D;
+            numberCellType9.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType9;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(12).Visible = false;
             this.fpSpread1_Sheet1.DataAutoCellTypes = false;
@@ -620,22 +643,24 @@
             // 
             this.ta.ClearBeforeFill = true;
             // 
-            // toolStripLabel7
+            // toolStripMenuItem3
             // 
-            this.toolStripLabel7.Name = "toolStripLabel7";
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripLabel7.Size = new System.Drawing.Size(43, 34);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(295, 6);
-            this.toolStripLabel7.Text = "저장소";
             // 
-            // cmbPlace
+            // 입고등록ToolStripMenuItem
             // 
-            this.cmbPlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.입고등록ToolStripMenuItem.Name = "입고등록ToolStripMenuItem";
-            this.cmbPlace.Items.AddRange(new object[] {
+            this.입고등록ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
-            "전체",
+            this.입고등록ToolStripMenuItem.Text = "입고 등록";
-            "입고",
+            this.입고등록ToolStripMenuItem.Click += new System.EventHandler(this.입고등록ToolStripMenuItem_Click);
-            "출고",
+            // 
-            "정정"});
+            // 출고등록ToolStripMenuItem
-            this.cmbPlace.Name = "cmbPlace";
+            // 
-            this.cmbPlace.Size = new System.Drawing.Size(75, 37);
+            this.출고등록ToolStripMenuItem.Name = "출고등록ToolStripMenuItem";
+            this.출고등록ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
+            this.출고등록ToolStripMenuItem.Text = "출고 등록";
+            this.출고등록ToolStripMenuItem.Click += new System.EventHandler(this.출고등록ToolStripMenuItem_Click);
             // 
             // fInventory
             // 
@@ -715,5 +740,8 @@
         private System.Windows.Forms.ToolStripMenuItem 인쇄ToolStripMenuItem;
         private System.Windows.Forms.ToolStripLabel toolStripLabel7;
         private System.Windows.Forms.ToolStripComboBox cmbPlace;
+        private System.Windows.Forms.ToolStripMenuItem 입고등록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 출고등록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
     }
 }

SubProject/FCM0000/Inventory/fInventory.cs

@@ -182,7 +182,7 @@ namespace FCM0000
                         tbFind.SelectAll();
                         tbFind.Focus();
                     }
-                    catch (Exception eX)
+                    catch 
                     {
                         tbFind.BackColor = Color.Red;
                     }
@@ -417,5 +417,75 @@ namespace FCM0000
         {
             FPUtil.printsheet(this.fpSpread1, "재고등록현황");
         }
+
+        private void 입고등록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            //입고
+            var drv = this.bs.Current as DataRowView;
+            if (drv == null) return;
+            var dr = drv.Row as DSInventory.vInventoryRow;
+            if(dr.item == -1)
+            {
+                FCOMMON.Util.MsgE("입력된 품목이 없습니다");
+                return;
+            }
+
+            var newdr = this.dSInventory.vInventory.NewvInventoryRow();
+            newdr.pdate = DateTime.Now.ToShortDateString();
+            newdr.invtype = "입고";
+            newdr.item = dr.item;
+            //newdr.ItemArray = dr.ItemArray;
+            newdr.itemModel = dr.itemModel;
+            newdr.itemName = dr.itemName;
+            newdr.place = dr.place;
+            newdr.sid = dr.sid;
+            
+
+            var f = new finventoryAdd(newdr);
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                this.dSInventory.vInventory.AddvInventoryRow(newdr);
+                int cnt = this.ta.Update(newdr);
+                newdr.AcceptChanges();
+                if (cnt != 1)
+                    FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요");
+            }
+            else newdr.Delete();
+
+        }
+
+        private void 출고등록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            //출고
+            var drv = this.bs.Current as DataRowView;
+            if (drv == null) return;
+            var dr = drv.Row as DSInventory.vInventoryRow;
+            if (dr.item == -1)
+            {
+                FCOMMON.Util.MsgE("입력된 품목이 없습니다");
+                return;
+            }
+
+            var newdr = this.dSInventory.vInventory.NewvInventoryRow();
+            newdr.pdate = DateTime.Now.ToShortDateString();
+            newdr.invtype = "출고";
+            newdr.item = dr.item;
+            //newdr.ItemArray = dr.ItemArray;
+            newdr.sid = dr.sid;
+            newdr.itemModel = dr.itemModel;
+            newdr.itemName = dr.itemName;
+            newdr.place = dr.place;
+
+            var f = new finventoryAdd(newdr);
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                this.dSInventory.vInventory.AddvInventoryRow(newdr);
+                int cnt = this.ta.Update(newdr);
+                newdr.AcceptChanges();
+                if (cnt != 1)
+                    FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요");
+            }
+            else newdr.Delete();
+        }
     }
 }

SubProject/FCM0000/Inventory/fInventoryJagoList.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fInventoryJagoList));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
@@ -39,6 +39,7 @@
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
@@ -57,31 +58,33 @@
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
             this.dtSD = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbPlace = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
             this.cm = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.입고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.출고등록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
             this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.인쇄ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dSReport = new FCM0000.DSReport();
             this.ta = new FCM0000.DSReportTableAdapters.jagosummaryPlaceTableAdapter();
-            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
-            this.cmbPlace = new System.Windows.Forms.ToolStripComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
             this.cm.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dSReport)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -248,6 +251,18 @@
             this.dtSD.Text = "1982-11-23";
             this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // toolStripLabel2
+            // 
+            this.toolStripLabel2.Name = "toolStripLabel2";
+            this.toolStripLabel2.Size = new System.Drawing.Size(43, 34);
+            this.toolStripLabel2.Text = "보관소";
+            // 
+            // cmbPlace
+            // 
+            this.cmbPlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbPlace.Name = "cmbPlace";
+            this.cmbPlace.Size = new System.Drawing.Size(120, 37);
+            // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -283,7 +298,7 @@
             this.fpSpread1_Sheet1});
             this.fpSpread1.Size = new System.Drawing.Size(979, 517);
             this.fpSpread1.TabIndex = 3;
-            this.fpSpread1.TitleInfo.CellType = textCellType6;
+            this.fpSpread1.TitleInfo.CellType = textCellType7;
             this.fpSpread1.TitleInfo.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.fpSpread1.TitleInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.fpSpread1.TitleInfo.Text = "재고 현황";
@@ -294,12 +309,33 @@
             // 
             this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.cm.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.입고등록ToolStripMenuItem,
+            this.출고등록ToolStripMenuItem,
+            this.toolStripMenuItem2,
             this.columnSizeToolStripMenuItem,
             this.exportListToolStripMenuItem,
-            this.인쇄ToolStripMenuItem,
+            this.인쇄ToolStripMenuItem});
-            this.toolStripMenuItem2});
             this.cm.Name = "contextMenuStrip1";
-            this.cm.Size = new System.Drawing.Size(243, 118);
+            this.cm.Size = new System.Drawing.Size(243, 190);
+            // 
+            // 입고등록ToolStripMenuItem
+            // 
+            this.입고등록ToolStripMenuItem.Name = "입고등록ToolStripMenuItem";
+            this.입고등록ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
+            this.입고등록ToolStripMenuItem.Text = "입고 등록";
+            this.입고등록ToolStripMenuItem.Click += new System.EventHandler(this.입고등록ToolStripMenuItem_Click);
+            // 
+            // 출고등록ToolStripMenuItem
+            // 
+            this.출고등록ToolStripMenuItem.Name = "출고등록ToolStripMenuItem";
+            this.출고등록ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
+            this.출고등록ToolStripMenuItem.Text = "출고 등록";
+            this.출고등록ToolStripMenuItem.Click += new System.EventHandler(this.출고등록ToolStripMenuItem_Click);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(239, 6);
             // 
             // columnSizeToolStripMenuItem
             // 
@@ -340,10 +376,19 @@
             this.인쇄ToolStripMenuItem.Text = "인쇄";
             this.인쇄ToolStripMenuItem.Click += new System.EventHandler(this.인쇄ToolStripMenuItem_Click);
             // 
-            // toolStripMenuItem2
+            // bs
             // 
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.bs.DataMember = "jagosummaryPlace";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(239, 6);
+            this.bs.DataSource = this.dSReport;
+            // 
+            // dSReport
+            // 
+            this.dSReport.DataSetName = "DSReport";
+            this.dSReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
             // 
             // fpSpread1_Sheet1
             // 
@@ -351,7 +396,7 @@
             this.fpSpread1_Sheet1.SheetName = "Sheet1";
             // Formulas and custom names must be loaded with R1C1 reference style
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 8;
+            this.fpSpread1_Sheet1.ColumnCount = 9;
             this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
             this.fpSpread1_Sheet1.ActiveRowIndex = -1;
             this.fpSpread1_Sheet1.AutoGenerateColumns = false;
@@ -422,6 +467,8 @@
             this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(7).Visible = false;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "item";
             this.fpSpread1_Sheet1.DataAutoCellTypes = false;
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
             this.fpSpread1_Sheet1.DataSource = this.bs;
@@ -453,32 +500,6 @@
             this.fpSpread1_Sheet1.TitleInfo.Value = "재고현황";
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
-            // bs
-            // 
-            this.bs.DataMember = "jagosummaryPlace";
-            this.bs.DataSource = this.dSReport;
-            // 
-            // dSReport
-            // 
-            this.dSReport.DataSetName = "DSReport";
-            this.dSReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
-            // ta
-            // 
-            this.ta.ClearBeforeFill = true;
-            // 
-            // toolStripLabel2
-            // 
-            this.toolStripLabel2.Name = "toolStripLabel2";
-            this.toolStripLabel2.Size = new System.Drawing.Size(43, 34);
-            this.toolStripLabel2.Text = "보관소";
-            // 
-            // cmbPlace
-            // 
-            this.cmbPlace.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbPlace.Name = "cmbPlace";
-            this.cmbPlace.Size = new System.Drawing.Size(120, 37);
-            // 
             // fInventoryJagoList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -497,9 +518,9 @@
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
             this.cm.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dSReport)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -537,9 +558,11 @@
         private System.Windows.Forms.ToolStripButton toolStripButton2;
         private DSReport dSReport;
         private DSReportTableAdapters.jagosummaryPlaceTableAdapter ta;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStripMenuItem 인쇄ToolStripMenuItem;
         private System.Windows.Forms.ToolStripLabel toolStripLabel2;
         private System.Windows.Forms.ToolStripComboBox cmbPlace;
+        private System.Windows.Forms.ToolStripMenuItem 입고등록ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 출고등록ToolStripMenuItem;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FCM0000/Inventory/fInventoryJagoList.cs

@@ -214,5 +214,93 @@ namespace FCM0000
         {
             FPUtil.printsheet(this.fpSpread1, "재고현황");
         }
+
+        private void 입고등록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            //입고
+            var drv = this.bs.Current as DataRowView;
+            if (drv == null) return;
+            var dr = drv.Row as DSReport.jagosummaryPlaceRow;
+          
+            var taInventory = new DSInventoryTableAdapters.vInventoryTableAdapter();
+            var vinventory = new DSInventory.vInventoryDataTable();
+            var newdr = vinventory.NewvInventoryRow();
+
+            newdr.item = dr.item;
+            newdr.invtype = "입고";
+            newdr.itemModel = dr.model;
+            newdr.itemName = dr.name;
+            newdr.place = dr.place;
+            newdr.sid = dr.sid;
+
+            newdr.gcode = FCOMMON.info.Login.gcode;
+            newdr.wuid = FCOMMON.info.Login.no;
+            newdr.uid = FCOMMON.info.Login.no;
+            newdr.wdate = DateTime.Now;
+            newdr.pdate = DateTime.Now.ToShortDateString();
+            newdr.cr_qty = 0;
+            newdr.cr_amt = 0;
+            newdr.dr_qty = 0;
+            newdr.dr_amt = 0;
+            //newdr.item = -1;
+
+
+            var f = new finventoryAdd(newdr);
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                vinventory.AddvInventoryRow(newdr);
+                int cnt = taInventory.Update(newdr);
+                newdr.AcceptChanges();
+                if (cnt != 1)
+                    FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요");
+            }
+            else newdr.Delete();
+
+            this.RefreshData();
+        }
+
+        private void 출고등록ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            //입고
+            var drv = this.bs.Current as DataRowView;
+            if (drv == null) return;
+            var dr = drv.Row as DSReport.jagosummaryPlaceRow;
+
+            var taInventory = new DSInventoryTableAdapters.vInventoryTableAdapter();
+            var vinventory = new DSInventory.vInventoryDataTable();
+            var newdr = vinventory.NewvInventoryRow();
+
+            newdr.item = dr.item;
+            newdr.invtype = "출고";
+            newdr.itemModel = dr.model;
+            newdr.itemName = dr.name;
+            newdr.place = dr.place;
+            newdr.sid = dr.sid;
+
+            newdr.gcode = FCOMMON.info.Login.gcode;
+            newdr.wuid = FCOMMON.info.Login.no;
+            newdr.uid = FCOMMON.info.Login.no;
+            newdr.wdate = DateTime.Now;
+            newdr.pdate = DateTime.Now.ToShortDateString();
+            newdr.cr_qty = 0;
+            newdr.cr_amt = 0;
+            newdr.dr_qty = 0;
+            newdr.dr_amt = 0;
+           // newdr.item = -1;
+
+
+            var f = new finventoryAdd(newdr);
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                vinventory.AddvInventoryRow(newdr);
+                int cnt = taInventory.Update(newdr);
+                newdr.AcceptChanges();
+                if (cnt != 1)
+                    FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요");
+            }
+            else newdr.Delete();
+
+            this.RefreshData();
+        }
     }
 }

SubProject/FCM0000/Inventory/fInventoryUser.cs

@@ -156,7 +156,7 @@ namespace FCM0000
                         tbFind.SelectAll();
                         tbFind.Focus();
                     }
-                    catch (Exception eX)
+                    catch 
                     {
                         tbFind.BackColor = Color.Red;
                     }

SubProject/FCM0000/Inventory/finventoryAdd.cs

@@ -71,9 +71,11 @@ namespace FCM0000
 
 
             ///입력된 데이터를 적용한다.
+            if (dr.pdate == "") dr.pdate = DateTime.Now.ToShortDateString();
             dtPdate.Value = DateTime.Parse(dr.pdate);            
             dtPdate.Value = DateTime.Parse(dr.pdate);
             // cmbRequest.Text = dr.userName;
+            tbPumIDX.Text = dr.item.ToString();
             tbSID.Text = dr.sid;
             tbSID.Tag = tbSID.Text;
             tbPumIDX.Text = dr.item.ToString();
@@ -233,6 +235,13 @@ namespace FCM0000
                 FCOMMON.DBM.UpdateItemSID(int.Parse(tbPumIDX.Text), tbSID.Text);
             }
 
+            if(cmbPlace.Text.Trim() == "")
+            {
+                FCOMMON.Util.MsgE("보관소를 입력하세요");
+                cmbPlace.Focus();
+                return false;
+            }
+
             dr.itemName = tbPumName.Text;
             dr.itemModel = tbPumModel.Text;
             dr.item = int.Parse( tbPumIDX.Text   );

SubProject/FCM0000/Item/fItemAdd.Designer.cs

@@ -129,6 +129,16 @@
             priceLabel.TabIndex = 8;
             priceLabel.Text = "단가";
             // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new System.Drawing.Point(34, 101);
+            label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            label1.Name = "label1";
+            label1.Size = new System.Drawing.Size(55, 30);
+            label1.TabIndex = 4;
+            label1.Text = "단위";
+            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
@@ -154,7 +164,7 @@
             // 
             // tbModel
             // 
-            this.tbModel.BackColor = System.Drawing.SystemColors.Window;
+            this.tbModel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
             this.tbModel.Location = new System.Drawing.Point(97, 58);
             this.tbModel.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
             this.tbModel.Name = "tbModel";
@@ -217,16 +227,6 @@
             this.tbUnit.Text = "EA";
             this.tbUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(34, 101);
-            label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(55, 30);
-            label1.TabIndex = 4;
-            label1.Text = "단위";
-            // 
             // btOK
             // 
             this.btOK.Location = new System.Drawing.Point(97, 357);

SubProject/FCM0000/Item/fItemAdd.cs

@@ -46,6 +46,13 @@ namespace FCM0000.Item
             if(tbName.Text.Trim()=="")
             {
                  FCOMMON.Util.MsgE("품명은 필수 입니다");
+                tbName.Focus();
+                return;
+            }
+            if(tbModel.Text.Trim() == "")
+            {
+                FCOMMON.Util.MsgE("모델은 필수 입니다");
+                tbModel.Focus();
                 return;
             }
             var pumName = tbName.Text.Trim();

SubProject/FCM0000/Item/fItemAdd.resx

@@ -138,12 +138,12 @@
   <metadata name="priceLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>122, 17</value>
-  </metadata>
   <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
   <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

SubProject/FCM0000/Item/fItems.Designer.cs

@@ -81,6 +81,7 @@
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.panel1 = new System.Windows.Forms.Panel();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.memoTextBox = new System.Windows.Forms.TextBox();
@@ -114,7 +115,6 @@
             this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter();
             this.bsStaff = new System.Windows.Forms.BindingSource(this.components);
             this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -122,12 +122,12 @@
             this.cm1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.panIMage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.toolStrip2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -438,11 +438,13 @@
             // 
             this.cmbSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbSort.Items.AddRange(new object[] {
+            "--",
                 "idx",
             "sid",
             "sid,name",
             "name",
-            "cate"});
+            "cate"
+            });
             this.cmbSort.Name = "cmbSort";
             this.cmbSort.Size = new System.Drawing.Size(100, 37);
             this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.cmbSort_SelectedIndexChanged);
@@ -485,6 +487,120 @@
             this.fpSpread1.Size = new System.Drawing.Size(877, 551);
             this.fpSpread1.TabIndex = 3;
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnCount = 11;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "품명";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "매입가";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "제조사";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "규격";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단위";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "공급처";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F;
+            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType1.DecimalPlaces = 0;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType1.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
+            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
+            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F;
+            this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Label = "분류";
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name";
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명";
+            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid";
+            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#";
+            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model";
+            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명";
+            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F;
+            currencyCellType1.DecimalPlaces = 0;
+            currencyCellType1.MaximumValue = new decimal(new int[] {
+            10000000,
+            0,
+            0,
+            0});
+            currencyCellType1.MinimumValue = new decimal(new int[] {
+            10000000,
+            0,
+            0,
+            -2147483648});
+            currencyCellType1.NegativeRed = true;
+            currencyCellType1.NullDisplay = "--";
+            currencyCellType1.Separator = ",";
+            currencyCellType1.ShowSeparator = true;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price";
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "매입가";
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "manu";
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사";
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F;
+            numberCellType2.MaximumValue = 999999999999999D;
+            numberCellType2.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "scale";
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "규격";
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 84F;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "unit";
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위";
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "supply";
+            this.fpSpread1_Sheet1.Columns.Get(9).Tag = "supplyname";
+            this.fpSpread1_Sheet1.Columns.Get(9).Visible = false;
+            comboBoxCellType1.AllowEditorVerticalAlign = true;
+            comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right;
+            comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = comboBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supplyidx";
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "공급처";
+            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "supply";
+            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            // 
             // panel1
             // 
             this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -623,6 +739,7 @@
             this.lvSupplyDamdang.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.lvSupplyDamdang.FullRowSelect = true;
             this.lvSupplyDamdang.GridLines = true;
+            this.lvSupplyDamdang.HideSelection = false;
             this.lvSupplyDamdang.Location = new System.Drawing.Point(3, 301);
             this.lvSupplyDamdang.Name = "lvSupplyDamdang";
             this.lvSupplyDamdang.Size = new System.Drawing.Size(376, 80);
@@ -667,6 +784,7 @@
             this.lvInDate.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.lvInDate.FullRowSelect = true;
             this.lvInDate.GridLines = true;
+            this.lvInDate.HideSelection = false;
             this.lvInDate.Location = new System.Drawing.Point(3, 403);
             this.lvInDate.Name = "lvInDate";
             this.lvInDate.Size = new System.Drawing.Size(376, 80);
@@ -719,6 +837,7 @@
             this.lvOrder.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.lvOrder.FullRowSelect = true;
             this.lvOrder.GridLines = true;
+            this.lvOrder.HideSelection = false;
             this.lvOrder.Location = new System.Drawing.Point(3, 505);
             this.lvOrder.Name = "lvOrder";
             this.lvOrder.Size = new System.Drawing.Size(376, 80);
@@ -764,120 +883,6 @@
             // 
             this.taStaff.ClearBeforeFill = true;
             // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
-            // Formulas and custom names must be loaded with R1C1 reference style
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 11;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "분류";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "품명";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "매입가";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "제조사";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "규격";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단위";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "공급처";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F;
-            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F;
-            this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "분류";
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명";
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#";
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명";
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F;
-            currencyCellType1.DecimalPlaces = 0;
-            currencyCellType1.MaximumValue = new decimal(new int[] {
-            10000000,
-            0,
-            0,
-            0});
-            currencyCellType1.MinimumValue = new decimal(new int[] {
-            10000000,
-            0,
-            0,
-            -2147483648});
-            currencyCellType1.NegativeRed = true;
-            currencyCellType1.NullDisplay = "--";
-            currencyCellType1.Separator = ",";
-            currencyCellType1.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "매입가";
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "manu";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사";
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F;
-            numberCellType2.MaximumValue = 999999999999999D;
-            numberCellType2.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "scale";
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "규격";
-            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 84F;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "unit";
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위";
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "supply";
-            this.fpSpread1_Sheet1.Columns.Get(9).Tag = "supplyname";
-            this.fpSpread1_Sheet1.Columns.Get(9).Visible = false;
-            comboBoxCellType1.AllowEditorVerticalAlign = true;
-            comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
-            comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
-            comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right;
-            comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = comboBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supplyidx";
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "공급처";
-            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "supply";
-            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
-            // 
             // fItems
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -900,6 +905,7 @@
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.panIMage.ResumeLayout(false);
@@ -908,7 +914,6 @@
             this.toolStrip2.ResumeLayout(false);
             this.toolStrip2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

SubProject/FCM0000/Item/fItems.cs

@@ -54,7 +54,7 @@ namespace FCM0000
             cy.EditorValueChanged += cy_EditorValueChanged;
 
 
-            this.cmbSort.SelectedIndex = 2;
+            this.cmbSort.SelectedIndex = 0;
             refreshData();
         }
 
@@ -85,6 +85,7 @@ namespace FCM0000
             e.Row["wuid"] = FCOMMON.info.Login.no;
             e.Row["wdate"] = DateTime.Now;
             e.Row["gcode"] = FCOMMON.info.Login.gcode;
+            if(this.cmbCate.SelectedIndex > 0) e.Row["cate"] = this.cmbCate.Text.Trim();
         }
         private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
         {
@@ -97,7 +98,8 @@ namespace FCM0000
 
             try
             {
-                this.tam.UpdateAll(this.dsMSSQL);
+                var cnt = this.tam.UpdateAll(this.dsMSSQL);
+                FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 저장 되었습니다");
             }
             catch (Exception ex)
             {
@@ -158,7 +160,7 @@ namespace FCM0000
                     bs.Filter = filter;
                     tbFind.BackColor = Color.Lime;
                 }
-                catch (Exception ex)
+                catch 
                 {
                     tbFind.BackColor = Color.Pink;
                 }
@@ -218,7 +220,7 @@ namespace FCM0000
                     var img1 = FCOMMON.DBM.GetImageData("Items", "image", dr.idx);
                     if (img1 != null) this.pictureBox1.Image = img1;
                     else this.pictureBox1.Image = null;
-                } catch (Exception ex)
+                } catch 
                 {
                     this.pictureBox1.Image = null;
                 }
@@ -313,7 +315,8 @@ namespace FCM0000
 
         private void cmbSort_SelectedIndexChanged(object sender, EventArgs e)
         {
-            this.bs.Sort = cmbSort.Text;
+            if (cmbSort.Text == "--") this.bs.Sort = "";
+            else this.bs.Sort = cmbSort.Text;
         }
 
         private void toolStripButton3_Click(object sender, EventArgs e)

SubProject/FCM0000/Item/fItems.resx

@@ -223,19 +223,19 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgvCv4H
-        o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloZZud5dLJYZCdxce5NpCQMrFpLyYlKeSCFl7mmlizEB3YPsl
+        o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloZZud5dLJYZCdxceoAIthDuYlBcDPpVEyNrTTBNjBroD2y/5
-        XyY7e+b7MufMnN0yPfDC5D/52ui8/q6lpwZGeMav9Mf93t6jjE947hVkMTCeXI/OpLfHUlsqjPDsys0z
+        MtnZM9+XOWfm7JbogRcm/8nXRuf1d01dVTDCM36lP+53dx9lfMJzryCLgdHUWjSR3h5Z/q3CCM+u7DzT
-        nZFnCKEjeMnh0dQerPIOKJKS2tqZ/q2qe1FJZXbcvBT/0B6uwksPDsYnPgpP/lwnGe3FoLSwZmaFh1iC
+        HnmGEDqClxweDa3BCm+fIilLWzuJX6q6F5WlzR03L8U/tIYr8NKDg/GJj8Lji2sko70YlGZXzazwEEvQ
-        HgZ3+HZIWVwliRdjcGL5VxN7gJ1DTSG9JFGthLRT1xwOUrGaFqO8ktmBA4cltcHDSwMkMVp6eVnEksXx
+        w+AO3w4pcysk8UIMji38bGAPsHOoKaSXJKqVkHbqmsNBKlTTQpQXN3fgwGFJbfDwUh9JjJZeXhaxZGG8
-        0tBxOhhLbJCEaAlXTfM9r238cu3b7OY2SYiW4kw6W9vovoql9wdq7bo3lsoQhWgZW8moyNpdjaX3R53x
+        NLSdDsaS6yQhWsJV03zPq+u/XPv2Y2ObJERLIZHOVNe7r2Lp/YGaO+6NLG8RhWgZW9pSkbWzEkvvjxrj
-        c/nAzGaWJERLcSqdrTO1XcHS+wMh5ymoDUmIln3x5BpVL4feSxKipUeUeSypDXD/oPeSxLRSTmX+mDv4
+        51IxsZEhCdFSmEhnakwtV7D0/kDIeQpqQxKiZU88tUrVy6H3koRo6RFlHktqA9w/6L0kMa2Ulzf/mNv4
-        J1hSG6DjuMTDdS6PII1Td67cgmNGT/9wv7xIFC3G0MTyBnWvfmqxnGjuCHFcfFb1RyfV8MQSUXwvwteJ
+        J1hSG6DjuMTDdS6PII1Sd67sgmNGT+9grzxHFC3E0NjCOnWvfmqxnGhsC3FcfEr1R8fV8Ng8UXwvwteJ
-        6eYfYDltgBNt8H4VOWlWFZSEysXn1CZPKObi4hL0XpJRgVBTSK/BFarEctqAGM/53E5jEWkubwqj0R0a
+        6eQfYDltgBNt8H4VOWlKFZSkysWn1QZPKObi4hL0XpJRnlBTSK/BFSrHctqAGM/57E5jEWk6Zwqj0R3q
-        hAxAreDAuUVZgCsiTqez8AcCY1BKrkJPhoNEX1NT2wUry49G5Pm8KS/Nq80+boh0B2EOmgyyd1fDeOB/
+        hwxAreDAuUVZgCsiTKYz8AcCY1BKrUBPhoNEX1NTywUryw9H5JmcKS/NqI0+boB0B2EOmgyyd1bCeOB/
-        LmTtumjt4hWhYKrMq2Y2MopstjM4RH/UW7yXbX5+is8ZgimYmzvDk5ABHKI/Guy+G3b/4FzeML/ThGpj
+        LmTtuGjt4BUhb6rMqGY2MoxstjM4RH/UWryXbX5+ks8agimYm9vD45ABHKI/6uy+G3Z//3TOMLfTpGpj
-        +SnIAA7RH+8dPbccgWiiYAq0B8QfyNx+CYfoj3pH5x1H3/DSf6aJ3OerHIfoj1cfnedaA9HFf03bgtHk
+        +UnIAA7RH+8dXbccgWgybwq0B8QJZG69hEP0R62j/Y6jZ3D+P9Nk9vNVikP0x6uPznPNgejcv6YtwWjq
-        G6v/Jg4pDd4yrsrAiLxbMHXldo4+sRX4denw2Ok8zvi4770j0q6zb2ihoYW9i1+VHmCOTN4KZPGdxVMl
+        jdV/E4cUB28ZV3lgSNrNm7qyO0ef2DL8unh47HQeZ3zc9+6h+K6zZ2C2rom9i18VH2COTN4yZPGdxVNF
-        RlnZX9i+Wt0gvITgAAAAAElFTkSuQmCC
+        RknJX+KoWsB5oN9wAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -282,25 +282,25 @@
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQjSURBVEhLtVdbT1NZGD3RMfoTHI2JxrvvOibz4KvRiYhi
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQgSURBVEhLtVdbT1NZGD3RmehPcJyYaLz7PqOJD74anYgo
-        KgplSqvUKyqVKkgOVkXaA7SjRWS0gxVs8YIadKgUG0Da0lJHYCaZeqetipcoBby8aafrsDc9QlU6HFey
+        pqJQLK1SryhWKiA52BmR9gCtThFRURBsvaETVCrFBpC2tFQFNBHvPUXFS5QCo75p7TrsTY9QlcpxJTs9
-        05N8a3+r+/JdNpMo1q27MHHV3qvT1hY0/rSmoPHnpPwbM5axzT8Qs7iQsE3zZKVubmtFt2O3yR/Mqbrf
+        ybf2t7ov32UzsWLVqrPjl+36b/LK3Pr5K3LrF8blXJ2yiG38hZilhYxtmKUocnObSjsdO8q7AhnH7/ey
-        x9YGPx2s643kmvwfUjWOFYQqDiRs80z5bz7rvrMP3ugawhHO1j9qHL7yMrJB0/QLmTJ+SHUulcp8/yln
+        Vv7T3pqeUOaxux8SdY4lhCoNZGzjVOUBn3X3yYdvDXXBEGfrGzH+ufgqtEbX8BeZMnbIDS6NpvLBM84W
-        iy9Ix0hhqbbNkX2yOzBypBU7Q2sLbEmENho4w0ydu7LQ2vteKIAV51qDAzsq/3FvMXZaFYaOUwqD17TJ
+        XZCO4cJyfYsj/XAnP3wkFTi7V+ba4ghtJHCGqQZ3WZ6l571YACvOtAb6t5bdcW80t1tVprajKpO3fL3J
-        4KlPYW8uIdOZbRXdjcJ5GCpz4EU650onlPiAaFF970c6SdfQH1GbHz7LLPVWSoqa5hHaFzFaOByRlrTX
+        U5vAXvuTTGc2l3bWi+dhaCr4l8mcK5lQogOi+bXPP9JJhrq+kLby0fPUIm+ZLL9hFqF9FSOFgyF5YWst
-        E3N8YHuFK9X+2RfJOuZrTeNaZxHKNxFvxXnWwPuMYtdOQvkcuEhDZxoTles7Li/f0TCZUMYEKqy2BsLF
+        MUcHtle8Uv2V3lDaQV9zEtc8jVC+i2grzrL436cUuLYRypfARRo804io0th2YfHWugmEMipQYa2VDxZc
-        1/uGxVVn/KG4C1AYPLX0ImF7s47fbklUFIAwzjStuE2uNHa6qTB8Ksp81YQ2hI0ax3yEDCXhTBPZXiE2
+        7h0S11R0dUddgMrkOU0vErY37d8bTbGKAhDGmSYVtCjV5nY3FYZPVbGvitAGsVbnmI2QoSScaSzbK8ba
-        HnW2pHGu9fherWlZCF/Ur+rM4xepGvtcngjIODdH4xS/sjLvSWJKGElq20zyyUOh9/4RC8mo72giIiaG
+        /c6mJM61Gt/LdU1z4Yv61VQ8eZmos88UiICCc3M0TvGrKPYeJqaYEae1TSWfAlRG7/FISIZ9hxMRMTEM
-        QUai/yrf0jO4RvivxglEQq6lZ4D631LeZecNiFukQWrYWdHl4g0iYvuJvz3UP7T43L4y79r0/ebH/dSg
+        MhL9VzkW/8AK8b8aIxAJmRZ/P/W/saTDLhgQt0iD1LCttMMlGCTElkO3PdQ/tITcvjT70u9ZlU/6qEFt
-        NN6pJXzRoDx25zz1v9/c048iwySz9qUH60LDCSNT76skfNEAn9Q/iktynn0pg/JWWBf8rsKbDB2/U/+F
+        vnWa8CWD+uCtM9R/VqW/D0WGiWftC/bWBIYSRqrRV0b4kgE+qX8Ul/hs+wIG5S2vhv+pwutNbUeo/7zz
-        l4IfkwsaFvNbLTz8LKNP/K0u77xI/edU3etbobo+ldm8+fYk4eXCRSB80SC8XHtO3e3BheYNyhOdN6kh
+        /Mf43Lo/hK0WH36a2Sf9Vpe0n6P+UVKXaC5PYjZsuPGr+HLhIhC+ZBBfroyj9/y40IJBfaj9GjVkWvh+
-        1xIYEDOcUtnmBfmW4CD1v7Wiq4mYoodf4ikRBjmCnph4jEwKiUBe5j0tTE5SzqUlJoZJOeCYn1P96BX9
+        KcMpkW2ck2MJDFD/m0o7GogpfPiFnkJxkCPoiUnA8KQQC5TF3mPi5CTnXHpiYpiEPY7ZO6sev6b/Cmku
-        V0hzKUduLYIN6Q9pkCcmCLRM6up7z6nfPTWPXqcU3ZhDzEOQ671WJHJKihYJV+rRFunemge9SPyENmZE
+        Yd/1ebAh/SENCsQYgZZJW3X/BfWbUf34TUL+1RnEPAil0WtFIqekcJFwJe5vku+qftiDxE9oo0Y4SUyE
-        k8QU+Ij5DKPa1RBzDBKdY/buqn+fUGGUNLUlEMZ3osIQlek99Sit1F9OlT8kiXakhPI5MrROZWFd6C0l
+        j4jPIKpdNTFHIDM4pu84cfcpFUZJ01r4IL5jFYaowuipRWml/nae6OqWhTtSQvkSKXqnOq8m8D8l0xGL
-        05GIMLZXafzLKRRlLwXfSUvasgklPjJK26/FLtrYhSUa+0J5qdeEMxUeGdqoDM759WqXrm2V4EyFohhC
+        MLZXbb7pFIuy5/l38sKWdEKJjpSi1kuRizZ6YZnOPldZ5C3HmYqPDG1UCuf8drVL1jfLcKZiUQyxMBo7
-        YTR2aPDQ6KHhU5Z3nUecHrAEBuntpQMrhehw3MYDWk+0oPFaU7SshMaglUVLKxQYPcIRVfRM03Vtu8i0
+        NHho9NDwqUs6ziBO91j4AXp76cBKIToUt9GA1hMtaLTWFC0roTFoZdHSigVGjmBIEz7TZEPLdjJt7PiW
-        8eNrwlgxQkam7zj3xYv0f4HnCp4teL6g0iD3Zpv8AWS/X7l2reSQYzahigsUcTzU8GBDZUvOs/3IsuwE
+        MFaMkFEY20599SL9KPBcwbMFzxdUGuTe9PIuHtlvHdeql/3tmE6o0gJFHA81PNhQ2eKzbb+xLDuOmEcJ
-        Yh4jGOY/gmD0WF7YCuoAAAAASUVORK5CYII=
+        hvkMi1v0OLU4S10AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -345,18 +345,18 @@
   <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKQSURBVDhPzZLbSltBGIX3GxT6GB4uJAYRRY2IgheiICoa
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKQSURBVDhPzZLbSptBFIX/Nyj0MTxcSAwiihoRBS9EQVQ0
-        cjIxB9SgqIgEo9SoeAyJOZukNI2goAiVpooUL6xREInSmNgqtH2DUij0Qr/O3pS+QjuwmL2ZWetf6/9H
+        5GRiDqhBUREJRqlR8RgSczZJaRpBQREqTRUpXlijIBKlMbFVaPsGpVDohX6d/6f0FdqBxczArLXX2nuk
-        +j9WKBTyrK+vZ5eWlnILCwvXbrf7dnJy8n5kZOTr0NDQt4mJifvFxUXvn+tSb2+vqrOz87nyE4lEnoXD
+        /2OFQiHP+vp6dmlpKbewsHDtdrtvJycn70dGRr4ODQ19m5iYuF9cXPT+eS719vaqOjs7nyuXSCTyLBwO
-        YS4uLjg/P+fs7IzT01Nifje/vrzmx3sNHpcdv9/H4OCgTqvVfhdA4Kmvr08tiQqf9/b2uLm5YX9/n1Qq
+        c3Fxwfn5OWdnZ5yenhLzu/n15TU/3mvwuOz4/T4GBwd1Wq32uwACT319fWpJVPi8t7fHzc0N+/v7pFIp
-        RTKZJJPJIAsnEglOTk7Y2dlhdHQUu92Ow+HAarXS0dFRlIQqx8fHbG1tKfvDwwPFYpF8Ps/l5aUiODc3
+        kskkmUwGWTiRSHBycsLOzg6jo6PY7XYcDgdWq5WOjo6iJFQ5Pj5ma2tL2R8eHigWi+TzeS4vLxXBubk5
-        h4jJwcEB8Xic1dVVRCQaGhqQZEWZfHR0RCb7CXv0I7pgHq1Af+iaV28+EAwGEf1Adiq7stlszM7OUldX
+        REwODg6Ix+Osrq4iItHQ0IAkK8rko6MjMtlP2KMf0QXzaAX6Q9e8evOBYDCI6AeyU9mVzWZjdnaWuro6
-        hyRbicViFAoFHIJsitwyECtg3ixgEN/9oRy7u7vodDq2t7fx+Xzo9XpcLhc1NTVIFouFjY0NcrkcupAg
+        JNlKLBajUCjgEGRT5JaBWAHzZgGDOPeHcuzu7qLT6dje3sbn86HX63G5XNTU1CBZLBY2NjbI5XLoQoIc
-        x+9wJO+wJ+6wxIrow7ek02m6urqUOMvLy3R3dzM+Pk51dTWSyWRibW2NbDarCFhEZZnseHmHNV7EFC0o
+        v8ORvMOeuMMSK6IP35JOp+nq6lLiLC8v093dzfj4ONXV1Ugmk4m1tTWy2awiYBGVZbLj5R3WeBFTtKA4
-        Dtvb25WGejwe2traGB4epqqqCslgMCBmz+HhIeZgDmO0iHVTQJAHxG6LXrGyskJrayvRaJSZmRlaWlqU
+        bG9vVxrq8Xhoa2tjeHiYqqoqJIPBgJg9h4eHmIM5jNEi1k0BQR4Quy16xcrKCq2trUSjUWZmZmhpaVGm
-        aajVaiQ52/T0tGItkH4nRK4wREV20Qdb5IoX/hRi3mg0GgKBgJK9sbERs9mMSqVCkvM4nU5lrlNTU4pd
+        oVarkeRs09PTirVA+p0QucIQFdlFH2yRK174U4h5o9FoCAQCSvbGxkbMZjMqlQpJzuN0OpW5Tk1NKXbl
-        udN+v5/5+Xl6enqUcckEr9fL2NgYRqMR8RqpqKhAEnaclZWVP4Wdx+bm5qempialWn19PbW1tYizp/Ly
+        Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HEKpZ/CzmNzc/NTU1OTUq2+vp7a2loqKyufysvL
-        8seysrLH0tLSvygpKZHxVnnO/3BJ0m/YoNHXr+e51AAAAABJRU5ErkJggg==
+        H8vKyh5LS0v/oqSkRMZb5Tv/wyVJvwHWadHUEgctIgAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="taPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FCM0000/Item/fLovItem.Designer.cs

@@ -36,10 +36,10 @@
             System.Windows.Forms.Label label1;
             System.Windows.Forms.Label label2;
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem));
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FCM0000.dsMSSQL();
@@ -56,6 +56,7 @@
             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
             this.tbFind = new System.Windows.Forms.ToolStripTextBox();
             this.btFind = new System.Windows.Forms.ToolStripButton();
+            this.btAdd = new System.Windows.Forms.ToolStripButton();
             this.panel1 = new System.Windows.Forms.Panel();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
@@ -75,7 +76,6 @@
             this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
-            this.btAdd = new System.Windows.Forms.ToolStripButton();
             manuLabel = new System.Windows.Forms.Label();
             supplyLabel = new System.Windows.Forms.Label();
             memoLabel = new System.Windows.Forms.Label();
@@ -306,6 +306,15 @@
             this.btFind.Text = "toolStripButton1";
             this.btFind.Click += new System.EventHandler(this.btFind_Click);
             // 
+            // btAdd
+            // 
+            this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image")));
+            this.btAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btAdd.Name = "btAdd";
+            this.btAdd.Size = new System.Drawing.Size(89, 34);
+            this.btAdd.Text = "품목추가";
+            this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Gray;
@@ -516,23 +525,23 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "모델";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 27F;
-            numberCellType3.DecimalPlaces = 0;
+            numberCellType1.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
+            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
+            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 99F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name";
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "품명";
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 154F;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "model";
             this.fpSpread1_Sheet1.Columns.Get(2).Label = "모델";
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 154F;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID";
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 154F;
@@ -541,15 +550,6 @@
             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
-            // btAdd
-            // 
-            this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image")));
-            this.btAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btAdd.Name = "btAdd";
-            this.btAdd.Size = new System.Drawing.Size(89, 34);
-            this.btAdd.Text = "품목추가";
-            this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
-            // 
             // fLovItem
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

SubProject/FCM0000/Item/fLovItem.cs

@@ -123,7 +123,7 @@ namespace FCM0000
                     if (img1 != null) this.pictureBox1.Image = img1;
                     else this.pictureBox1.Image = null;
                 }
-                catch (Exception ex)
+                catch 
                 {
                     this.pictureBox1.Image = null;
                 }

SubProject/FCM0000/Item/fLovItem.resx

@@ -187,34 +187,33 @@
   </data>
   <data name="btOK.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAABgZJREFUaEPV
-        YQUAAAYGSURBVGhD1ZhbU1tVFMc76otvXp68fAxv38AXvJXSi6MQKIrOoKNlRrklxmqhuZSEAaatY5/s
+        mFtTW1UUxzvqi29enrx8DG/fwBe8ldKLoxAois6go2VGuSXGaqG5lIQBpq1jn+yI5dJi2o6NWiB1VBhA
-        iOXSYtqOjVogdVQYQEcLVSCVhgJNIKH6VPRlu/6nOene+6wkJwde8vCb5Kxz9tr/fV977Xr+vYqyhjWW
+        RwtVIJWGAk0gofpU9GW7/qc56d77rCQnB17y8JvkrHP22v99X3vtev69irKGNZYTrLGcYI3lBGssFa/X
-        E6yxnGCN5QRrLBWv13ufq+3Ycy63v9XlDgy73MFZ+t0k/stC/w3bUG17oKXWHXgWZThfpcIa7VLv9T1J
+        e5+r7dhzLre/1eUODLvcwVn63ST+y0L/DdtQbXugpdYdeBZlOF+lwhrtUu/1PUnCOknYCiFKocYduFnj
-        wjpJ2AohSqHGHbhZ4wl0VLd1PcH5tgtrLEZ1S8ej1NvHSci/ujAHbBF9B71dj3B1FYM1FoIq20+ks5Xv
+        CXRUt3U9wfm2C2ssRnVLx6PU28dJyL+6MAdsEX0HvV2PcHUVgzUWgirbT6Szle8YNCIbxF6uzkKwRg6a
-        GDQiG8Rers5CsEYOmrMPZHudFdDwSViET58VF69Mil//iIvEalKk0rcN8P+Xa4vGO3yDbzkfBp5gL+ri
+        sw9ke50V0PBJWIRPnxUXr0yKX/+Ii8RqUqTStw3w/5dri8Y7fINvOR8GnmAv6uI0cLBGnar3ux6scQfP
-        NHCwRp2q97serHEHz3MVvnu0T5yPTYhbGxmRvv2PLfAtGtN07KTFX5YI6uS06LBGGfQGJ/7gx12i/5sx
+        cxW+e7RPnI9NiFsbGZG+/Y8t8C0a03TspMVflgjq5LTosEYZ9AYn/uDHXaL/mzGxtm5fuA5GZzB6xfCl
-        sbZuX7gORmcwesXwpfsnInZGgjXKcNPmnc4+MX1tgRXlhOm5BdF4tFepA9Ca6OE0ybBGE3KCBas4bQ6f
+        +ycidkaCNcpw0+adzj4xfW2BFeWE6bkF0Xi0V6kD0Jro4TTJsEYTcoIFqzhtDp8S8eU1Vsh88i/RPzsk
-        EvHlNVbIfPIv0T87JFpiblEffVtUfr3PAP9h+2p2WCwkl9iyi8urhm+9vtr24B5OmwlrBNjWsDPIztBL
+        WmJuUR99W1R+vc8A/2H7anZYLCSX2LKLy6uGb72+2vbgHk6bCWsE2NawM8jO0Euc+MXUkghOhsWLI7tF
-        nPjF1JIITobFiyO7RcW5lwvywsgr4vCPR8Sft65b/VAjmJFIY9vmNALWCPSpU+8NsdPm28VRURnZx4ot
+        xbmXC/LCyCvi8I9HxJ+3rlv9UCOYkUhj2+Y0AtYI9KlT7w2x0+bbxVFRGdnHii3Ensh+8V18zOJvam7e
-        xJ7IfvFdfMzib2pu3rImCk0l1nj3hFUPKSxYvbIvrw4aPcoJtAPKXpq/bPE7EI0pDSC26ry+xzmtFgPI
+        siYKTSXWePeEVQ8pLFi9si+vDho9ygm0A8pemr9s8TsQjSkNILbqvL7HOa0WA8iGBzkH2Cr13QY9vx3x
-        hgc5B9gq9d0GPb8d8eDQ6AdiNb2u+AXJ9KY4FDwhN4DwH+G0WgxVVQP3UwEltsE+L1ewkLzhaNrINI01
+        4NDoB2I1va74Bcn0pjgUPCE3gPAf4bRaDFVVA/dTASW2wT4vV7CQvOFo2sg0jTWL1YxVvMmF2KQk3iDB
-        i9WMVbzJhdikJN4gwQWAygO4G1XeK4hTUz+kfD93saLskq/nZTDibx4OyQ0Q1W2+Z3S9ygOgoUJInCuE
+        BYDKA7gbVd4riFNTP6R8P3exouySr+dlMOJvHg7JDRDVbb5ndL3KA6ChQkicK4SjX3aMrdLObpOPfOJP
-        o192jK3Szm6Tj3ziT86cMkZWtoVPDysNcLUHPtT1Kg+APqR4/l4hHPmy0/6rQ6wwO+QTf2Lmc+P9mVm1
+        zpwyRla2hU8PKw1wtQc+1PUqD4A+pHj+XiEc+bLT/qtDrDA75BN/YuZz4/2ZWbWzLoxPKA2g3WhQ16s8
-        sy6MTygNoN1oUNerPIDsxSNXCIGZ7LSVDiRdmElDtJG1g3xzvnf6s9w3rbGPlHcIAGUtNDt+1/UqD4A+
+        gOzFI1cIgZnstJUOJF2YSUO0kbWDfHO+d/qz3DetsY+UdwgAZS00O37X9SoPgD7MyIUSaynFad2lBkWY
-        zMiFEmspxWndpQZFmAnWxcbm38ZU0N8V63kTnNjy+xsUxcpacLDqepUHQB8q+z+2NNkpt/uY4s1v5EbY
+        CdbFxubfxlTQ3xXreROc2PL7GxTFylpwsOp6lQdAHyr7P7Y02Sm3+5jizW/kRtgVD+Bb/ia1sak0gNjS
-        FQ/gW/4mtbGpNIDY0vUqD4A+KqkBBy6+LlbS6igBTA0700amKnJA+c5pAwpOofroW5aK8wlNZtIWWz7x
+        9SoPgD4qqQEHLr4uVtLqKAFMDTvTRqYqckD5zmkDCk6h+uhblorzCU1m0hZbPvHgjZ2ZQuoixkKSneZb
-        4I2dmULqIsZCkp3mW8SYKtxIyHDTRkZfxDMOF3HBbRQhMVc5KNSIYuLBwNw5pYyjbRR5G7mQfpAhni90
+        xJgq3EjIcNNGRl/EMw4XccFtFCExVzko1Ihi4sHA3DmljKNtFHkbuZB+kCGeL3SQcY2wI/6lkUrLQRb6
-        kHGNsCP+pZFKy0EW+sLBQYakk1yICyX8EyFWhIncCDviQXCyW6mDCyXq2nxP6XqVB4CAiYbqplxQn0a4
+        wsFBhqSTXIgLJfwTIVaEidwIO+JBcLJbqYMLJerafE/pepUHgICJhuqmXFCfRrjAIJ7nhJhgYfdMHWff
-        wCCe54SYYGH3TB1n3+lg94mnEkodjoM5gIyZXBjZA1zA5QpGr/+wrZjIBCH59/FxxTe2zyYtnK71BD7l
+        6WD3iacSSh2OgzmAjJlcGNkDXMDlCkav/7CtmMgEIfn38XHFN7bPJi2crvUEPuW0WgwA6T4qhIxZzgGy
-        tFoMAOk+KoSMWc4BsgdyJQBx0XYvNLhD637PRMcV8cSdki40gAr1yU5wzUP2QK8M18Ji04kD0+ZyPGbx
+        B3IlAHHRdi80uEPrfs9ExxXxxJ2SLjSACvXJTnDNQ/ZArwzXwmLTiQPT5nI8ZvE3NTtP11f1SknrspvT
-        NzU7T9dX9UpJ67Kb0whYI8Clngqvy45w4cbFW690KbUiuqf6jJ2EEyuDXu/4KWCZ8yDPpT71anPnw5xG
+        CFgjwKWeCq/LjnDhxsVbr3QptSK6p/qMnYQTK4Ne7/gpYJnzIM+lPvVqc+fDnEbAGk1oMe/VnBmpD64R
-        wBpNaDHv1ZwZqQ+uEQDbIELi1pjHOFURdgD8xyE1MHfWslWa5EuruNqDuzltJqxRBrlK3Sl6CdkDTogT
+        ANsgQuLWmMc4VRF2APzHITUwd9ayVZrkS6u42oO7OW0mrFEGuUrdKXoJ2QNOiBMwbRo7rYktl8cf5jTJ
-        MG0aO62JLZfHH+Y0ybBGGaT3yFlEd441geyBHuyVAspiwepzPssI7uecJhnWqINEKzm0NAIge4A9u5Qc
+        sEYZpPfIWUR3jjWB7IEe7JUCymLB6nM+ywju55wmGdaog0QrObQ0AiB7gD27lBwpvkUZfauUGNmx5K4J
-        Kb5FGX2rlBjZseSuCUaC1kQPU5kBTk3cYRG/IABEJIkeBvgPG7IbCA/0E1YGO46dnjdhjYVArpIqSukV
+        RoLWRA9TmQFOTdxhEb8gAEQkiR4G+A8bshsID/QTVgY7jp2eN2GNhUCukipK6RVvH3+y2ILlYI3FwLaW
-        bx9/stiC5WCNxcC2lh0N5bBzyB30ussbeoirqxis0S44HZExIxHLmig7JBAevNYaeozzbRfWWCoIspB0
+        HQ3lsHPIHfS6yxt6iKurGKzRLjgdkTEjEcuaKDskEB681hp6jPNtF9ZYKgiykHSixjQjZsfFgwTiZofr
-        osY0I2bHxYME4maH6ynIUCj8m/GOQmK6ND3NBWZOYI3lBGssJ1hjOcEay4eKXf8DEq1Ek5YKoVUAAAAA
+        KchQKPyb8Y5CYro0Pc0FZk5gjeUEaywnWGM5wRrLh4pd/wMSrUSTlgqhVQAAAABJRU5ErkJggg==
-        SUVORK5CYII=
 </value>
   </data>
   <data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -231,24 +230,21 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK9SURBVGhD7Zm7btRAFIZX3ApKLhWXl0BEpEqHImw0Yymr
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK7SURBVGhD7Zm5bhRBEIZXXAEhR8TxEhYWjpwha3uY7pG8
-        IOh5BSKa7bL0IUoiniBEHksJoaHIMxDBA3CpIKEGGviPOWlGZ4iPL5O15E/6pU32+Mw/Y8/M8exoYGCg
+        AuGcV8Ai2cyQG8tYPIFB3S3ZmISAZwCZB+CIwBADCVTNlpNWNZ6ao70jzSf90kpbU/3Puo/q8mhgYKA5
-        OePX4/Ops/NJYZ6nhckTZz/i7x/4/LsUPuN/H8rvEPMwz+5NJpNzfPnZYQpzC+ZeQF/Twv7RyXxBZ6aL
+        k5eTs5kzS8rrx5nXVlnzMbPmZ+bzP6Xg89iZw/I7iLlri9vT6fQMPX56aK9vgPGnoK+ZN39lyr/AyzxZ
-        eXaT08VjcXvpeurMFgz8ks1VF+WANtLd9Bqn7xaM3GPoWDLTROjEUZJnj7iZ9rmz9fQinuNXUuNtCm1s
+        scV1SpeOld3Vq5nNd8Y+/82bqy7MMfZ6O9vLrlD6boFp8AB+vR+cmSaCFzlStrhPw7TPws7D88qZF9zg
-        UlvcbDvg9l7GCL2VGuxEzu5Tm9x8M8qRj2n+RM6+w+p2iW3UJ8ZjExJNbrZRD0yqJ1LiuDLLbEeHdfYq
+        bQrGeI5j0bDtAH/ei8rnb7gBO5EzBzgmDd+M8pdPaf5YzryF3e0C2ahPimkTEy5uslEPWFRrXOK00vfI
-        Rv+7nDSmsOLVWWJpnZcTxhcGcp1tVYN2Rzx/jTYpHymmqkovu+lttnc6ZXkgJNLIR4rRCJ2Ysr3/Q0UW
+        jgzjzOWxNd/5pCkFO16dLRb3eT5hesE03iJb1cDTsekhFcLFVFXpZS+7SfZOpiwPmEQShXAxEmHZQfb+
-        1SlSEo18pBiVUG9R0cg2wyBwXkyglI8UoxXmwhzbDINbhZJYTqCRjxSjlrMrbDMMgpx4sVI+Uoxazu6w
+        DxZZWKdwSSQK4WJEgnoLi0ayGQcCl9gEQoVwMVLBWlgkm3FmJTGfQKIQLkYsZ9bJZhwIcuzDQoVwMWI5
-        zTC4TXjxEC5WykeKUcvZQ7YZRlMqt4WUWxJtrGwzjGb9bwsptyhnf7LNML3vQP8fod5P4t4vozO8kT0o
+        84psxpldPJiHhQrhYsSy5gPZjCMplduCy80JD1ayGUey/7cFl5uVNb/IZpzev0D/p1DvF3Hft9F5Psjg
-        zDO2GYYOnaSLtfKRYtTKs7tsMwwVc5gHn8UECvlIMRrB06fKp3lUukpJNPKRYnQyq2zvdGbthYbW/2Qv
+        gvOIbMbBphP3sFQhXIxYtrhFNuNgMQeL5TObQKAQLkYiWJufKnfzsHTlkkgUwsXIpDfI3snM24UG93+1
-        ucH2qoEObIjJzkRmjW1V5/720hXaOOSE8YSBPKp9bkpnlVLSmEpcNmY79cBd2JQSxxBG/yXbqA+9h6IT
+        r66RvWqU7T4u2alIb5Kt6tzZXb00D5d6mAlHtfum2KvkkqaUcsWE7NQDe5Vc4hSCzeQZ2agP3kNhKnlu
-        hdRAtzJvFg4WLrCNZtBBK1aCfbmh9oWR32vtcPcEPuTtfGWix6a1kZfArV3uZnUy3xpP2Krwuek6bTCy
+        gG6lXy+/Wz5HNpqBjVY4xg/4gdqX8vl+a83dY7DJm2JnwmnT2i/Pgb3Kbnan/FvjBVsV7Jtiuw8PGN6M
-        GYXKHGaNlm1OHw/aHXHLp+iMunb6d41ZVe+wXcAF4BxGcwXagQ5h7hidox/wUJLgs7Pv6TsqiamqnImf
+        QGUOvYnbNqVPB56OWHbUqZ1mz+gN8QnbBVhkYdMJFvo61ux48cCbHZYjs5IEPjvzHr/Dkhiryrn4N+vA
-        WQcGes9o9BfCYWu7q2s5swAAAABJRU5ErkJggg==
+        QO8Zjf4BUd5rbZRXqi0AAAAASUVORK5CYII=
 </value>
   </data>
-  <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>
@@ -258,9 +254,6 @@
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>539, 17</value>
   </metadata>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>614, 17</value>
-  </metadata>
   <data name="saveToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
@@ -290,4 +283,7 @@
         dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
 </value>
   </data>
+  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>614, 17</value>
+  </metadata>
 </root>

SubProject/FCM0000/User/fUserAuth.cs

@@ -120,7 +120,7 @@ namespace FCM0000
             }
         }
 
-        private int selcectIDX = -1;
+       // private int selcectIDX = -1;
      
       
     }

SubProject/FCM0000/User/fUserGroup.cs

@@ -148,7 +148,7 @@ namespace FCM0000
             }
         }
 
-        private int selcectIDX = -1;
+        //private int selcectIDX = -1;
         private void bs_CurrentChanged(object sender, EventArgs e)
         {
            

SubProject/FCM0000/fHolidaytable.cs

@@ -12,7 +12,7 @@ namespace FCM0000
     public partial class fHolidaytable : Form
     {
         public string Title { get; set; }
-        DataTable dt;
+       // DataTable dt;
 
         public fHolidaytable()
         {

SubProject/FCOMMON/DataBaseManager.cs

@@ -116,7 +116,7 @@ namespace FCOMMON
                 cmd.ExecuteNonQuery();
                 retval = true;
             }
-            catch (Exception ex)
+            catch
             {
 
             }
@@ -652,6 +652,38 @@ namespace FCOMMON
             else return null;
         }
 
+        public static System.Data.DataTable getProcessList()
+        {
+
+            System.Data.DataTable retval = new System.Data.DataTable();
+            retval.Columns.Add("Code");
+            retval.Columns.Add("Value");
+
+            var cn = getCn();
+            cn.Open();
+            var sql = "select isnull(processs,'') as process" +
+                        " from Users" +
+                        " where processs is not null and gcode='{0}'" +
+                        " group by processs" +
+                        " order by process";
+
+            sql = string.Format(sql, FCOMMON.info.Login.gcode);
+            var cmd = new SqlCommand(sql, cn);
+            var rdr = cmd.ExecuteReader();
+            var cnt = 0;
+            while (rdr.Read())
+            {
+                retval.Rows.Add(new string[] { cnt.ToString(), rdr[0].ToString() });
+                cnt += 1;
+            }
+            rdr.Close();
+            cmd.Dispose();
+            cn.Close();
+            cn.Dispose();
+            return retval;
+        }
+
+
 
         public static System.Data.DataTable getUserProjectList(string userName)
         {
@@ -832,7 +864,7 @@ namespace FCOMMON
                 cn.Close();
                 cn.Dispose();
             }
-            catch (Exception ex)
+            catch
             {
                 work = 0;
                 total = 0;
@@ -903,7 +935,9 @@ namespace FCOMMON
             if (itemdata == DBNull.Value || itemdata == null)
             {
                 retval = -1;
-            } else {
+            }
+            else
+            {
                 var strItem = itemdata.ToString();
                 if (strItem == "") retval = -1;
                 else retval = int.Parse(strItem);

SubProject/FCOMMON/Info.cs

@@ -43,6 +43,7 @@ namespace FCOMMON
             public string nameK;
             public string dept;
             public string email;
+            public string process;
             public int level;
             public string gcode;
             public int gpermission;

SubProject/FCOMMON/fFTPExplorer.cs

@@ -79,7 +79,7 @@ namespace FCOMMON
             timer1.Start();
 
             //listview column width
-            string item = "ftp_lv_col_";
+            //string item = "ftp_lv_col_";
 
             if (System.IO.File.Exists(fn) == false) return;
             arUtil.INIHelper ini = new arUtil.INIHelper(fn);

SubProject/FCOMMON/fSelectMonth.cs

@@ -11,10 +11,11 @@ namespace FCOMMON
 {
     public partial class fSelectMonth : Form
     {
-        public int selectmon = -1;
+        public int selectmon { get; set; }
         public fSelectMonth()
         {
             InitializeComponent();
+            selectmon = -1;
             this.KeyDown += (s1,e1)=>{ if (e1.KeyCode == Keys.Escape) this.Close(); };
         }
 

SubProject/FCOMMON/fWebCamera.cs

@@ -55,7 +55,7 @@ namespace FCOMMON
                     {
                         this.imageBox1.Image = srcimage;
                         this.imageBox1.Invalidate();
-                    }catch (Exception ex)
+                    } catch 
                     {
 
                     }

SubProject/FEQ0000/Equipment/fImpEquipment.cs

@@ -65,7 +65,7 @@ namespace FEQ0000
         {
             List<string> datas = new List<string>();
             var charlist = line.ToCharArray();
-            int c = 0;
+           // int c = 0;
             System.Text.StringBuilder sb = new StringBuilder();
             Boolean findCom = false;
             foreach (var ch in charlist)

SubProject/FEQ0000/Purchase/fPurchase.Designer.cs

@@ -30,31 +30,31 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -120,6 +120,8 @@
             this.btViewDel = new System.Windows.Forms.ToolStripButton();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+            this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbSort = new System.Windows.Forms.ToolStripComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -187,7 +189,7 @@
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(1028, 26);
+            this.bn.Size = new System.Drawing.Size(1184, 26);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -495,6 +497,8 @@
             this.dtSD,
             this.lbEnd,
             this.dtED,
+            this.toolStripLabel4,
+            this.cmbSort,
             this.toolStripSeparator2,
             this.toolStripLabel1,
             this.cmbState,
@@ -509,7 +513,7 @@
             this.btViewDel});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1028, 37);
+            this.toolStrip1.Size = new System.Drawing.Size(1184, 37);
             this.toolStrip1.TabIndex = 3;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -611,8 +615,8 @@
             this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
             this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            this.toolStripDropDownButton1.Size = new System.Drawing.Size(116, 34);
+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(81, 34);
-            this.toolStripDropDownButton1.Text = "Quick Menu";
+            this.toolStripDropDownButton1.Text = "Quick";
             // 
             // 금일입고품목ToolStripMenuItem
             // 
@@ -667,7 +671,7 @@
             this.fpSpread1.Name = "fpSpread1";
             this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
             this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(1028, 602);
+            this.fpSpread1.Size = new System.Drawing.Size(1184, 602);
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 4;
             // 
@@ -712,7 +716,7 @@
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType20;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
@@ -720,7 +724,7 @@
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F;
             this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType21;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
@@ -728,164 +732,164 @@
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 49F;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType22;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소";
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType23;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 49F;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType24;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청";
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 37F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType25;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#";
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 24F;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType26;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "CR/CF#";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 43F;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType27;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령";
             this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F;
             this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType28;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#";
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType29;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명";
             this.fpSpread1_Sheet1.Columns.Get(9).Width = 33F;
             this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
+            numberCellType6.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType6.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
+            numberCellType6.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType6;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(10).Width = 14F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격";
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType31;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept";
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사";
             this.fpSpread1_Sheet1.Columns.Get(12).Width = 45F;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType31;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc";
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정";
             this.fpSpread1_Sheet1.Columns.Get(13).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType31;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset";
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델";
             this.fpSpread1_Sheet1.Columns.Get(14).Width = 33F;
-            numberCellType2.DecimalPlaces = 0;
+            numberCellType7.DecimalPlaces = 0;
-            numberCellType2.NegativeRed = true;
+            numberCellType7.NegativeRed = true;
-            numberCellType2.NullDisplay = "--";
+            numberCellType7.NullDisplay = "--";
-            numberCellType2.Separator = ",";
+            numberCellType7.Separator = ",";
-            numberCellType2.ShowSeparator = true;
+            numberCellType7.ShowSeparator = true;
-            numberCellType2.ShrinkToFit = true;
+            numberCellType7.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType7;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량";
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType32;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위";
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 33F;
-            numberCellType3.DecimalPlaces = 0;
+            numberCellType8.DecimalPlaces = 0;
-            numberCellType3.NegativeRed = true;
+            numberCellType8.NegativeRed = true;
-            numberCellType3.NullDisplay = "--";
+            numberCellType8.NullDisplay = "--";
-            numberCellType3.Separator = ",";
+            numberCellType8.Separator = ",";
-            numberCellType3.ShowSeparator = true;
+            numberCellType8.ShowSeparator = true;
-            numberCellType3.ShrinkToFit = true;
+            numberCellType8.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType8;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가";
             this.fpSpread1_Sheet1.Columns.Get(17).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액";
             this.fpSpread1_Sheet1.Columns.Get(18).Width = 33F;
             this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType33;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply";
             this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체";
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 49F;
             this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType4.DecimalPlaces = 0;
+            numberCellType9.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
+            numberCellType9.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
+            numberCellType9.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType9;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 14F;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType34;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(21).Label = "관련프로젝트";
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 45F;
             this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType5.DecimalPlaces = 0;
+            numberCellType10.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType10.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
+            numberCellType10.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType10;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 14F;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType35;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고예정";
             this.fpSpread1_Sheet1.Columns.Get(23).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType36;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate";
             this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일";
             this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType37;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "PO#";
             this.fpSpread1_Sheet1.Columns.Get(25).Width = 32F;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType38;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "비고";
             this.fpSpread1_Sheet1.Columns.Get(26).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType2;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(27).Label = "삭제됨";
             this.fpSpread1_Sheet1.Columns.Get(27).Tag = "isdel";
@@ -896,11 +900,27 @@
             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
+            // toolStripLabel4
+            // 
+            this.toolStripLabel4.Name = "toolStripLabel4";
+            this.toolStripLabel4.Size = new System.Drawing.Size(31, 34);
+            this.toolStripLabel4.Text = "정렬";
+            // 
+            // cmbSort
+            // 
+            this.cmbSort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSort.Items.AddRange(new object[] {
+            "등록일",
+            "완료일",
+            "S/C"});
+            this.cmbSort.Name = "cmbSort";
+            this.cmbSort.Size = new System.Drawing.Size(90, 37);
+            // 
             // fPurchase
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1028, 665);
+            this.ClientSize = new System.Drawing.Size(1184, 665);
             this.Controls.Add(this.fpSpread1);
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.bn);
@@ -990,5 +1010,7 @@
         private System.Windows.Forms.ToolStripMenuItem 추가ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton2;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel4;
+        private System.Windows.Forms.ToolStripComboBox cmbSort;
     }
 }

SubProject/FEQ0000/Purchase/fPurchase.cs

@@ -82,6 +82,7 @@ namespace FEQ0000
         {
             this.cmDate.SelectedIndex = 0;
             this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
+            this.cmbSort.SelectedIndex = 0;
             this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
             this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
 
@@ -151,6 +152,7 @@ namespace FEQ0000
                 if (cmDate.SelectedIndex == 1) dateField = "indate";
                 else if (cmDate.SelectedIndex == 2) dateField = "expdate";
                 
+
                 System.Data.SqlClient.SqlDataAdapter da = new System.Data.SqlClient.SqlDataAdapter();
                 System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
                 cmd.CommandText = " select *,dbo.getusername(request) as requestName,dbo.getusername(receive) as receiveName" +
@@ -180,6 +182,11 @@ namespace FEQ0000
                     }
                 }
                 // else cmd.CommandText += " and (state < '04' or state > '07')";
+
+
+                if (cmbSort.SelectedIndex == 1) dateField = "edate";
+                else if (cmbSort.SelectedIndex == 2) dateField = "sc";
+
                 cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";
 
                 cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text));

SubProject/FEQ0000/Purchase/fPurchase.resx

@@ -337,6 +337,6 @@
     <value>579, 23</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>63</value>
+    <value>65</value>
   </metadata>
 </root>

SubProject/FPJ0000/JobReport/fJobReport.Designer.cs

@@ -84,6 +84,7 @@
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
             this.dtSD = new System.Windows.Forms.ToolStripTextBox();
@@ -95,15 +96,14 @@
             this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
+            this.toolStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // bn
@@ -299,6 +299,7 @@
             // btReport
             // 
             this.btReport.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.btReport.Enabled = false;
             this.btReport.Image = ((System.Drawing.Image)(resources.GetObject("btReport.Image")));
             this.btReport.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btReport.Name = "btReport";
@@ -319,6 +320,7 @@
             // toolStripButton1
             // 
             this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton1.Enabled = false;
             this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
             this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton1.Name = "toolStripButton1";
@@ -474,104 +476,6 @@
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
             // 
-            // toolStrip1
-            // 
-            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
-            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.lbStt,
-            this.dtSD,
-            this.lbEnd,
-            this.dtED,
-            this.lbTime,
-            this.toolStripSeparator2,
-            this.toolStripLabel3,
-            this.cmbUser,
-            this.btSearch,
-            this.toolStripButton2});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
-            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1142, 37);
-            this.toolStrip1.TabIndex = 4;
-            this.toolStrip1.Text = "toolStrip1";
-            // 
-            // lbStt
-            // 
-            this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.lbStt.ForeColor = System.Drawing.Color.Blue;
-            this.lbStt.Name = "lbStt";
-            this.lbStt.Size = new System.Drawing.Size(31, 34);
-            this.lbStt.Text = "기간";
-            this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
-            // 
-            // dtSD
-            // 
-            this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtSD.Name = "dtSD";
-            this.dtSD.ReadOnly = true;
-            this.dtSD.Size = new System.Drawing.Size(90, 37);
-            this.dtSD.Text = "1982-11-23";
-            this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // lbEnd
-            // 
-            this.lbEnd.Name = "lbEnd";
-            this.lbEnd.Size = new System.Drawing.Size(15, 34);
-            this.lbEnd.Text = "~";
-            // 
-            // dtED
-            // 
-            this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtED.Name = "dtED";
-            this.dtED.ReadOnly = true;
-            this.dtED.Size = new System.Drawing.Size(90, 37);
-            this.dtED.Text = "1982-11-23";
-            this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // lbTime
-            // 
-            this.lbTime.Name = "lbTime";
-            this.lbTime.Size = new System.Drawing.Size(29, 34);
-            this.lbTime.Text = "{0}h";
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
-            // 
-            // toolStripLabel3
-            // 
-            this.toolStripLabel3.Name = "toolStripLabel3";
-            this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
-            this.toolStripLabel3.Text = "사용자";
-            this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
-            // 
-            // cmbUser
-            // 
-            this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbUser.Name = "cmbUser";
-            this.cmbUser.Size = new System.Drawing.Size(200, 37);
-            this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
-            this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click);
-            // 
-            // btSearch
-            // 
-            this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
-            this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btSearch.Name = "btSearch";
-            this.btSearch.Size = new System.Drawing.Size(80, 34);
-            this.btSearch.Text = "조회(&R)";
-            this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
-            // 
-            // toolStripButton2
-            // 
-            this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
-            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton2.Name = "toolStripButton2";
-            this.toolStripButton2.Size = new System.Drawing.Size(65, 34);
-            this.toolStripButton2.Text = "닫기";
-            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
-            // 
             // fpSpread1_Sheet1
             // 
             this.fpSpread1_Sheet1.Reset();
@@ -670,6 +574,102 @@
             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
+            // toolStrip1
+            // 
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.lbStt,
+            this.dtSD,
+            this.lbEnd,
+            this.dtED,
+            this.lbTime,
+            this.toolStripSeparator2,
+            this.toolStripLabel3,
+            this.cmbUser,
+            this.btSearch,
+            this.toolStripButton2});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(1142, 37);
+            this.toolStrip1.TabIndex = 4;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // lbStt
+            // 
+            this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.lbStt.ForeColor = System.Drawing.Color.Blue;
+            this.lbStt.Name = "lbStt";
+            this.lbStt.Size = new System.Drawing.Size(31, 34);
+            this.lbStt.Text = "기간";
+            this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
+            // 
+            // dtSD
+            // 
+            this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtSD.Name = "dtSD";
+            this.dtSD.Size = new System.Drawing.Size(90, 37);
+            this.dtSD.Text = "1982-11-23";
+            this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // lbEnd
+            // 
+            this.lbEnd.Name = "lbEnd";
+            this.lbEnd.Size = new System.Drawing.Size(15, 34);
+            this.lbEnd.Text = "~";
+            // 
+            // dtED
+            // 
+            this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtED.Name = "dtED";
+            this.dtED.Size = new System.Drawing.Size(90, 37);
+            this.dtED.Text = "1982-11-23";
+            this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // lbTime
+            // 
+            this.lbTime.Name = "lbTime";
+            this.lbTime.Size = new System.Drawing.Size(29, 34);
+            this.lbTime.Text = "{0}h";
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
+            // 
+            // toolStripLabel3
+            // 
+            this.toolStripLabel3.Name = "toolStripLabel3";
+            this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
+            this.toolStripLabel3.Text = "사용자";
+            this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
+            // 
+            // cmbUser
+            // 
+            this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbUser.Name = "cmbUser";
+            this.cmbUser.Size = new System.Drawing.Size(200, 37);
+            this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
+            this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click);
+            // 
+            // btSearch
+            // 
+            this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
+            this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btSearch.Name = "btSearch";
+            this.btSearch.Size = new System.Drawing.Size(80, 34);
+            this.btSearch.Text = "조회(&R)";
+            this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
+            // 
+            // toolStripButton2
+            // 
+            this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton2.Name = "toolStripButton2";
+            this.toolStripButton2.Size = new System.Drawing.Size(65, 34);
+            this.toolStripButton2.Text = "닫기";
+            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+            // 
             // fJobReport
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -689,9 +689,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

SubProject/FPJ0000/JobReport/fJobReport.cs

@@ -40,30 +40,16 @@ namespace FPJ0000
             if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
             this.cmbUser.Items.Clear();
             this.cmbUser.Items.Add(namestr);
-            try
+            var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter();
+
+            var processStr = "%";
+            if (FCOMMON.info.Login.process != "") processStr = FCOMMON.info.Login.process;
+            var dtUserList = taUserList.GetData(processStr);
+            foreach(dsReport.ProcessUserListRow dr in dtUserList)
             {
-                var cn = FCOMMON.DBM.getCn();
+                string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
-                cn.Open();
-                string sql = "select uid,dbo.getUserName(uid) as uname " +
-                            " from JobReport" +
-                            " where gcode='{1}' and uid <> '{0}'" +
-                            " group by uid " +
-                            " order by uname";
-                sql = string.Format(sql, FCOMMON.info.Login.no, FCOMMON.info.Login.gcode);
-                var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
-                var rdr = cmd.ExecuteReader();
-                while (rdr.Read())
-                {
-                    string cmbdata = string.Format("{1}({0})", rdr["uid"].ToString(), rdr["uname"].ToString());
                 this.cmbUser.Items.Add(cmbdata);
             }
-                cmd.Dispose();
-                cn.Close();
-                cn.Dispose();
-            }catch (Exception ex)
-            {
-                FCOMMON.Util.MsgE("User List Error\n\n"+ex.Message);
-            }
 
             //var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
             //foreach (var user in userList)

SubProject/FPJ0000/JobReport/rJobReportDay.Designer.cs

@@ -29,18 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsReport = new FPJ0000.dsReport();
-            this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             this.btRefresh = new System.Windows.Forms.Button();
             this.tbMon = new System.Windows.Forms.TextBox();
             this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.tbProcess = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
             // bs
@@ -53,20 +56,10 @@
             this.dsReport.DataSetName = "dsReport";
             this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
             // 
-            // reportViewer1
-            // 
-            this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource1.Name = "DataSet1";
-            reportDataSource1.Value = this.bs;
-            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
-            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport.rJobReportDay.rdlc";
-            this.reportViewer1.Location = new System.Drawing.Point(0, 42);
-            this.reportViewer1.Name = "reportViewer1";
-            this.reportViewer1.Size = new System.Drawing.Size(721, 544);
-            this.reportViewer1.TabIndex = 1;
-            // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.tbProcess);
+            this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.linkLabel1);
             this.panel1.Controls.Add(this.btRefresh);
             this.panel1.Controls.Add(this.tbMon);
@@ -74,9 +67,18 @@
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Padding = new System.Windows.Forms.Padding(5);
-            this.panel1.Size = new System.Drawing.Size(721, 42);
+            this.panel1.Size = new System.Drawing.Size(751, 42);
             this.panel1.TabIndex = 0;
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(198, 15);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(29, 12);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "공정";
+            // 
             // linkLabel1
             // 
             this.linkLabel1.AutoSize = true;
@@ -91,7 +93,7 @@
             // btRefresh
             // 
             this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btRefresh.Location = new System.Drawing.Point(641, 5);
+            this.btRefresh.Location = new System.Drawing.Point(671, 5);
             this.btRefresh.Name = "btRefresh";
             this.btRefresh.Size = new System.Drawing.Size(75, 32);
             this.btRefresh.TabIndex = 2;
@@ -103,7 +105,7 @@
             // 
             this.tbMon.Location = new System.Drawing.Point(66, 10);
             this.tbMon.Name = "tbMon";
-            this.tbMon.Size = new System.Drawing.Size(100, 21);
+            this.tbMon.Size = new System.Drawing.Size(115, 21);
             this.tbMon.TabIndex = 1;
             this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -111,12 +113,39 @@
             // 
             this.ta.ClearBeforeFill = true;
             // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
+            this.dataGridView1.AllowUserToResizeColumns = false;
+            this.dataGridView1.AllowUserToResizeRows = false;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(0, 42);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
+            this.dataGridView1.RowHeadersVisible = false;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(751, 546);
+            this.dataGridView1.TabIndex = 2;
+            // 
+            // tbProcess
+            // 
+            this.tbProcess.FormattingEnabled = true;
+            this.tbProcess.Location = new System.Drawing.Point(233, 10);
+            this.tbProcess.Name = "tbProcess";
+            this.tbProcess.Size = new System.Drawing.Size(158, 20);
+            this.tbProcess.TabIndex = 5;
+            this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
+            // 
             // rJobReportDay
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(721, 586);
+            this.ClientSize = new System.Drawing.Size(751, 588);
-            this.Controls.Add(this.reportViewer1);
+            this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.panel1);
             this.Name = "rJobReportDay";
             this.Text = "일/개인별 근무시간 집계(+OT 포함)";
@@ -125,13 +154,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
-
-        private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
         private dsReport dsReport;
         private System.Windows.Forms.BindingSource bs;
         private System.Windows.Forms.Panel panel1;
@@ -139,5 +167,8 @@
         private System.Windows.Forms.TextBox tbMon;
         private System.Windows.Forms.LinkLabel linkLabel1;
         private dsReportTableAdapters.JobReportDayTableAdapter ta;
+        private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox tbProcess;
     }
 }

SubProject/FPJ0000/JobReport/rJobReportDay.cs

@@ -11,16 +11,30 @@ namespace FPJ0000.JobReport
 {
     public partial class rJobReportDay : Form
     {
+        Boolean binit = false;
         public rJobReportDay()
         {
             InitializeComponent();
             this.WindowState = FormWindowState.Maximized;
+            
+            
         }
 
         private void rJobReport_Load(object sender, EventArgs e)
         {
+            this.tbProcess.Items.Clear();
+            tbProcess.Items.Add("전체");
+            var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
+            var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
+            foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
+                tbProcess.Items.Add(dr.processs);
+
+            this.tbProcess.Text = FCOMMON.info.Login.process;
+            if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
+
             this.tbMon.Text = DateTime.Now.ToString("yyyy-MM");
             refrehData();
+            binit = true;
         }
 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -34,13 +48,82 @@ namespace FPJ0000.JobReport
         void refrehData()
         {
             this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode);
-            this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
+            //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
-            this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
+            //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
-            this.reportViewer1.RefreshReport();
+            //this.reportViewer1.RefreshReport();
+
+            //그리드뷰 생성
+            this.dataGridView1.Rows.Clear();
+            this.dataGridView1.Columns.Clear();
+
+            var Process = tbProcess.Text.Trim();
+            if (Process == "%" || tbProcess.SelectedIndex == 0) Process = "";
+
+            //날짜에 해당하는 열을 먼저 생성한다
+            dataGridView1.Columns.Add("dvcu_damdang", "사원명");
+           // dataGridView1.Columns.Add("dvcu_process", "공정");
+            var daylist = dsReport.JobReportDay.GroupBy(t => t.pdate);
+            foreach (var dayitem in daylist)
+            {
+                this.dataGridView1.Columns.Add("dvcu_pdate", dayitem.Key.Substring(8, 2));
+                this.dataGridView1.Columns[this.dataGridView1.Columns.Count -1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            }
+            dataGridView1.Columns.Add("dvcu_sum", "합계");
+            this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+
+
+            foreach (var item in dsReport.JobReportDay.Where(t=>t.processs.Contains(Process)).OrderBy(t => t.uname + t.uid).GroupBy(t => t.uname))
+            {
+                //사용자별로 데이터를 가져온다.
+                var username = item.Key;
+                var userid = item.FirstOrDefault().uid;
+                List<string> rowdata = new List<string>();
+                rowdata.Add(username);
+               // rowdata.Add(item.FirstOrDefault().processs);
+
+                //이 사용자의 데이터를 날짜별로 정렬해서 가져온다.
+                var sum = 0.0;
+                for (int i = 1; i < this.dataGridView1.Columns.Count-1; i++)
+                {
+                    var col = this.dataGridView1.Columns[i];
+                    var daydata = dsReport.JobReportDay.Where(t => t.uid == userid && t.pdate.EndsWith(col.HeaderText)).FirstOrDefault();
+                    if (daydata != null)
+                    {
+                        sum += daydata.hrs + daydata.ot;
+                        rowdata.Add((daydata.hrs + daydata.ot).ToString("N1"));
+                    }
+                    else rowdata.Add("--");
+                }
+                rowdata.Add(sum.ToString("N1"));
+                this.dataGridView1.Rows.Add(rowdata.ToArray());
+            }
+            foreach(DataGridViewRow dvrow in this.dataGridView1.Rows)
+            {
+                for(int i = 1;i < this.dataGridView1.ColumnCount-1;i++)
+                {
+                    var cellvalue = "--";
+                    if(dvrow.Cells[i].Value != null) cellvalue=  dvrow.Cells[i].Value.ToString();
+                    if (cellvalue == "--") dvrow.Cells[i].Style.ForeColor = Color.Gray;
+                    else
+                    {
+                        var hrs = double.Parse(cellvalue);
+                        if (hrs > 8.0) dvrow.Cells[i].Style.ForeColor = Color.Blue;
+                        else if (hrs < 8.0) dvrow.Cells[i].Style.ForeColor = Color.Red;
+                        else dvrow.Cells[i].Style.ForeColor = Color.Black;
+                    }
+                }
+                
+            }
+            this.dataGridView1.AutoResizeColumns();
         }
         private void button1_Click(object sender, EventArgs e)
         {
             refrehData();
         }
+
+        private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (tbProcess.SelectedIndex >= 0) refrehData();
+        }
     }
 }

SubProject/FPJ0000/JobReport/rJobReportDay.resx

@@ -123,6 +123,9 @@
   <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>245, 17</value>
   </metadata>

SubProject/FPJ0000/Project/fPartList.cs

@@ -342,7 +342,7 @@ namespace FPJ0000
                        tbFind.BackColor = SystemColors.Window;
                     }
                 }
-                catch (Exception ex)
+                catch 
                 {
                     this.bsPart.Filter = "";
                     tbFind.BackColor = Color.HotPink;

SubProject/FPJ0000/Project/fProjectData.Designer.cs

@@ -47,6 +47,7 @@
             System.Windows.Forms.Label label8;
             System.Windows.Forms.Label label9;
             System.Windows.Forms.Label label5;
+            System.Windows.Forms.Label label7;
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tbIdx = new System.Windows.Forms.TextBox();
@@ -102,6 +103,7 @@
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.arLabel2 = new arCtl.arLabel();
             this.panel5 = new System.Windows.Forms.Panel();
+            this.textBox5 = new System.Windows.Forms.TextBox();
             this.textBox3 = new System.Windows.Forms.TextBox();
             this.arLabel3 = new arCtl.arLabel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -152,6 +154,7 @@
             label8 = new System.Windows.Forms.Label();
             label9 = new System.Windows.Forms.Label();
             label5 = new System.Windows.Forms.Label();
+            label7 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -338,6 +341,15 @@
             label5.TabIndex = 88;
             label5.Text = "분류";
             // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Location = new System.Drawing.Point(387, 62);
+            label7.Name = "label7";
+            label7.Size = new System.Drawing.Size(29, 12);
+            label7.TabIndex = 89;
+            label7.Text = "공정";
+            // 
             // tbIdx
             // 
             this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
@@ -944,6 +956,8 @@
             // panel5
             // 
             this.panel5.BackColor = System.Drawing.Color.Gainsboro;
+            this.panel5.Controls.Add(label7);
+            this.panel5.Controls.Add(this.textBox5);
             this.panel5.Controls.Add(label8);
             this.panel5.Controls.Add(this.textBox3);
             this.panel5.Controls.Add(this.arLabel3);
@@ -958,6 +972,15 @@
             this.panel5.Size = new System.Drawing.Size(547, 88);
             this.panel5.TabIndex = 85;
             // 
+            // textBox5
+            // 
+            this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userprocess", true));
+            this.textBox5.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.textBox5.Location = new System.Drawing.Point(423, 58);
+            this.textBox5.Name = "textBox5";
+            this.textBox5.Size = new System.Drawing.Size(113, 21);
+            this.textBox5.TabIndex = 90;
+            // 
             // textBox3
             // 
             this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true));
@@ -1626,5 +1649,6 @@
         private System.Windows.Forms.LinkLabel linkLabel3;
         private System.Windows.Forms.LinkLabel linkLabel5;
         private System.Windows.Forms.LinkLabel linkLabel4;
+        private System.Windows.Forms.TextBox textBox5;
     }
 }

SubProject/FPJ0000/Project/fProjectData.resx

@@ -171,6 +171,9 @@
   <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>100, 17</value>
   </metadata>

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -90,6 +90,7 @@
             this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
@@ -141,20 +142,21 @@
             this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.panel3 = new System.Windows.Forms.Panel();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+            this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbProcess = new System.Windows.Forms.ToolStripComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -516,6 +518,171 @@
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnCount = 18;
+            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "파트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "공정";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "요청";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "담당";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).ColumnSpan = 3;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "협업";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "자산번호";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "프로젝트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "대수";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Original\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).StyleName = " ";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Input\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Effect\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "CR/CF#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "비고";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "H/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "전장";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "S/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asset No.";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "CR/CF#";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
+            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType1.DecimalPlaces = 0;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType1.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
+            this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
+            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category";
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "part";
+            this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "reqstaff";
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userManager";
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usermain";
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "H/W";
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userhw2";
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "전장";
+            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usersub";
+            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "S/W";
+            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "asset";
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asset No.";
+            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F;
+            numberCellType2.DecimalPlaces = 0;
+            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType2.MaximumValue = 2147483647D;
+            numberCellType2.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "cnt";
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).Width = 59F;
+            numberCellType3.MaximumValue = 999999999999999D;
+            numberCellType3.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costo";
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType4.MaximumValue = 999999999999999D;
+            numberCellType4.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costn";
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType5.MaximumValue = 999999999999999D;
+            numberCellType5.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "coste";
+            this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "orderno";
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "CR/CF#";
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo";
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -540,6 +707,8 @@
             this.toolStripButton2,
             this.btViewDel,
             this.toolStripSeparator4,
+            this.toolStripLabel7,
+            this.cmbProcess,
             this.toolStripLabel5,
             this.cmbSort});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
@@ -557,6 +726,7 @@
             // cmbYearS
             // 
             this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbYearS.DropDownWidth = 70;
             this.cmbYearS.Name = "cmbYearS";
             this.cmbYearS.Size = new System.Drawing.Size(75, 27);
             // 
@@ -569,6 +739,7 @@
             // cmbYearE
             // 
             this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbYearE.DropDownWidth = 70;
             this.cmbYearE.Name = "cmbYearE";
             this.cmbYearE.Size = new System.Drawing.Size(75, 27);
             // 
@@ -677,7 +848,7 @@
             // 
             this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.tbRequest.Name = "tbRequest";
-            this.tbRequest.Size = new System.Drawing.Size(70, 27);
+            this.tbRequest.Size = new System.Drawing.Size(60, 27);
             this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown);
             // 
@@ -735,7 +906,7 @@
             "Requestor",
             "Process"});
             this.cmbSort.Name = "cmbSort";
-            this.cmbSort.Size = new System.Drawing.Size(100, 27);
+            this.cmbSort.Size = new System.Drawing.Size(80, 27);
             this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged);
             // 
             // label1
@@ -1084,170 +1255,27 @@
             this.panel3.Size = new System.Drawing.Size(1384, 218);
             this.panel3.TabIndex = 7;
             // 
-            // fpSpread1_Sheet1
+            // toolStripLabel7
             // 
-            this.fpSpread1_Sheet1.Reset();
+            this.toolStripLabel7.Name = "toolStripLabel7";
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            this.toolStripLabel7.Size = new System.Drawing.Size(31, 24);
-            // Formulas and custom names must be loaded with R1C1 reference style
+            this.toolStripLabel7.Text = "공정";
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            // 
-            this.fpSpread1_Sheet1.ColumnCount = 18;
+            // cmbProcess
-            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
+            // 
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.cmbProcess.Items.AddRange(new object[] {
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            "---",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
+            "Origin Cost",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+            "Input Cost",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
+            "Effect Cost",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
+            "Asset No",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
+            "Project",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "분류";
+            "Champion",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
+            "Requestor",
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "파트";
+            "Process"});
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
+            this.cmbProcess.Name = "cmbProcess";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "공정";
+            this.cmbProcess.Size = new System.Drawing.Size(80, 27);
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "요청";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "담당";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).ColumnSpan = 3;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "협업";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "자산번호";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "프로젝트";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "대수";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Original\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).StyleName = " ";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Input\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Effect\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "CR/CF#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "비고";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "H/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "전장";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "S/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asset No.";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "CR/CF#";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
-            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
-            this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "part";
-            this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "reqstaff";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userManager";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usermain";
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "H/W";
-            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userhw2";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "전장";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usersub";
-            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "S/W";
-            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "asset";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asset No.";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "cnt";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Width = 59F;
-            numberCellType3.MaximumValue = 999999999999999D;
-            numberCellType3.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costo";
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.MaximumValue = 999999999999999D;
-            numberCellType4.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costn";
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType5.MaximumValue = 999999999999999D;
-            numberCellType5.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "coste";
-            this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "orderno";
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "CR/CF#";
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo";
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
             // fProjectList
             // 
@@ -1269,6 +1297,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
@@ -1277,7 +1306,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.panel3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1379,5 +1407,7 @@
         private System.Windows.Forms.ToolStripLabel toolStripLabel6;
         private System.Windows.Forms.ToolStripComboBox cmbCate;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel7;
+        private System.Windows.Forms.ToolStripComboBox cmbProcess;
     }
 }

SubProject/FPJ0000/Project/fProjectList.cs

@@ -40,6 +40,15 @@ namespace FPJ0000
                 cmbCate.Items.Add(dr["Value"].ToString());
             cmbCate.SelectedIndex = 0;
 
+
+            this.cmbProcess.Items.Clear();
+            this.cmbProcess.Items.Add("전체");
+            var procesList = FCOMMON.DBM.getProcessList();
+            foreach (DataRow dr in procesList.Rows)
+                cmbProcess.Items.Add(dr["Value"].ToString());
+            cmbProcess.Text = FCOMMON.info.Login.process;
+            if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0;
+
             this.cmbSort.SelectedIndex = 0;
             this.cmbYearS.Items.Clear();
             this.cmbYearE.Items.Clear();
@@ -141,6 +150,7 @@ namespace FPJ0000
                "ISNULL(usersub, '') LIKE @username) ";
             if (state != "") State_where += " AND " + state;
             if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
+            if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(userprocess,'') = '" + cmbProcess.Text.Trim() + "'";
             string State_order = "ORDER BY (CASE " +
                 " WHEN ([status] = '진행') THEN '0' " +                
                 " WHEN ([status] = '검토') THEN '1' " +
@@ -344,6 +354,7 @@ namespace FPJ0000
                 if (newidx != null)
                 {
                     var newdr = this.dsMSSQL.Projects.Where(t => t.idx == newidx).FirstOrDefault();
+                    newdr.userprocess = FCOMMON.info.Login.process;
                     var f = new fProjectData(newdr);
                     if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
                     {
@@ -462,7 +473,7 @@ namespace FPJ0000
             {
                 taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx);
             }
-            catch (Exception ex)
+            catch 
             {
 
             }
@@ -488,6 +499,7 @@ namespace FPJ0000
             newdr.sdate = DateTime.Now.ToString("yyyy-MM-dd");
             newdr.userManager = FCOMMON.info.Login.nameK;
             newdr.progress = 0;
+            newdr.userprocess = FCOMMON.info.Login.process;
             newdr.costn = 0;
             newdr.costo = 0;
             newdr.cnt = 1;

SubProject/FPJ0000/dsPRJ.xsd

@@ -24,8 +24,8 @@ WHERE  (idx = @Original_idx)</CommandText>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>INSERT INTO Projects
                (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, 
-               progress, import, asset, isdel, path, userhw2, orderno, gcode, category)
+               progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess)
-VALUES  (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category);   
+VALUES  (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess);    
 SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -61,13 +61,14 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
                       <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, 
-               progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category
+               progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
 FROM     Projects
 WHERE  (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
                ISNULL(usermain, '') LIKE @username OR
@@ -87,7 +88,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
 SET        status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, 
                wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, 
                remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, 
-               orderno = @orderno, category = @category
+               orderno = @orderno, category = @category, userprocess = @userprocess
 WHERE  (idx = @Original_idx);    
 SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
                     <Parameters>
@@ -123,6 +124,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
                       <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -166,6 +168,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
               <Mapping SourceColumn="lasthistory" DataSetColumn="lasthistory" />
               <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
               <Mapping SourceColumn="category" DataSetColumn="category" />
+              <Mapping SourceColumn="userprocess" DataSetColumn="userprocess" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
@@ -189,7 +192,7 @@ WHERE  (import = 1) AND (gcode = @gcode)</CommandText>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT  asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, 
-               userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category
+               userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
 FROM     Projects
 WHERE  (idx = @idx)</CommandText>
                     <Parameters>
@@ -202,7 +205,7 @@ WHERE  (idx = @idx)</CommandText>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT  idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, 
-               progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category
+               progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
 FROM     Projects
 WHERE  (ISNULL(name, N'') LIKE @search OR
                ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)</CommandText>
@@ -1076,7 +1079,7 @@ WHERE (pidx = @pidx)</CommandText>
   <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ" msprop:Generator_UserDSName="dsPRJ">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
+        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1259,10 +1262,17 @@ WHERE (pidx = @pidx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="userprocess" msprop:Generator_ColumnVarNameInTable="columnuserprocess" msprop:Generator_ColumnPropNameInRow="userprocess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="userprocessColumn" msprop:Generator_UserColumnName="userprocess" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent">
+        <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_RowClassName="ProjectsIOMapRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1306,7 +1316,7 @@ WHERE (pidx = @pidx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent">
+        <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_RowClassName="ProjectsMailListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1351,7 +1361,7 @@ WHERE (pidx = @pidx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent">
+        <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_RowClassName="ProjectsPartRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1459,7 +1469,7 @@ WHERE (pidx = @pidx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent">
+        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1570,7 +1580,7 @@ WHERE (pidx = @pidx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsSchedule" msprop:Generator_TableClassName="ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableProjectsSchedule" msprop:Generator_RowChangedName="ProjectsScheduleRowChanged" msprop:Generator_TablePropName="ProjectsSchedule" msprop:Generator_RowDeletingName="ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsScheduleRowDeleted" msprop:Generator_RowClassName="ProjectsScheduleRow" msprop:Generator_UserTableName="ProjectsSchedule" msprop:Generator_RowEvArgName="ProjectsScheduleRowChangeEvent">
+        <xs:element name="ProjectsSchedule" msprop:Generator_TableClassName="ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableProjectsSchedule" msprop:Generator_TablePropName="ProjectsSchedule" msprop:Generator_RowDeletingName="ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsScheduleRowDeleted" msprop:Generator_UserTableName="ProjectsSchedule" msprop:Generator_RowChangedName="ProjectsScheduleRowChanged" msprop:Generator_RowEvArgName="ProjectsScheduleRowChangeEvent" msprop:Generator_RowClassName="ProjectsScheduleRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1604,7 +1614,7 @@ WHERE (pidx = @pidx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent">
+        <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_RowClassName="ProjectsHistoryRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />

SubProject/FPJ0000/dsPRJ.xss

@@ -6,7 +6,7 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Projects" ZOrder="8" X="70" Y="70" Height="362" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Projects" ZOrder="8" X="70" Y="70" Height="514" Width="275" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="389" />
     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="7" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:ProjectsMailList" ZOrder="6" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:ProjectsPart" ZOrder="5" X="974" Y="70" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />

SubProject/FPJ0000/dsReport.xsd

@@ -36,17 +36,18 @@ ORDER BY yymm</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobReportDayTableAdapter" GeneratorDataComponentClassName="JobReportDayTableAdapter" Name="JobReportDay" UserDataComponentName="JobReportDayTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  uid, dbo.getUserName(uid) AS uname, pdate, SUM(hrs) AS hrs, SUM(ot) AS ot
+                    <CommandText>SELECT  ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
-FROM     JobReport
+FROM     JobReport LEFT OUTER JOIN
-WHERE  (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid &lt;&gt; '') AND (gcode = @gcode)
+               Users ON JobReport.uid = Users.id
-GROUP BY uid, pdate
+WHERE  (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid &lt;&gt; '') AND (JobReport.gcode = @gcode)
-ORDER BY pdate, uname</CommandText>
+GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs
+ORDER BY processs, JobReport.pdate, uname</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="yymm" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yymm" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -58,6 +59,79 @@ ORDER BY pdate, uname</CommandText>
               <Mapping SourceColumn="pdate" DataSetColumn="pdate" />
               <Mapping SourceColumn="hrs" DataSetColumn="hrs" />
               <Mapping SourceColumn="ot" DataSetColumn="ot" />
+              <Mapping SourceColumn="processs" DataSetColumn="processs" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ProcessListTableAdapter" GeneratorDataComponentClassName="ProcessListTableAdapter" Name="ProcessList" UserDataComponentName="ProcessListTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  processs
+FROM     Users
+WHERE  (ISNULL(processs, N'') &lt;&gt; '') AND (gcode = @gcode)
+GROUP BY processs
+ORDER BY processs</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="processs" DataSetColumn="processs" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ProcessUserListTableAdapter" GeneratorDataComponentClassName="ProcessUserListTableAdapter" Name="ProcessUserList" UserDataComponentName="ProcessUserListTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_id" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  Users.id, Users.name
+FROM     Users RIGHT OUTER JOIN
+               JobReport ON Users.id = JobReport.uid
+WHERE  (Users.processs LIKE @process) AND (Users.id &lt;&gt; 'dev') AND (Users.id &lt;&gt; 'test')
+GROUP BY Users.id, Users.name
+ORDER BY Users.name</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="processs" DataSourceName="EE.dbo.Users" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@process" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="processs" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [Users] SET [id] = @id, [name] = @name WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)));
+SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name ORDER BY Users.name</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_id" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="id" DataSetColumn="id" />
+              <Mapping SourceColumn="name" DataSetColumn="name" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -72,7 +146,7 @@ ORDER BY pdate, uname</CommandText>
         <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm" minOccurs="0">
+              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="22" />
@@ -80,7 +154,7 @@ ORDER BY pdate, uname</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columntotal" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_UserColumnName="total" type="xs:int" minOccurs="0" />
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -102,21 +176,21 @@ ORDER BY pdate, uname</CommandText>
         <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="uname" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnuname" msprop:Generator_ColumnPropNameInRow="uname" msprop:Generator_ColumnPropNameInTable="unameColumn" msprop:Generator_UserColumnName="uname" minOccurs="0">
+              <xs:element name="uname" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="uname" msprop:Generator_ColumnVarNameInTable="columnuname" msprop:Generator_ColumnPropNameInTable="unameColumn" msprop:Generator_UserColumnName="uname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -125,6 +199,46 @@ ORDER BY pdate, uname</CommandText>
               </xs:element>
               <xs:element name="hrs" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
               <xs:element name="ot" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
+              <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -140,5 +254,13 @@ ORDER BY pdate, uname</CommandText>
       <xs:field xpath="mstns:uid" />
       <xs:field xpath="mstns:pdate" />
     </xs:unique>
+    <xs:unique name="ProcessList_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:ProcessList" />
+      <xs:field xpath="mstns:processs" />
+    </xs:unique>
+    <xs:unique name="ProcessUserList_Constraint1" msdata:ConstraintName="Constraint1">
+      <xs:selector xpath=".//mstns:ProcessUserList" />
+      <xs:field xpath="mstns:id" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

SubProject/FPJ0000/dsReport.xss

@@ -4,9 +4,12 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-1" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="191" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:jobReport" ZOrder="4" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
+    <Shape ID="DesignTable:JobReportDay" ZOrder="3" X="335" Y="164" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
+    <Shape ID="DesignTable:ProcessList" ZOrder="2" X="587" Y="65" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ProcessUserList" ZOrder="1" X="619" Y="303" Height="115" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors />
 </DiagramLayout>