license 목록에 s/n 값 추가, 내부 검색 기능 오류 슈정

Project/Properties/AssemblyInfo.cs

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

Project/_Common/fUserList.Designer.cs

@@ -79,8 +79,8 @@
 			this.btRef = new System.Windows.Forms.ToolStripButton();
 			this.textBox1 = new System.Windows.Forms.TextBox();
 			this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-			this.ta = new Project.dsMSSQLTableAdapters.vGroupUserTableAdapter();
 			this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+			this.ta = new Project.dsMSSQLTableAdapters.vGroupUserTableAdapter();
 			((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
 			this.bn.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -115,14 +115,14 @@
             this.btSave,
             this.toolStripSeparator1,
             this.btDevel});
-			this.bn.Location = new System.Drawing.Point(0, 774);
+			this.bn.Location = new System.Drawing.Point(0, 672);
 			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(1357, 39);
+			this.bn.Size = new System.Drawing.Size(1234, 39);
 			this.bn.TabIndex = 0;
 			this.bn.Text = "bindingNavigator1";
 			// 
@@ -324,7 +324,7 @@
             this.btRef});
 			this.toolStrip1.Location = new System.Drawing.Point(0, 0);
 			this.toolStrip1.Name = "toolStrip1";
-			this.toolStrip1.Size = new System.Drawing.Size(1357, 25);
+			this.toolStrip1.Size = new System.Drawing.Size(1234, 25);
 			this.toolStrip1.TabIndex = 2;
 			this.toolStrip1.Text = "toolStrip1";
 			// 
@@ -368,9 +368,9 @@
 			// 
 			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, 753);
+			this.textBox1.Location = new System.Drawing.Point(0, 651);
 			this.textBox1.Name = "textBox1";
-			this.textBox1.Size = new System.Drawing.Size(1357, 21);
+			this.textBox1.Size = new System.Drawing.Size(1234, 21);
 			this.textBox1.TabIndex = 3;
 			// 
 			// fpSpread1
@@ -390,7 +390,7 @@
 			this.fpSpread1.SelectionBlockOptions = ((FarPoint.Win.Spread.SelectionBlockOptions)((FarPoint.Win.Spread.SelectionBlockOptions.Rows | FarPoint.Win.Spread.SelectionBlockOptions.Sheet)));
 			this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
             this.fpSpread1_Sheet1});
-			this.fpSpread1.Size = new System.Drawing.Size(1357, 728);
+			this.fpSpread1.Size = new System.Drawing.Size(1234, 626);
 			this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Classic;
 			this.fpSpread1.TabIndex = 5;
 			this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton");
@@ -398,10 +398,6 @@
 			this.fpSpread1.VerticalScrollBar.Renderer = defaultScrollBarRenderer2;
 			this.fpSpread1.VisualStyles = FarPoint.Win.VisualStyles.Off;
 			// 
-			// ta
-			// 
-			this.ta.ClearBeforeFill = true;
-			// 
 			// fpSpread1_Sheet1
 			// 
 			this.fpSpread1_Sheet1.Reset();
@@ -524,11 +520,15 @@
 			this.fpSpread1_Sheet1.SheetCornerStyle.Parent = "RowHeaderDefault";
 			this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
 			// 
+			// ta
+			// 
+			this.ta.ClearBeforeFill = true;
+			// 
 			// fUserList
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1357, 813);
+			this.ClientSize = new System.Drawing.Size(1234, 711);
 			this.Controls.Add(this.fpSpread1);
 			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.toolStrip1);

SubProject/FCOMMON/DataBaseManager.cs

@@ -575,9 +575,12 @@ namespace FCOMMON
 			var retval = new sItemInfo();
 			retval.idx = -1;
 
-			string sql = "select [id],[name],([name] +'(' +[id] +')') as dispName,isnull([dept],'') as dept,isnull(grade,'') as grade,[email],[level],[tel],isnull(processs,'') as process,isnull(indate,'') as indate, isnull(outdate,'') as outdate " +
+			string sql = "select [id],[name],([name] +'(' +[id] +')') as dispName,isnull([dept],'') as dept,isnull(grade,'') as grade," +
-				" from vGroupUser " +
+				$" [email],[level],[tel], isnull(processs, '') as process,isnull(indate, '') as indate, isnull(outdate, '') as outdate " +
-				" where gcode='" + FCOMMON.info.Login.gcode + "' and  [id] <> 'dev' and isnull(outdate,'') = '' and useUserState = 1 order by [name]";
+				$" from vGroupUser " +
+				$" where gcode='{FCOMMON.info.Login.gcode}' and  [id] <> 'dev' and isnull(outdate,'') = '' and useUserState = 1 " +
+				$" order by[name]";
+
 			var cmd = new SqlCommand(sql, cn);
 			var da = new SqlDataAdapter(sql, cn);
 			var ds = new System.Data.DataSet();

SubProject/FED0000/EEDataSet.Designer.cs

@@ -828,6 +828,10 @@ namespace FED0000 {
             
             private global::System.Data.DataColumn columnVersion;
             
+            private global::System.Data.DataColumn columnSerialNo;
+            
+            private global::System.Data.DataColumn columnMeterialNo;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public EETGW_LicenseDataTable() {
@@ -973,6 +977,22 @@ namespace FED0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn SerialNoColumn {
+                get {
+                    return this.columnSerialNo;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn MeterialNoColumn {
+                get {
+                    return this.columnMeterialNo;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1010,7 +1030,7 @@ namespace FED0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public EETGW_LicenseRow AddEETGW_LicenseRow(string gcode, bool expire, string name, string manu, string Supply, int qty, string uids, string sdate, string edate, string wuid, System.DateTime wdate, string Remark, string Version) {
+            public EETGW_LicenseRow AddEETGW_LicenseRow(string gcode, bool expire, string name, string manu, string Supply, int qty, string uids, string sdate, string edate, string wuid, System.DateTime wdate, string Remark, string Version, string SerialNo, string MeterialNo) {
                 EETGW_LicenseRow rowEETGW_LicenseRow = ((EETGW_LicenseRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -1026,7 +1046,9 @@ namespace FED0000 {
                         wuid,
                         wdate,
                         Remark,
-                        Version};
+                        Version,
+                        SerialNo,
+                        MeterialNo};
                 rowEETGW_LicenseRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEETGW_LicenseRow);
                 return rowEETGW_LicenseRow;
@@ -1070,6 +1092,8 @@ namespace FED0000 {
                 this.columnwdate = base.Columns["wdate"];
                 this.columnRemark = base.Columns["Remark"];
                 this.columnVersion = base.Columns["Version"];
+                this.columnSerialNo = base.Columns["SerialNo"];
+                this.columnMeterialNo = base.Columns["MeterialNo"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1103,6 +1127,10 @@ namespace FED0000 {
                 base.Columns.Add(this.columnRemark);
                 this.columnVersion = new global::System.Data.DataColumn("Version", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnVersion);
+                this.columnSerialNo = new global::System.Data.DataColumn("SerialNo", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnSerialNo);
+                this.columnMeterialNo = new global::System.Data.DataColumn("MeterialNo", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMeterialNo);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -1124,6 +1152,8 @@ namespace FED0000 {
                 this.columnwdate.AllowDBNull = false;
                 this.columnRemark.MaxLength = 255;
                 this.columnVersion.MaxLength = 100;
+                this.columnSerialNo.MaxLength = 100;
+                this.columnMeterialNo.MaxLength = 20;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1863,6 +1893,38 @@ namespace FED0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string SerialNo {
+                get {
+                    if (this.IsSerialNoNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableEETGW_License.SerialNoColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_License.SerialNoColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string MeterialNo {
+                get {
+                    if (this.IsMeterialNoNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableEETGW_License.MeterialNoColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_License.MeterialNoColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsexpireNull() {
@@ -1982,6 +2044,30 @@ namespace FED0000 {
             public void SetVersionNull() {
                 this[this.tableEETGW_License.VersionColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsSerialNoNull() {
+                return this.IsNull(this.tableEETGW_License.SerialNoColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetSerialNoNull() {
+                this[this.tableEETGW_License.SerialNoColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsMeterialNoNull() {
+                return this.IsNull(this.tableEETGW_License.MeterialNoColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetMeterialNoNull() {
+                this[this.tableEETGW_License.MeterialNoColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -3104,10 +3190,12 @@ SELECT idx, gcode, sdate, edate, title, edutype, proposal, target, eduoffice, me
             tableMapping.ColumnMappings.Add("wdate", "wdate");
             tableMapping.ColumnMappings.Add("Remark", "Remark");
             tableMapping.ColumnMappings.Add("Version", "Version");
+            tableMapping.ColumnMappings.Add("SerialNo", "SerialNo");
+            tableMapping.ColumnMappings.Add("MeterialNo", "MeterialNo");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_License] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_License] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)) AND ((@IsNull_SerialNo = 1 AND [SerialNo] IS NULL) OR ([SerialNo] = @Original_SerialNo)) AND ((@IsNull_MeterialNo = 1 AND [MeterialNo] IS NULL) OR ([MeterialNo] = @Original_MeterialNo)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -3133,10 +3221,14 @@ SELECT idx, gcode, sdate, edate, title, edutype, proposal, target, eduoffice, me
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Version", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Version", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Version", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_SerialNo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SerialNo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SerialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SerialNo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_MeterialNo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MeterialNo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MeterialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MeterialNo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_License] ([gcode], [expire], [name], [manu], [Supply], [qty], [uids], [sdate], [edate], [Remark], [wuid], [wdate], [Version]) VALUES (@gcode, @expire, @name, @manu, @Supply, @qty, @uids, @sdate, @edate, @Remark, @wuid, @wdate, @Version);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_License] ([gcode], [expire], [name], [manu], [Supply], [qty], [uids], [sdate], [edate], [Remark], [wuid], [wdate], [Version], [SerialNo], [MeterialNo]) VALUES (@gcode, @expire, @name, @manu, @Supply, @qty, @uids, @sdate, @edate, @Remark, @wuid, @wdate, @Version, @SerialNo, @MeterialNo);
-SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version FROM EETGW_License WHERE (idx = SCOPE_IDENTITY()) ORDER BY expire, name, sdate";
+SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version, SerialNo, MeterialNo FROM EETGW_License WHERE (idx = SCOPE_IDENTITY()) ORDER BY expire, name, sdate";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@expire", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "expire", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3151,10 +3243,30 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Version", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SerialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SerialNo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MeterialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MeterialNo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_License] SET [gcode] = @gcode, [expire] = @expire, [name] = @name, [manu] = @manu, [Supply] = @Supply, [qty] = @qty, [uids] = @uids, [sdate] = @sdate, [edate] = @edate, [Remark] = @Remark, [wuid] = @wuid, [wdate] = @wdate, [Version] = @Version WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)));
+            this._adapter.UpdateCommand.CommandText = "UPDATE [EETGW_License] SET [gcode] = @gcode, [expire] = @expire, [name] = @name, " +
-SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version FROM EETGW_License WHERE (idx = @idx) ORDER BY expire, name, sdate";
+                "[manu] = @manu, [Supply] = @Supply, [qty] = @qty, [uids] = @uids, [sdate] = @sda" +
+                "te, [edate] = @edate, [Remark] = @Remark, [wuid] = @wuid, [wdate] = @wdate, [Ver" +
+                "sion] = @Version, [SerialNo] = @SerialNo, [MeterialNo] = @MeterialNo WHERE (([id" +
+                "x] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND" +
+                " [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND " +
+                "[name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] " +
+                "IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS " +
+                "NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL)" +
+                " OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uid" +
+                "s] = @Original_uids)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] =" +
+                " @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @O" +
+                "riginal_edate)) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @O" +
+                "riginal_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) A" +
+                "ND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Versio" +
+                "n)) AND ((@IsNull_SerialNo = 1 AND [SerialNo] IS NULL) OR ([SerialNo] = @Origina" +
+                "l_SerialNo)) AND ((@IsNull_MeterialNo = 1 AND [MeterialNo] IS NULL) OR ([Meteria" +
+                "lNo] = @Original_MeterialNo)));\r\nSELECT idx, gcode, expire, name, manu, Supply, " +
+                "qty, uids, sdate, edate, Remark, wuid, wdate, Version, SerialNo, MeterialNo FROM" +
+                " EETGW_License WHERE (idx = @idx) ORDER BY expire, name, sdate";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@expire", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "expire", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3169,6 +3281,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Version", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SerialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SerialNo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MeterialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MeterialNo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_expire", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "expire", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -3193,6 +3307,10 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Version", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Version", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Version", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_SerialNo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SerialNo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_SerialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SerialNo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_MeterialNo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MeterialNo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MeterialNo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MeterialNo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
@@ -3210,8 +3328,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT  idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, " +
-                "wuid, wdate, Version\r\nFROM     EETGW_License\r\nWHERE  (gcode = @gcode)\r\nORDER BY " +
+                "wuid, wdate, Version, SerialNo, MeterialNo\r\nFROM     EETGW_License\r\nWHERE  (gcod" +
-                "expire, name, sdate";
+                "e = @gcode)\r\nORDER BY expire, name, sdate";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
@@ -3285,7 +3403,23 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable<bool> Original_expire, string Original_name, string Original_manu, string Original_Supply, global::System.Nullable<int> Original_qty, string Original_uids, string Original_sdate, string Original_edate, string Original_Remark, string Original_wuid, System.DateTime Original_wdate, string Original_Version) {
+        public virtual int Delete(
+                    int Original_idx, 
+                    string Original_gcode, 
+                    global::System.Nullable<bool> Original_expire, 
+                    string Original_name, 
+                    string Original_manu, 
+                    string Original_Supply, 
+                    global::System.Nullable<int> Original_qty, 
+                    string Original_uids, 
+                    string Original_sdate, 
+                    string Original_edate, 
+                    string Original_Remark, 
+                    string Original_wuid, 
+                    System.DateTime Original_wdate, 
+                    string Original_Version, 
+                    string Original_SerialNo, 
+                    string Original_MeterialNo) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
@@ -3380,6 +3514,22 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                 this.Adapter.DeleteCommand.Parameters[22].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[23].Value = ((string)(Original_Version));
             }
+            if ((Original_SerialNo == null)) {
+                this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[25].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[25].Value = ((string)(Original_SerialNo));
+            }
+            if ((Original_MeterialNo == null)) {
+                this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[27].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[27].Value = ((string)(Original_MeterialNo));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -3400,7 +3550,7 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string gcode, global::System.Nullable<bool> expire, string name, string manu, string Supply, global::System.Nullable<int> qty, string uids, string sdate, string edate, string Remark, string wuid, System.DateTime wdate, string Version) {
+        public virtual int Insert(string gcode, global::System.Nullable<bool> expire, string name, string manu, string Supply, global::System.Nullable<int> qty, string uids, string sdate, string edate, string Remark, string wuid, System.DateTime wdate, string Version, string SerialNo, string MeterialNo) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
             }
@@ -3474,6 +3624,18 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             else {
                 this.Adapter.InsertCommand.Parameters[12].Value = ((string)(Version));
             }
+            if ((SerialNo == null)) {
+                this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[13].Value = ((string)(SerialNo));
+            }
+            if ((MeterialNo == null)) {
+                this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[14].Value = ((string)(MeterialNo));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -3508,6 +3670,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                     string wuid, 
                     System.DateTime wdate, 
                     string Version, 
+                    string SerialNo, 
+                    string MeterialNo, 
                     int Original_idx, 
                     string Original_gcode, 
                     global::System.Nullable<bool> Original_expire, 
@@ -3522,6 +3686,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
                     string Original_Version, 
+                    string Original_SerialNo, 
+                    string Original_MeterialNo, 
                     int idx) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
@@ -3596,101 +3762,129 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             else {
                 this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Version));
             }
-            this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx));
+            if ((SerialNo == null)) {
+                this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(SerialNo));
+            }
+            if ((MeterialNo == null)) {
+                this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(MeterialNo));
+            }
+            this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_gcode));
             }
             if ((Original_expire.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_expire.Value));
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(Original_expire.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
-            }
-            if ((Original_name == null)) {
                 this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
             }
-            else {
+            if ((Original_name == null)) {
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_name));
-            }
-            if ((Original_manu == null)) {
                 this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_manu));
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_name));
             }
-            if ((Original_Supply == null)) {
+            if ((Original_manu == null)) {
                 this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_Supply));
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_manu));
             }
-            if ((Original_qty.HasValue == true)) {
+            if ((Original_Supply == null)) {
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_qty.Value));
-            }
-            else {
                 this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
             }
-            if ((Original_uids == null)) {
+            else {
+                this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_Supply));
+            }
+            if ((Original_qty.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_qty.Value));
+            }
+            else {
                 this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value;
             }
-            else {
+            if ((Original_uids == null)) {
-                this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_uids));
-            }
-            if ((Original_sdate == null)) {
                 this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_sdate));
+                this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_uids));
             }
-            if ((Original_edate == null)) {
+            if ((Original_sdate == null)) {
                 this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_edate));
+                this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_sdate));
             }
-            if ((Original_Remark == null)) {
+            if ((Original_edate == null)) {
                 this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_Remark));
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_edate));
+            }
+            if ((Original_Remark == null)) {
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_Remark));
             }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[34].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(Original_wdate));
             if ((Original_Version == null)) {
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_Version));
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_Version));
             }
-            this.Adapter.UpdateCommand.Parameters[37].Value = ((int)(idx));
+            if ((Original_SerialNo == null)) {
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_SerialNo));
+            }
+            if ((Original_MeterialNo == null)) {
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_MeterialNo));
+            }
+            this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(idx));
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -3725,6 +3919,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                     string wuid, 
                     System.DateTime wdate, 
                     string Version, 
+                    string SerialNo, 
+                    string MeterialNo, 
                     int Original_idx, 
                     string Original_gcode, 
                     global::System.Nullable<bool> Original_expire, 
@@ -3738,8 +3934,10 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                     string Original_Remark, 
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
-                    string Original_Version) {
+                    string Original_Version, 
-            return this.Update(gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version, Original_idx, Original_gcode, Original_expire, Original_name, Original_manu, Original_Supply, Original_qty, Original_uids, Original_sdate, Original_edate, Original_Remark, Original_wuid, Original_wdate, Original_Version, Original_idx);
+                    string Original_SerialNo, 
+                    string Original_MeterialNo) {
+            return this.Update(gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version, SerialNo, MeterialNo, Original_idx, Original_gcode, Original_expire, Original_name, Original_manu, Original_Supply, Original_qty, Original_uids, Original_sdate, Original_edate, Original_Remark, Original_wuid, Original_wdate, Original_Version, Original_SerialNo, Original_MeterialNo, Original_idx);
         }
     }
     

SubProject/FED0000/EEDataSet.xsd

@@ -160,7 +160,7 @@ SELECT idx, gcode, sdate, edate, title, edutype, proposal, target, eduoffice, me
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_License" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [EETGW_License] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)))</CommandText>
+                    <CommandText>DELETE FROM [EETGW_License] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)) AND ((@IsNull_SerialNo = 1 AND [SerialNo] IS NULL) OR ([SerialNo] = @Original_SerialNo)) AND ((@IsNull_MeterialNo = 1 AND [MeterialNo] IS NULL) OR ([MeterialNo] = @Original_MeterialNo)))</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="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -186,13 +186,17 @@ SELECT idx, gcode, sdate, edate, title, edutype, proposal, target, eduoffice, me
                       <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_Version" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Version" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Version" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Version" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SerialNo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SerialNo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SerialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SerialNo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_MeterialNo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="MeterialNo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_MeterialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="MeterialNo" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [EETGW_License] ([gcode], [expire], [name], [manu], [Supply], [qty], [uids], [sdate], [edate], [Remark], [wuid], [wdate], [Version]) VALUES (@gcode, @expire, @name, @manu, @Supply, @qty, @uids, @sdate, @edate, @Remark, @wuid, @wdate, @Version);
+                    <CommandText>INSERT INTO [EETGW_License] ([gcode], [expire], [name], [manu], [Supply], [qty], [uids], [sdate], [edate], [Remark], [wuid], [wdate], [Version], [SerialNo], [MeterialNo]) VALUES (@gcode, @expire, @name, @manu, @Supply, @qty, @uids, @sdate, @edate, @Remark, @wuid, @wdate, @Version, @SerialNo, @MeterialNo);
-SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version FROM EETGW_License WHERE (idx = SCOPE_IDENTITY()) ORDER BY expire, name, sdate</CommandText>
+SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version, SerialNo, MeterialNo FROM EETGW_License WHERE (idx = SCOPE_IDENTITY()) ORDER BY expire, name, sdate</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@expire" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="expire" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -207,12 +211,14 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                       <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="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Version" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Version" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SerialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SerialNo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@MeterialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="MeterialNo" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version
+                    <CommandText>SELECT  idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version, SerialNo, MeterialNo
 FROM     EETGW_License
 WHERE  (gcode = @gcode)
 ORDER BY expire, name, sdate</CommandText>
@@ -223,8 +229,8 @@ ORDER BY expire, name, sdate</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [EETGW_License] SET [gcode] = @gcode, [expire] = @expire, [name] = @name, [manu] = @manu, [Supply] = @Supply, [qty] = @qty, [uids] = @uids, [sdate] = @sdate, [edate] = @edate, [Remark] = @Remark, [wuid] = @wuid, [wdate] = @wdate, [Version] = @Version WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)));
+                    <CommandText>UPDATE [EETGW_License] SET [gcode] = @gcode, [expire] = @expire, [name] = @name, [manu] = @manu, [Supply] = @Supply, [qty] = @qty, [uids] = @uids, [sdate] = @sdate, [edate] = @edate, [Remark] = @Remark, [wuid] = @wuid, [wdate] = @wdate, [Version] = @Version, [SerialNo] = @SerialNo, [MeterialNo] = @MeterialNo WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_expire = 1 AND [expire] IS NULL) OR ([expire] = @Original_expire)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_Supply = 1 AND [Supply] IS NULL) OR ([Supply] = @Original_Supply)) AND ((@IsNull_qty = 1 AND [qty] IS NULL) OR ([qty] = @Original_qty)) AND ((@IsNull_uids = 1 AND [uids] IS NULL) OR ([uids] = @Original_uids)) 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_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Version = 1 AND [Version] IS NULL) OR ([Version] = @Original_Version)) AND ((@IsNull_SerialNo = 1 AND [SerialNo] IS NULL) OR ([SerialNo] = @Original_SerialNo)) AND ((@IsNull_MeterialNo = 1 AND [MeterialNo] IS NULL) OR ([MeterialNo] = @Original_MeterialNo)));
-SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version FROM EETGW_License WHERE (idx = @idx) ORDER BY expire, name, sdate</CommandText>
+SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark, wuid, wdate, Version, SerialNo, MeterialNo FROM EETGW_License WHERE (idx = @idx) ORDER BY expire, name, sdate</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@expire" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="expire" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -239,6 +245,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                       <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="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Version" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Version" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SerialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SerialNo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@MeterialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="MeterialNo" 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="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_expire" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="expire" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -263,6 +271,10 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                       <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_Version" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Version" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Version" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Version" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SerialNo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SerialNo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SerialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SerialNo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_MeterialNo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="MeterialNo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_MeterialNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="MeterialNo" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_License" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -284,6 +296,8 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="Remark" DataSetColumn="Remark" />
               <Mapping SourceColumn="Version" DataSetColumn="Version" />
+              <Mapping SourceColumn="SerialNo" DataSetColumn="SerialNo" />
+              <Mapping SourceColumn="MeterialNo" DataSetColumn="MeterialNo" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -295,7 +309,7 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
   <xs:element name="EEDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="EEDataSet" msprop:Generator_UserDSName="EEDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="EETGW_EducationList" msprop:Generator_TableClassName="EETGW_EducationListDataTable" msprop:Generator_TableVarName="tableEETGW_EducationList" msprop:Generator_RowChangedName="EETGW_EducationListRowChanged" msprop:Generator_TablePropName="EETGW_EducationList" msprop:Generator_RowDeletingName="EETGW_EducationListRowDeleting" msprop:Generator_RowChangingName="EETGW_EducationListRowChanging" msprop:Generator_RowEvHandlerName="EETGW_EducationListRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_EducationListRowDeleted" msprop:Generator_RowClassName="EETGW_EducationListRow" msprop:Generator_UserTableName="EETGW_EducationList" msprop:Generator_RowEvArgName="EETGW_EducationListRowChangeEvent">
+        <xs:element name="EETGW_EducationList" msprop:Generator_TableClassName="EETGW_EducationListDataTable" msprop:Generator_TableVarName="tableEETGW_EducationList" msprop:Generator_TablePropName="EETGW_EducationList" msprop:Generator_RowDeletingName="EETGW_EducationListRowDeleting" msprop:Generator_RowChangingName="EETGW_EducationListRowChanging" msprop:Generator_RowEvHandlerName="EETGW_EducationListRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_EducationListRowDeleted" msprop:Generator_UserTableName="EETGW_EducationList" msprop:Generator_RowChangedName="EETGW_EducationListRowChanged" msprop:Generator_RowEvArgName="EETGW_EducationListRowChangeEvent" msprop:Generator_RowClassName="EETGW_EducationListRow">
           <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" />
@@ -383,7 +397,7 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_License" msprop:Generator_TableClassName="EETGW_LicenseDataTable" msprop:Generator_TableVarName="tableEETGW_License" msprop:Generator_RowChangedName="EETGW_LicenseRowChanged" msprop:Generator_TablePropName="EETGW_License" msprop:Generator_RowDeletingName="EETGW_LicenseRowDeleting" msprop:Generator_RowChangingName="EETGW_LicenseRowChanging" msprop:Generator_RowEvHandlerName="EETGW_LicenseRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_LicenseRowDeleted" msprop:Generator_RowClassName="EETGW_LicenseRow" msprop:Generator_UserTableName="EETGW_License" msprop:Generator_RowEvArgName="EETGW_LicenseRowChangeEvent">
+        <xs:element name="EETGW_License" msprop:Generator_TableClassName="EETGW_LicenseDataTable" msprop:Generator_TableVarName="tableEETGW_License" msprop:Generator_TablePropName="EETGW_License" msprop:Generator_RowDeletingName="EETGW_LicenseRowDeleting" msprop:Generator_RowChangingName="EETGW_LicenseRowChanging" msprop:Generator_RowEvHandlerName="EETGW_LicenseRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_LicenseRowDeleted" msprop:Generator_UserTableName="EETGW_License" msprop:Generator_RowChangedName="EETGW_LicenseRowChanged" msprop:Generator_RowEvArgName="EETGW_LicenseRowChangeEvent" msprop:Generator_RowClassName="EETGW_LicenseRow">
           <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" />
@@ -460,6 +474,20 @@ SELECT idx, gcode, expire, name, manu, Supply, qty, uids, sdate, edate, Remark,
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="SerialNo" msprop:Generator_ColumnVarNameInTable="columnSerialNo" msprop:Generator_ColumnPropNameInRow="SerialNo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="SerialNoColumn" msprop:Generator_UserColumnName="SerialNo" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="MeterialNo" msprop:Generator_ColumnVarNameInTable="columnMeterialNo" msprop:Generator_ColumnPropNameInRow="MeterialNo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="MeterialNoColumn" msprop:Generator_UserColumnName="MeterialNo" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FED0000/FED0000.csproj

@@ -35,9 +35,14 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="arControl.Net4, Version=18.7.27.1500, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\arControl.Net4.dll</HintPath>
+    </Reference>
     <Reference Include="ArSetting.Net4">
       <HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
     </Reference>
+    <Reference Include="CarlosAg.ExcelXmlWriter, Version=1.0.0.6, Culture=neutral, PublicKeyToken=null" />
     <Reference Include="FarPoint.CalcEngine, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457" />
     <Reference Include="FarPoint.Excel, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457" />
     <Reference Include="FarPoint.Localization, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457" />

SubProject/FED0000/License/fLicenseList.Designer.cs

@@ -28,20 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
+			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLicenseList));
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            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();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
 			this.dsPurchase = new FED0000.EEDataSet();
-            this.bs = new System.Windows.Forms.BindingSource();
+			this.bs = new System.Windows.Forms.BindingSource(this.components);
 			this.tam = new FED0000.EEDataSetTableAdapters.TableAdapterManager();
-            this.bn = new System.Windows.Forms.BindingNavigator();
+			this.bn = new System.Windows.Forms.BindingNavigator(this.components);
 			this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
 			this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
 			this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
@@ -61,13 +53,7 @@
 			this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
 			this.tbFind = new System.Windows.Forms.ToolStripTextBox();
 			this.btFind = new System.Windows.Forms.ToolStripButton();
-            this.cm1 = new System.Windows.Forms.ContextMenuStrip();
+			this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
 			this.exportDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
 			this.btSearch = new System.Windows.Forms.ToolStripButton();
@@ -75,16 +61,25 @@
 			this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
 			this.label1 = new System.Windows.Forms.Label();
 			this.ta = new FED0000.EEDataSetTableAdapters.EETGW_LicenseTableAdapter();
-            this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+			this.dv1 = new arCtl.arDatagridView();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+			this.expireDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.versionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MeterialNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.supplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.qtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.uidsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.SerialNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.sdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.manuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
 			this.bn.SuspendLayout();
 			this.cm1.SuspendLayout();
 			this.toolStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
 			this.SuspendLayout();
 			// 
 			// dsPurchase
@@ -300,59 +295,9 @@
 			// 
 			this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F);
 			this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.columnSizeToolStripMenuItem,
-            this.toolStripMenuItem3,
             this.exportDataToolStripMenuItem});
 			this.cm1.Name = "contextMenuStrip1";
-            this.cm1.Size = new System.Drawing.Size(314, 94);
+			this.cm1.Size = new System.Drawing.Size(314, 46);
-            // 
-            // columnSizeToolStripMenuItem
-            // 
-            this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.autoToolStripMenuItem,
-            this.resetToolStripMenuItem,
-            this.saveToolStripMenuItem,
-            this.loadToolStripMenuItem});
-            this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem";
-            this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(313, 42);
-            this.columnSizeToolStripMenuItem.Text = "Column Size";
-            // 
-            // autoToolStripMenuItem
-            // 
-            this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image")));
-            this.autoToolStripMenuItem.Name = "autoToolStripMenuItem";
-            this.autoToolStripMenuItem.Size = new System.Drawing.Size(159, 42);
-            this.autoToolStripMenuItem.Text = "Auto";
-            this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click);
-            // 
-            // resetToolStripMenuItem
-            // 
-            this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image")));
-            this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
-            this.resetToolStripMenuItem.Size = new System.Drawing.Size(159, 42);
-            this.resetToolStripMenuItem.Text = "Reset";
-            this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
-            // 
-            // saveToolStripMenuItem
-            // 
-            this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
-            this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(159, 42);
-            this.saveToolStripMenuItem.Text = "Save";
-            this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
-            // 
-            // loadToolStripMenuItem
-            // 
-            this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image")));
-            this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            this.loadToolStripMenuItem.Size = new System.Drawing.Size(159, 42);
-            this.loadToolStripMenuItem.Text = "Load";
-            this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
-            // 
-            // toolStripMenuItem3
-            // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(310, 6);
 			// 
 			// exportDataToolStripMenuItem
 			// 
@@ -414,109 +359,121 @@
 			// 
 			this.ta.ClearBeforeFill = true;
 			// 
-            // fpSpread1
+			// dv1
 			// 
-            this.fpSpread1.AccessibleDescription = "fpSpread1, Sheet1";
+			this.dv1.A_DelCurrentCell = true;
-            this.fpSpread1.ContextMenuStrip = this.cm1;
+			this.dv1.A_EnterToTab = true;
-            this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dv1.A_KoreanField = null;
-            this.fpSpread1.Location = new System.Drawing.Point(0, 37);
+			this.dv1.A_UpperField = null;
-            this.fpSpread1.Name = "fpSpread1";
+			this.dv1.A_ViewRownumOnHeader = true;
-            this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
+			this.dv1.AllowUserToAddRows = false;
-            this.fpSpread1_Sheet1});
+			this.dv1.AutoGenerateColumns = false;
-            this.fpSpread1.Size = new System.Drawing.Size(1244, 585);
+			this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-            this.fpSpread1.TabIndex = 4;
+			this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
+			this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.expireDataGridViewCheckBoxColumn,
+            this.nameDataGridViewTextBoxColumn,
+            this.versionDataGridViewTextBoxColumn,
+            this.MeterialNo,
+            this.supplyDataGridViewTextBoxColumn,
+            this.qtyDataGridViewTextBoxColumn,
+            this.uidsDataGridViewTextBoxColumn,
+            this.SerialNo,
+            this.remarkDataGridViewTextBoxColumn,
+            this.sdateDataGridViewTextBoxColumn,
+            this.manuDataGridViewTextBoxColumn});
+			this.dv1.ContextMenuStrip = this.cm1;
+			this.dv1.DataSource = this.bs;
+			this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dv1.Location = new System.Drawing.Point(0, 37);
+			this.dv1.Name = "dv1";
+			this.dv1.RowTemplate.Height = 23;
+			this.dv1.Size = new System.Drawing.Size(1244, 585);
+			this.dv1.TabIndex = 7;
 			// 
-            // fpSpread1_Sheet1
+			// expireDataGridViewCheckBoxColumn
 			// 
-            this.fpSpread1_Sheet1.Reset();
+			this.expireDataGridViewCheckBoxColumn.DataPropertyName = "expire";
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+			this.expireDataGridViewCheckBoxColumn.HeaderText = "만료";
-            // Formulas and custom names must be loaded with R1C1 reference style
+			this.expireDataGridViewCheckBoxColumn.Name = "expireDataGridViewCheckBoxColumn";
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+			this.expireDataGridViewCheckBoxColumn.Width = 35;
-            this.fpSpread1_Sheet1.ColumnCount = 9;
+			// 
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+			// nameDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+			// 
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+			this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "만료";
+			this.nameDataGridViewTextBoxColumn.HeaderText = "품명";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "이름";
+			this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "버젼";
+			this.nameDataGridViewTextBoxColumn.Width = 54;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "제조사";
+			// 
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "공급처";
+			// versionDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "수량";
+			// 
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "실사용자";
+			this.versionDataGridViewTextBoxColumn.DataPropertyName = "Version";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "구매일";
+			this.versionDataGridViewTextBoxColumn.HeaderText = "버젼";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "비고";
+			this.versionDataGridViewTextBoxColumn.Name = "versionDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 40F;
+			this.versionDataGridViewTextBoxColumn.Width = 54;
-            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
+			// MeterialNo
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "expire";
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			this.MeterialNo.DataPropertyName = "MeterialNo";
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "만료";
+			this.MeterialNo.HeaderText = "SID";
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			this.MeterialNo.Name = "MeterialNo";
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+			this.MeterialNo.Width = 49;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name";
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+			// supplyDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "이름";
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			this.supplyDataGridViewTextBoxColumn.DataPropertyName = "Supply";
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F;
+			this.supplyDataGridViewTextBoxColumn.HeaderText = "공급";
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+			this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Version";
+			this.supplyDataGridViewTextBoxColumn.Width = 54;
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "버젼";
+			// qtyDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 122F;
+			this.qtyDataGridViewTextBoxColumn.DataPropertyName = "qty";
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
+			this.qtyDataGridViewTextBoxColumn.HeaderText = "수량";
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "manu";
+			this.qtyDataGridViewTextBoxColumn.Name = "qtyDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			this.qtyDataGridViewTextBoxColumn.Width = 54;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "제조사";
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			// uidsDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
+			this.uidsDataGridViewTextBoxColumn.DataPropertyName = "uids";
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "Supply";
+			this.uidsDataGridViewTextBoxColumn.HeaderText = "사용자";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			this.uidsDataGridViewTextBoxColumn.Name = "uidsDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "공급처";
+			this.uidsDataGridViewTextBoxColumn.Width = 66;
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F;
+			// SerialNo
-            numberCellType1.DecimalPlaces = 0;
+			// 
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+			this.SerialNo.DataPropertyName = "SerialNo";
-            numberCellType1.MaximumValue = 2147483647D;
+			this.SerialNo.HeaderText = "S/N";
-            numberCellType1.MinimumValue = -2147483648D;
+			this.SerialNo.Name = "SerialNo";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1;
+			this.SerialNo.Width = 53;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "qty";
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			// remarkDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "수량";
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			this.remarkDataGridViewTextBoxColumn.DataPropertyName = "Remark";
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F;
+			this.remarkDataGridViewTextBoxColumn.HeaderText = "비고";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+			this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "uids";
+			this.remarkDataGridViewTextBoxColumn.Width = 54;
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "실사용자";
+			// sdateDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F;
+			this.sdateDataGridViewTextBoxColumn.DataPropertyName = "sdate";
-            this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+			this.sdateDataGridViewTextBoxColumn.HeaderText = "구매일";
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+			this.sdateDataGridViewTextBoxColumn.Name = "sdateDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "sdate";
+			this.sdateDataGridViewTextBoxColumn.Width = 66;
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "구매일";
+			// manuDataGridViewTextBoxColumn
-            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+			// 
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F;
+			this.manuDataGridViewTextBoxColumn.DataPropertyName = "manu";
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+			this.manuDataGridViewTextBoxColumn.HeaderText = "제조";
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Remark";
+			this.manuDataGridViewTextBoxColumn.Name = "manuDataGridViewTextBoxColumn";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+			this.manuDataGridViewTextBoxColumn.Width = 54;
-            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 = 249F;
-            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;
 			// 
 			// fLicenseList
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(1244, 670);
-            this.Controls.Add(this.fpSpread1);
+			this.Controls.Add(this.dv1);
 			this.Controls.Add(this.label1);
 			this.Controls.Add(this.toolStrip1);
 			this.Controls.Add(this.bn);
@@ -532,8 +489,7 @@
 			this.cm1.ResumeLayout(false);
 			this.toolStrip1.ResumeLayout(false);
 			this.toolStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
@@ -564,21 +520,25 @@
         private System.Windows.Forms.ToolStripLabel toolStripLabel2;
         private System.Windows.Forms.ToolStripTextBox tbFind;
         private System.Windows.Forms.ToolStripButton btFind;
-        private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem autoToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton btEdit;
         private System.Windows.Forms.ToolStripMenuItem exportDataToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
-        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
         private System.Windows.Forms.ToolStripButton btCopy;
         private System.Windows.Forms.ToolStripButton toolStripButton2;
         private System.Windows.Forms.Label label1;
         private EEDataSetTableAdapters.EETGW_LicenseTableAdapter ta;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private FarPoint.Win.Spread.FpSpread fpSpread1;
+		private arCtl.arDatagridView dv1;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn expireDataGridViewCheckBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn versionDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn MeterialNo;
+		private System.Windows.Forms.DataGridViewTextBoxColumn supplyDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn qtyDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn uidsDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn SerialNo;
+		private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn sdateDataGridViewTextBoxColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn manuDataGridViewTextBoxColumn;
 	}
 }

SubProject/FED0000/License/fLicenseList.cs

@@ -72,7 +72,7 @@ namespace FED0000
 			{
 
 				this.ta.Fill(this.dsPurchase.EETGW_License, FCOMMON.info.Login.gcode);
-                FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
+				//FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
 			}
 			catch (System.Exception ex)
 			{
@@ -164,8 +164,19 @@ namespace FED0000
 
 		private void btFind_Click(object sender, EventArgs e)
 		{
+			var dv = this.dv1;
+			var cols = new List<string>();
+			foreach (DataGridViewColumn col in dv.Columns)
+			{
+				if (col.Visible == false || col.DataPropertyName.isEmpty()) continue;
+				if (col.ValueType == typeof(bool)) continue;
+				if (col.ValueType == typeof(Int32)) continue;
+				cols.Add(col.DataPropertyName);
+			}
+
 			var search = tbFind.Text.Trim();
 			search = search.Replace("*", "x");
+			string filter = string.Empty;
 			if (tbFind.Text != search) tbFind.Text = search;
 			try
 			{
@@ -176,16 +187,10 @@ namespace FED0000
 				}
 				else
 				{
-                    var cols = new List<string>();
-                    cols.Add("title like ?");
-                    cols.Add("proposal like ?");
-                    cols.Add("target like ?");
-                    cols.Add("eduoffice like ?");
-                    cols.Add("location like ?");
-
 					search = search.Replace("'", "''");
-                    string filter = string.Join(" or ", cols.ToArray());
+					filter = string.Join(" like ? or ", cols.ToArray());
 					filter = filter.Replace("?", "'%" + search + "%'");
+					filter += " like '%" + search + "%'";
 					this.bs.Filter = filter;
 					tbFind.BackColor = Color.Lime;
 				}
@@ -195,7 +200,7 @@ namespace FED0000
 			catch (Exception ex)
 			{
 				this.tbFind.BackColor = Color.Tomato;
-                FCOMMON.Util.MsgE(ex.Message);
+				FCOMMON.Util.MsgE(ex.Message + "\n"  + filter);
 			}
 		}
 
@@ -216,7 +221,7 @@ namespace FED0000
 
 		private void autoToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-            FCOMMON.Util.FPColSizeAuto(this.fpSpread1);
+			//  FCOMMON.Util.FPColSizeAuto(this.fpSpread1);
 			//this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true;
 
 			//for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
@@ -226,20 +231,20 @@ namespace FED0000
 
 		private void resetToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-            foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns)
+			//foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns)
-            {
+			//{
-                col.Width = 100;
+			//    col.Width = 100;
-            }
+			//}
 		}
 
 		private void saveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
+		{//
-            FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize);
+		 // FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize);
 		}
 
 		private void loadToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-            FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
+			// FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
 		}
 
 		private void toolStripButton2_Click(object sender, EventArgs e)
@@ -301,15 +306,16 @@ namespace FED0000
 		private void exportDataToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			SaveFileDialog sd = new SaveFileDialog();
-            sd.Filter = "excel|*.xls";
+			sd.Filter = "csv|*.csv";
-            sd.FileName = "edulist.xls";
+			sd.FileName = "edulist.csv";
 			if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
 			{
-                fpSpread1.SaveExcel(sd.FileName,
+				dv1.ExportData(sd.FileName, false);
-                    FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+				//fpSpread1.SaveExcel(sd.FileName,
-                    | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+				//    FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
-                    | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+				//    | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
-                    | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+				//    | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+				//    | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
 				FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName);
 			}
 

SubProject/FED0000/License/fLicenseList.resx

@@ -220,18 +220,18 @@
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKWSURBVDhPzZNdSFNhGMdfSfq48qouSpSgi9KsbDqlDINA
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKYSURBVDhPzZNbSFNxHMf/knR58qmgC0rQQ2lWNp1Shg+R
-        vOtKhZIiJSu1NBMhk/zCnErqaC2p0JabmZ+FJWmBKJSmqVutWn6ESxOnuTO3ebadnXP+nc1TLejCyx7O
+        +BZ0hZKkJCu1VipCJnnDnErqcF6o0JabmtfEsiuIQmmam9aq5SVcmjjNbW7zbDs753w7m6da0IOP/Thf
-        n3Pew/n9nue5OOT/qE/PJFpjTwLzrTfJJ4nMZHf09FT7vm3TLZKAv/JSEtDXF+sv4oToWqROnucA8MLl
+        zvkfzufz+/0eDvk/6tNj0bC+6wj97ekxrxylx7oiJsZbd22YaBL5/ZWXIr/u7ihfASdE3SB2cBwLgOMv
-        ydqz27GIub501+xgivNX5kezHcbBHKPh6cFEESdE3xlp4VkHnHPVWP0qx+pMA2hjG3g3Jbjs4FmbkJW1
+        d5afXfY5THcnOqf64hy/MjMksev7UvS6jr0nBJwQbXuYmWPscEyXYOmrDEuTtaD0LeBcJt5lA8dY+Swu
-        s9sM2r7iMnRI9SJOyERTuJVjVgRYAfvULVg/FmN5OB2LI5mgPpSBel8ESpsP83iekBxhMhMmOiJsIi4I
+        n11GWBeNTl2bWCvghIzWh1hYepGH5bCNl8PyMQcLA4mYG0yG6UM+TO+zYRrOgFGTzieFn8yA0bZQq4Dz
-        WiMZN70ASq+AeUwGU/8V0Ka3Qler2N1zt/yewLOernW/Q8Q9E0Qx3v05pxAaYFe9IEsb4JxXwDFbhrzm
+        guYw2kXNwqSVw6iWwtCTCsrwlu9qEbq77+bfE7jX0zTvtgu4e4Jw2rM/6+BDAcySB2QoHRwzctin8pHe
-        GJxtCIfdkAzW/hk6ta+gTuriWRqsdQhuqgfMjza4Fu4LYBXomQLQU5m4pI5AcdcJJNXtBmvTQqf0Eeju
+        GInztSGw6WLB2D5Do/QWVIidHEOBsfTDZXoO+kcLnLP3eLAY1GQmqPFkXFGGIqfzFE5WbwdjHYam3Eug
-        Sp0cYwWz3AWXSS10vY0szRFkqaNx4WEEUusPoKAzAS0jcuS2Hke8fDu0Nb4C4cAzlACr4Pwuh8NYjIzG
+        viN2sLQF9EInnAYl37UCEtUBSJQRuPQgFPE1e5DZfhxNgzKkNR9GjGwTNKVeAveBo008rIDjuwx2fQ6S
-        KDwZU6J9VOEFm0dqUfsqF6rBSpzXxCG6fDMIiJ9X8KUibJ626C1L+kecfbIetgklUoV9PXB1bxYqXmSg
+        6sLxSF2J1iG5B2wcLEPZqzQo+opwURWNiIK1ICA+HsGXwuAZyqw1z440sLaxGlhHKxHP7+uGS15IUPgs
-        rDsNRV1nUPL8HOoGSpH8IAaBecTlFRhuhGYbZHub9OUhi+OyMIcnJ+/twePhWmiGbkL1phL1r2WCJB13
+        CfldCcjuPIvcJxdQ3ZuH2PuR2JhKnB6B7lbQVZ10Z722IHBOIw22u3P67g48HCiDqv82FG+KUPNayksS
-        BkqQpomH5Lq/OfAy2eIV/Kvi7+zkjsp3cLE1W7nDVQHcqYZDUPYXIaUxDkEFRLfrItkkfrq+Ci31Wzqt
+        UdWbiwRVDEQ3fY1brpF1HsG/6lDVVjZKtpmNKl3P7i/2Y8/U7kNlTzbO1UXDP5OMbLtM1gifrqyC8nzm
-        OobgfPIupJBsFF+vv4KvkqWgaxtACsmfn4gQ8hPkkfO+Q+IluQAAAABJRU5ErkJggg==
+        4xQHEZBB3gVmkdXC65VXwHUy739jFUgW+fMTEUJ+Av3G82Xe6HqeAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -248,45 +248,6 @@
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>440, 17</value>
   </metadata>
-  <data name="autoToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
-        4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg
-        wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO
-        GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE
-        pRQTK6YYEAA7
-</value>
-  </data>
-  <data name="resetToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R
-        PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg
-        oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX
-        dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7
-</value>
-  </data>
-  <data name="saveToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh
-        e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw
-        QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK
-        HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC
-        un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs=
-</value>
-  </data>
-  <data name="loadToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7
-        69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ
-        IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj
-        SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG
-        vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
-</value>
-  </data>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>334, 17</value>
   </metadata>
@@ -314,8 +275,11 @@
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>667, 17</value>
   </metadata>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="MeterialNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>729, 17</value>
+    <value>True</value>
+  </metadata>
+  <metadata name="SerialNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>65</value>

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -270,7 +270,6 @@
 			// 
 			this.bindingNavigatorPositionItem.AccessibleName = "위치";
 			this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
 			this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
 			this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23);
 			this.bindingNavigatorPositionItem.Text = "0";
@@ -393,7 +392,6 @@
 			// tbFind
 			// 
 			this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
 			this.tbFind.Name = "tbFind";
 			this.tbFind.Size = new System.Drawing.Size(100, 25);
 			this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -941,7 +939,6 @@
 			// tbRequest
 			// 
 			this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
 			this.tbRequest.Name = "tbRequest";
 			this.tbRequest.Size = new System.Drawing.Size(120, 25);
 			this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -1351,8 +1348,8 @@
             this.chk진행,
             this.chk보류,
             this.chk취소,
-            this.chk완료,
             this.chk완료보고,
+            this.chk완료,
             this.btViewDel,
             this.toolStripSeparator3,
             this.toolStripLabel2,
@@ -1384,6 +1381,7 @@
 			this.chk검토.Name = "chk검토";
 			this.chk검토.Size = new System.Drawing.Size(55, 24);
 			this.chk검토.Text = "검토";
+			this.chk검토.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// chk대기
 			// 
@@ -1395,6 +1393,7 @@
 			this.chk대기.Name = "chk대기";
 			this.chk대기.Size = new System.Drawing.Size(55, 24);
 			this.chk대기.Text = "대기";
+			this.chk대기.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// chk진행
 			// 
@@ -1406,6 +1405,7 @@
 			this.chk진행.Name = "chk진행";
 			this.chk진행.Size = new System.Drawing.Size(55, 24);
 			this.chk진행.Text = "진행";
+			this.chk진행.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// chk보류
 			// 
@@ -1417,6 +1417,7 @@
 			this.chk보류.Name = "chk보류";
 			this.chk보류.Size = new System.Drawing.Size(55, 24);
 			this.chk보류.Text = "보류";
+			this.chk보류.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// chk취소
 			// 
@@ -1426,6 +1427,7 @@
 			this.chk취소.Name = "chk취소";
 			this.chk취소.Size = new System.Drawing.Size(55, 24);
 			this.chk취소.Text = "취소";
+			this.chk취소.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// chk완료
 			// 
@@ -1437,6 +1439,7 @@
 			this.chk완료.Name = "chk완료";
 			this.chk완료.Size = new System.Drawing.Size(55, 24);
 			this.chk완료.Text = "완료";
+			this.chk완료.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// chk완료보고
 			// 
@@ -1447,6 +1450,7 @@
 			this.chk완료보고.Name = "chk완료보고";
 			this.chk완료보고.Size = new System.Drawing.Size(87, 24);
 			this.chk완료보고.Text = "완료(보고)";
+			this.chk완료보고.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged);
 			// 
 			// btViewDel
 			// 

SubProject/FPJ0000/Project/fProjectList.cs

@@ -19,7 +19,6 @@ namespace FPJ0000
 			fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
 			this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow;
 			this.FormClosed += __Closed;
-
 		}
 
 		void __Closed(object sender, FormClosedEventArgs e)
@@ -41,6 +40,27 @@ namespace FPJ0000
 				cmbCate.Items.Add(dr["Value"].ToString());
 			cmbCate.SelectedIndex = 0;
 
+			this.cmbSort.Items.Clear();
+			this.cmbSort.Items.AddRange(new string[] {
+				"---",
+				"Origin Cost",
+				"Input Cost",
+				"Effect Cost",
+				"Asset No",
+				"Project",
+				"Champion",
+				"Requestor",
+				"Process",
+				"Asset / 사용자 / 등록날짜",
+			});
+
+			chk검토_CheckedChanged(this.chk검토, null);
+			chk검토_CheckedChanged(this.chk진행, null);
+			chk검토_CheckedChanged(this.chk대기, null);
+			chk검토_CheckedChanged(this.chk보류, null);
+			chk검토_CheckedChanged(this.chk완료, null);
+			chk검토_CheckedChanged(this.chk취소, null);
+			chk검토_CheckedChanged(this.chk완료보고, null);
 
 			this.cmbProcess.Items.Clear();
 			this.cmbProcess.Items.Add("전체");
@@ -639,8 +659,8 @@ namespace FPJ0000
 					else this.bs.Sort = "asset";
 					break;
 				case 5:
-                    if (this.bs.Sort == "[namme]") this.bs.Sort = "[namme] desc";
+					if (this.bs.Sort == "[name]") this.bs.Sort = "[name] desc";
-                    else this.bs.Sort = "[namme]";
+					else this.bs.Sort = "[name]";
 					break;
 				case 6:
 					if (this.bs.Sort == "userManager") this.bs.Sort = "userManager desc";
@@ -654,6 +674,12 @@ namespace FPJ0000
 					if (this.bs.Sort == "process") this.bs.Sort = "process desc";
 					else this.bs.Sort = "process";
 					break;
+				case 9:
+					//"Asset / 사용자 / 등록날짜"
+					var sort = "asset,usermain,pdate";
+					if (this.bs.Sort == sort) this.bs.Sort = sort;
+					else this.bs.Sort = sort;
+					break;
 				default:
 					this.bs.Sort = "";
 					break;
@@ -770,5 +796,12 @@ namespace FPJ0000
 			var f = new fProjectSummary();
 			f.Show();
 		}
+
+		private void chk검토_CheckedChanged(object sender, EventArgs e)
+		{
+			var but = sender as ToolStripButton;
+			but.ForeColor = but.Checked ? Color.Blue : Color.Black;
+			but.Font = but.Checked ? new Font("맑은 고딕", 10, FontStyle.Bold) : new Font("맑은 고딕", 10);
+		}
 	}
 }

SubProject/FPJ0000/Project/fProjectList.resx

@@ -231,33 +231,33 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF
-        SKESs3bThpqMigpL15TLXCprrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68
+        SKESs3bThpqMigpL15RLXSlrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68
-        qf/G6PiI9psBGKzvoR9cwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3p6gBMzEhh39Huu
+        qf/G6PiI9psBGKzvoR9cwMmBN9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3q6nxMzEhh39Huu
-        lzrtbYHBo4N+VIsTrkbys870DGJGQo/7K5n3z18B478M8+xFUMhBMBy6NLdmgWkkTObZUBZPCNkSDAcv
+        lzrtbYHBo4N+VIsTrkbys870DGJGQo/7K5kPzF8B478M8+xFUMhBMBy6NLdmgWkkTObZUBZPCNkSDAcv
         +CQFVRaFqoLZhbIuOdTdComfsk4Exa4M4XgamrPTKwVVllKVki7hmkea0DbWjPJzO0hQYHA8mCmwT4Vg
         nwzCORPE2y8J7O2YJAXqvlKVgt7Oae/WY4+pHMWnCiBv3YIhbwhWQRPs3xu8/hRHRasXKmZnZRkt5xqd
-        dZDRhVwRnbfNeGsR8dQybFMs8dr5LykgW/Ab2HjVWA9A2VOC6uv7cNRxGJvpDdxGev1WYaM22wfEkstw
+        dZDRhVwRnbfNeGsR8dQybFMs8dr5LykgW/Ab2HjVWA9A2VOC6mv7cNRxGJvpDdxGev1WYaM22wfEkstw
         TLO4PZMRNfyERSK1+rKaq5XQu7U4Yq9BMV3A5TdlwgItQ++w9O0n7vgyG9yf5Q/J+ZhFttRdSsjaC1Gk
-        z0P+8XUrYQHdwAIpGOaDQpgU3OAfIpsXgRg0Ru+ad6C99hJRvsD1NEy8bj9fIARytanD/VvMSGhgniOS
+        z0P+8XUrYQHd9QVSMMwHhTApuME/RDYvAjFojN4170Db/xJRvsD1NEy8bj9fIARytanD/VvMSGhgniOS
-        +AE2lsbnSAoBNglqt8GDXMka7tnFjIRj5vnx2k5/srZzDtXnfdh/ZvVe/hGK+gPucyysxdb5pQAAAABJ
+        +AE2lsbnSAoBNglqt8GDXMka7tnFjIRj5vnx2k5/srZzDtXnfdh/ZvVe/hGK+gPglyyoGjPLOgAAAABJ
         RU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ0SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ
-        Eg8mGi9gosGEgwcqMSBiguGhJpNgFOQtKEPCZsiCgW2AMGQVx9hmN8akE+ho18e6rl//G1XUxMTHN/2m
+        Eg8mGi9gosGEgwcqGhA1wfBQk0kwCvIWlCFhM2TBwDZAGLKJZWyzG2PSCXS062Nd16//jSpqYuLjm37T
-        j/w/39+j1H9rebRkMTJyVov+4tWxk6HgiyP7Q/0lBT/5TUmB01m2z8QpytNpUQ0jC8AgV867zxklgZiz
+        R/6f7+9R6r+1NFKyEBk+rUV/8cro8VDwxaG9ob6Sgp/8pqTA6SzbY+IU5emwqIaRBWCQK+ed54ySQMxZ
-        Ir3mvqB+c3z+mhJxV0X8r46dN3GKYoZLk4auQI01QQo3Q2KfQI4MwsjwJCsFQxeJd3bfM9vgOC7tH7Iw
+        kV51n1O/OT53RYm4qyLMqyNnTZyi/EOlSUNXoMYaIYWbILFPIEcGYGR4kpWCoYvE2zvvmS1wHJdmBi1+
-        Jk5Rge6jQlbbIXAbUsFWCB9qsTVbgcTcVfC+OvBLt8Av3sS2t5q4inTGITB0XDRxEjBQqmXkDfBMG7YX
+        E6eoQNdhIattE7gVqWALhA+12JypQGL2MnhfHfjFG+AXrmPLW01cRTrjEBg8Kpo4Cegv1TLyOnh/K7bm
-        GsBN3oDMzZCqglk9d09+7yA3nnegWDHxXAcntPz8WZVYBnQpD+qyH2r8ARimDzaXBx0TLHqm1uHwRpHb
+        G8BNXIPMTZOqglk9d09+7yA3nre/WDHxXAfHtPz8WZVYBnQpD+oyAzX+AH5/L2wuD9rHWXRPrsHhjSK3
-        m4mTgDZL2tBl6IIHGd4ObXMQ6Y12KGv34FvqxOg8h9XPEj5tqpgJCRhf/IIRG62bOPkLVoua1QRoWzak
+        NxMnAa2WtKHL0AUPMrwd2sYA0uttUFbvwbfYgZE5DiufJXzaUDEdEjC28AXDNlo3cfIXrBY1qwnQNm1I
-        ua58VSVaBzlcjX5XHMsxEbOsDFdYwjSxL66i9y0LE6co7/1ixdB4Aj+Fut4MJVJL4CpIgcv5toMJFa5Q
+        c535qkq0DnK4Gn2uOJZiImZYGa6whCliX1xFz1sWJk5R3vvFiqHxBH4Kda0JSqSWwFWQAhfzbQcTKlyh
-        ClPBFCb8IuajKromY3sBK3eL4nKSSXqcPdnUagfEwEOI/iaIH+vRS2ZeXpcwGdiFc363psI6trIX4K8v
+        FCaDKYwzIuaiKjonYrsBy3eK4nLSn5x0dmdTK+0QAw8hMo0QP9ajh8y8tCZhIrAD5/xuVYV1dHk3gKkv
-        vO5vONzN3DmU8DYUKT/69TCtzwQFLBDIzSqYI9Vt70XQdL1hrzl10Yz4vVrs7AGrg6UHyC76puN47HBm
+        vMo0HOzy3z6Q8DYUKT/69RCtTwcFzBPIzSqYJdVt70XQ9E3DXnPivBnxezXb2X1WB0v3k130TsXx2OHM
-        abrR8I23w9NaLjyvLCw3j/65XtacueJ+dIkP21swdrtMMj//nZ5VHiwfp0/LjsZze7v4N1HUV7Y0I6k6
+        0nS94Rtrg6elXHheWVhuHv1zvaw5dcn96AIftjdj9FaZZH7+Oz2r3F8+Rp+UHXfP7O7i30RRXwGoxCOd
-        NvpGAAAAAElFTkSuQmCC
+        rElI4AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -431,7 +431,7 @@
         AABJRU5ErkJggg==
 </value>
   </data>
-  <data name="chk완료.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="chk완료보고.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPbS5NxHMbfv6DrubX3LQ0vMi+KUVQK6UWE
@@ -449,7 +449,7 @@
         AABJRU5ErkJggg==
 </value>
   </data>
-  <data name="chk완료보고.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="chk완료.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPbS5NxHMbfv6DrubX3LQ0vMi+KUVQK6UWE