diff --git a/Project/History.txt b/Project/History.txt index 320e075..6d72390 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,9 @@ -190105 chi 제조공정, 장비제조,장비모델 항목 추가 (공용코드 06,07,08 에 추가됨) +190110 chi NR구매 화면 모델 -> 규격명칭 변경 + 장비기술 공정이 공용코드 09번에 연결됨 + 기존 장비기술 공정코드 일괄 추가(공용코드 09번) + 공정,제조사,모델 항목 알파벳 정렬 + 목록의 열 정렬 일부 변경 +190105 chi 제조공정, 장비제조,장비모델 항목 추가 (공용코드 06,07,08 에 추가됨) 190104 chi NR구매시 SID 설정하면 모델 및 이름 변경 불가하게 함 (박성민s) 탭순서 변경 181226 chi NR구매 목록에서 저장시 메세지 표시 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 070c578..b18b866 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("19.01.07.0900")] -[assembly: AssemblyFileVersion("19.01.07.0900")] +[assembly: AssemblyVersion("19.01.10.0900")] +[assembly: AssemblyFileVersion("19.01.10.0900")] diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index f55e305..2a75a92 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -13244,15 +13244,13 @@ SELECT idx, name, pdate, request, reqstaff, sdate, edate, odate, memo, wuid, wda 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 [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; 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("@IsNull_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_code", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_svalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_svalue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ivalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ivalue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ivalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ivalue", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_fvalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fvalue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -13264,7 +13262,7 @@ SELECT idx, name, pdate, request, reqstaff, sdate, edate, odate, memo, wuid, wda this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO [Common] ([grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate); -SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY())"; +SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY()) ORDER BY grp, memo"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -13276,8 +13274,8 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", 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 [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); +SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) ORDER BY grp, memo"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -13292,8 +13290,6 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_code", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_svalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_svalue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ivalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ivalue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ivalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ivalue", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_fvalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fvalue", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -13319,7 +13315,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate\r\nFROM Commo" + - "n\r\nWHERE (grp = @grp)"; + "n\r\nWHERE (grp = @grp)\r\nORDER BY grp, memo"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -13393,7 +13389,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_grp, string Original_code, string Original_svalue, global::System.Nullable Original_ivalue, global::System.Nullable Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete(int Original_idx, string Original_grp, string Original_code, global::System.Nullable Original_ivalue, global::System.Nullable Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_grp == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -13411,45 +13407,37 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_code)); } - if ((Original_svalue == null)) { + if ((Original_ivalue.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[6].Value = ((int)(Original_ivalue.Value)); + } + else { this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_svalue)); - } - if ((Original_ivalue.HasValue == true)) { + if ((Original_fvalue.HasValue == true)) { this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((int)(Original_ivalue.Value)); + this.Adapter.DeleteCommand.Parameters[8].Value = ((double)(Original_fvalue.Value)); } else { this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; } - if ((Original_fvalue.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((double)(Original_fvalue.Value)); - } - else { + if ((Original_memo == null)) { this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; } - if ((Original_memo == null)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_memo)); + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((string)(Original_wuid)); + this.Adapter.DeleteCommand.Parameters[11].Value = ((string)(Original_wuid)); } - this.Adapter.DeleteCommand.Parameters[14].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.DeleteCommand.Parameters[12].Value = ((System.DateTime)(Original_wdate)); 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)) { @@ -13546,7 +13534,6 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE int Original_idx, string Original_grp, string Original_code, - string Original_svalue, global::System.Nullable Original_ivalue, global::System.Nullable Original_fvalue, string Original_memo, @@ -13613,46 +13600,38 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_code)); } - if ((Original_svalue == null)) { + if ((Original_ivalue.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_ivalue.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_svalue)); - } - if ((Original_ivalue.HasValue == true)) { + if ((Original_fvalue.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_ivalue.Value)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((double)(Original_fvalue.Value)); } else { this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } - if ((Original_fvalue.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((double)(Original_fvalue.Value)); - } - else { + if ((Original_memo == null)) { this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } - if ((Original_memo == 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_memo)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[22].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[21].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)) { @@ -13685,13 +13664,12 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE int Original_idx, string Original_grp, string Original_code, - string Original_svalue, global::System.Nullable Original_ivalue, global::System.Nullable Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { - return this.Update(grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, Original_idx, Original_grp, Original_code, Original_svalue, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_idx); + return this.Update(grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, Original_idx, Original_grp, Original_code, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_idx); } } diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 157aed3..0ff1c8c 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -522,15 +522,13 @@ WHERE (ISNULL(name, N'') LIKE @search) OR - DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) - - @@ -545,7 +543,7 @@ WHERE (ISNULL(name, N'') LIKE @search) OR INSERT INTO [Common] ([grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate); -SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY()) +SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY()) ORDER BY grp, memo @@ -559,10 +557,11 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE - + SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common -WHERE (grp = @grp) +WHERE (grp = @grp) +ORDER BY grp, memo @@ -570,8 +569,8 @@ WHERE (grp = @grp) - UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) + UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); +SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) ORDER BY grp, memo @@ -586,8 +585,6 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE - - @@ -1605,7 +1602,7 @@ WHERE (supplyidx = @idx) - + @@ -1689,7 +1686,7 @@ WHERE (supplyidx = @idx) - + @@ -1759,7 +1756,7 @@ WHERE (supplyidx = @idx) - + @@ -1830,7 +1827,7 @@ WHERE (supplyidx = @idx) - + @@ -1875,7 +1872,7 @@ WHERE (supplyidx = @idx) - + @@ -1942,7 +1939,7 @@ WHERE (supplyidx = @idx) - + @@ -2003,7 +2000,7 @@ WHERE (supplyidx = @idx) - + @@ -2067,7 +2064,7 @@ WHERE (supplyidx = @idx) - + @@ -2156,7 +2153,7 @@ WHERE (supplyidx = @idx) - + @@ -2262,7 +2259,7 @@ WHERE (supplyidx = @idx) - + @@ -2320,7 +2317,7 @@ WHERE (supplyidx = @idx) - + diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index b4cddbd..25b50d4 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -362,9 +362,10 @@ namespace FCOMMON var cn = getCn(); cn.Open(); var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,'')" + - " from common" + + " from common" + " where grp = '" + GroupCode + "'" + - " and isnull(code,'') <> ''"; + " and isnull(code,'') <> ''" + + " order by isnull(memo,'')"; var cmd = new SqlCommand(sql, cn); var rdr = cmd.ExecuteReader(); while (rdr.Read()) diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index b9c68aa..82acb7b 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,30 +30,29 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = 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.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(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -348,7 +347,7 @@ this.toolStripMenuItem3, this.ㅕCustomDataCopyToolStripMenuItem}); this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(337, 338); + this.cm1.Size = new System.Drawing.Size(337, 316); // // columnSizeToolStripMenuItem // @@ -658,7 +657,7 @@ this.fpSpread1.Size = new System.Drawing.Size(1074, 603); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; - this.fpSpread1.SetViewportLeftColumn(0, 0, 1); + this.fpSpread1.SetViewportLeftColumn(0, 0, 2); // // fpSpread1_Sheet1 // @@ -680,17 +679,17 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "품명"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "*"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "합계금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "공급업체"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "관련프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "제조\r\n공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "장비\r\n제조"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "장비\r\n모델"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "장비\r\n제조사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "제조\r\n공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "장비\r\n모델"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "합계금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "공급업체"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "관련프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "*"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "입고예정"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "입고일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "PO#"; @@ -699,7 +698,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -707,7 +706,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -715,157 +714,149 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 66F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 67F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 48F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "receive"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 55F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType6; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 43F; - numberCellType7.DecimalPlaces = 0; - numberCellType7.NegativeRed = true; - numberCellType7.NullDisplay = "--"; - numberCellType7.Separator = ","; - numberCellType7.ShowSeparator = true; - numberCellType7.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 44F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType28; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 46F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.NegativeRed = true; - numberCellType8.NullDisplay = "--"; - numberCellType8.Separator = ","; - numberCellType8.ShowSeparator = true; - numberCellType8.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumamt"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "합계금액"; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 32F; - this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType29; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "공급업체"; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "dept"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "장비\r\n제조사"; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "manuproc"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "제조\r\n공정"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n모델"; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량"; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 44F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F; - this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType30; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "project"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "관련프로젝트"; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 46F; - this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "projectidx"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType31; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "manuproc"; + numberCellType3.DecimalPlaces = 0; + numberCellType3.NegativeRed = true; + numberCellType3.NullDisplay = "--"; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + numberCellType3.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "합계금액"; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 32F; + this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "공급업체"; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 46F; + this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "제조\r\n공정"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 37F; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "dept"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "장비\r\n제조"; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 40F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType32; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 14F; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "project"; + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "관련프로젝트"; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 46F; + this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "장비\r\n모델"; - this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 39F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 14F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 38F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 42F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType35; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(23).Width = 41F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(25).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(25).Tag = "isdel"; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 5bc640e..6cc336f 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -706,7 +706,7 @@ namespace FEQ0000 var drv = this.bs.Current as DataRowView; if(drv==null) return; var dr = drv.Row as dsPurchase.PurchaseRow; - string buffer = string.Format("{0}_{1}",dr.sid,dr.request); + string buffer = string.Format("{0}_{1}_{2}_{3}_{4}", dr.pumname.Replace("_", "-"), dr.pumscale.Replace("_", "-"), dr.dept.Replace("_", "-"), dr.manuproc.Replace("_", "-"), dr.asset.Replace("_", "-")); Clipboard.SetText(buffer); FCOMMON.Util.MsgI("다음 데이터가 클립보드에 저장됨\n\n" + buffer); } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 29d71fc..3109a57 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -328,6 +328,6 @@ - 17, 62 + 579, 23 \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index ac7e285..1cae54c 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -64,7 +64,7 @@ this.dtPdate = new System.Windows.Forms.DateTimePicker(); this.btSave = new System.Windows.Forms.Button(); this.cmbState = new System.Windows.Forms.ComboBox(); - this.cmbProcess = new System.Windows.Forms.ComboBox(); + this.cbProcess = new System.Windows.Forms.ComboBox(); this.cmbRequest = new System.Windows.Forms.ComboBox(); this.cmbReceive = new System.Windows.Forms.ComboBox(); this.tbPumIDX = new System.Windows.Forms.TextBox(); @@ -172,7 +172,7 @@ pumscaleLabel.Name = "pumscaleLabel"; pumscaleLabel.Size = new System.Drawing.Size(39, 20); pumscaleLabel.TabIndex = 8; - pumscaleLabel.Text = "모델"; + pumscaleLabel.Text = "규격"; // // pumqtyLabel // @@ -468,17 +468,18 @@ this.cmbState.TabIndex = 1; this.cmbState.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // - // cmbProcess + // cbProcess // - this.cmbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.cmbProcess.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.cmbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.cmbProcess.FormattingEnabled = true; - this.cmbProcess.Location = new System.Drawing.Point(104, 94); - this.cmbProcess.Margin = new System.Windows.Forms.Padding(4); - this.cmbProcess.Name = "cmbProcess"; - this.cmbProcess.Size = new System.Drawing.Size(286, 28); - this.cmbProcess.TabIndex = 5; + this.cbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cbProcess.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbProcess.FormattingEnabled = true; + this.cbProcess.Location = new System.Drawing.Point(104, 94); + this.cbProcess.Margin = new System.Windows.Forms.Padding(4); + this.cbProcess.Name = "cbProcess"; + this.cbProcess.Size = new System.Drawing.Size(286, 28); + this.cbProcess.TabIndex = 5; // // cmbRequest // @@ -671,7 +672,7 @@ this.groupBox2.Controls.Add(assetLabel); this.groupBox2.Controls.Add(this.cmbReceive); this.groupBox2.Controls.Add(processLabel); - this.groupBox2.Controls.Add(this.cmbProcess); + this.groupBox2.Controls.Add(this.cbProcess); this.groupBox2.Controls.Add(stateLabel); this.groupBox2.Location = new System.Drawing.Point(512, 38); this.groupBox2.Margin = new System.Windows.Forms.Padding(4); @@ -831,7 +832,7 @@ private System.Windows.Forms.DateTimePicker dtPdate; private System.Windows.Forms.Button btSave; private System.Windows.Forms.ComboBox cmbState; - private System.Windows.Forms.ComboBox cmbProcess; + private System.Windows.Forms.ComboBox cbProcess; private System.Windows.Forms.ComboBox cmbRequest; private System.Windows.Forms.ComboBox cmbReceive; private System.Windows.Forms.TextBox tbPumStock; diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 50d951e..5013573 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -70,11 +70,17 @@ namespace FEQ0000 this.cbManuProc.ValueMember = "Value"; this.cbManuProc.DataSource = dt_manuproc; - //processlist - var procList = FCOMMON.DBM.getGroupTable("process", "Purchase", "process <> ''"); - this.cmbProcess.DisplayMember = "Value"; - this.cmbProcess.ValueMember = "Key"; - this.cmbProcess.DataSource = new BindingSource(procList, ""); + //장비기술공정 + var dt_eetproc = FCOMMON.DBM.getCodeTable("09"); + this.cbProcess.DisplayMember = "Value"; + this.cbProcess.ValueMember = "Value"; + this.cbProcess.DataSource = dt_eetproc; + + ////processlist + //var procList = FCOMMON.DBM.getGroupTable("process", "Purchase", "process <> ''"); + //this.cbProcess.DisplayMember = "Value"; + //this.cbProcess.ValueMember = "Key"; + //this.cbProcess.DataSource = new BindingSource(procList, ""); //juserlist var userList = FCOMMON.DBM.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); @@ -148,12 +154,14 @@ namespace FEQ0000 cmbState.Text = dr.state; cmbReceive.Text = dr.receive; - cmbProcess.Text = dr.process; - if (cmbProcess.Text == "") + + if (dr.process == "") cbProcess.SelectedIndex = -1; + else cbProcess.Text = dr.process; + if (cbProcess.SelectedIndex == -1) { - //181203 + //181203 - 이 사용자가 마지막으로 사용한 공정값을 사용한다. var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbRequest.Text + "%'", "pdate desc"); - if (lastprocess != "") cmbProcess.Text = lastprocess; + if (lastprocess != "") cbProcess.Text = lastprocess; } tbSC.Text = dr.sc; @@ -232,7 +240,7 @@ namespace FEQ0000 case "cmbrequest": //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다. var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbRequest.Text + "%'", "pdate desc"); - if (lastprocess != "") cmbProcess.Text = lastprocess; + if (lastprocess != "") cbProcess.Text = lastprocess; tbSID.Focus(); break; case "tbsid": @@ -388,10 +396,10 @@ namespace FEQ0000 tbSID.Text = sidTrim(tbSID.Text); - if (cmbProcess.Text.Trim() == "") + if (cbProcess.Text.Trim() == "") { FCOMMON.Util.MsgE("프로세스를 선택하세요."); - cmbProcess.Focus(); + cbProcess.Focus(); return false; } @@ -424,6 +432,31 @@ namespace FEQ0000 var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00"); if (overtime.TotalSeconds > 0) { + if (this.cbProcess.SelectedIndex == -1) + { + if (FCOMMON.info.Login.level >= 5) + { + var dlg = FCOMMON.Util.MsgQ("[공정]을 입력하지 않고 진행 하시겠습니까?\n\n" + + "선택 대상이 없는 경우 문의 바랍니다.\n\n" + + "BongSeok Jung(T.7191)\n" + + "BongSeok.Jung@amkor.co.kr"); + if (dlg != System.Windows.Forms.DialogResult.Yes) + { + cbProcess.Focus(); + return false; + } + } + else + { + FCOMMON.Util.MsgE("[공정]을 선택하세요\n\n" + + "선택 대상이 없는 경우 문의 바랍니다.\n\n" + + "BongSeok Jung(T.7191)\n" + + "BongSeok.Jung@amkor.co.kr"); + + cbProcess.Focus(); + return false; + } + } if (cbManuProc.SelectedIndex == -1) { if (FCOMMON.info.Login.level >= 5) @@ -554,7 +587,7 @@ namespace FEQ0000 dr.state = cmbState.Text.Trim(); dr.receive = cmbReceive.Text; - dr.process = cmbProcess.Text; + dr.process = cbProcess.Text; dr.sc = tbSC.Text; dr.po = tbPO.Text; dr.bigo = tbBigo.Text; @@ -572,7 +605,7 @@ namespace FEQ0000 pic = FCOMMON.DBM.getImagByteArray(this.pictureBox1.Image); } var newidx = FCOMMON.DBM.addItem(dr.pumname, dr.sid, dr.pumscale, dr.pumprice, dr.supply, dr.supplyidx, pic); - if (newidx != null && newidx != -1) + if (newidx != -1) { dr.pumidx = newidx; Console.WriteLine("new pumidx set = " + dr.pumidx.ToString()); diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index f4a5640..c507107 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -174,9 +174,6 @@ 490, 17 - - 490, 17 - 17, 17