From 87dbe17ec940c0ca7839abf2073bc463647ef3a0 Mon Sep 17 00:00:00 2001 From: LGram16 Date: Wed, 28 Jan 2026 22:14:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=A0=95=EB=A6=AC=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95(compi?= =?UTF-8?q?dx=20=EC=A0=84=EC=B2=B4=20=EC=A0=81=EC=9A=A9=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=20=EC=88=98=EC=A0=95,=20suername=20=EB=8F=84=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20login=EC=A0=95=EB=B3=B4=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95),=20=EB=A7=A4=ED=81=AC=EB=A1=9C=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=EA=B1=B0(=EC=9D=B4?= =?UTF-8?q?=EC=83=81=EC=97=86=EC=9D=8C=20-1=EB=B2=88=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=97=BF=EC=9D=84=EC=88=98=EC=9E=88=EC=9D=8C?= =?UTF-8?q?)=20,=20=EB=AC=B8=ED=95=99=ED=98=95=EC=8B=9D=20=EB=A7=8C?= =?UTF-8?q?=ED=99=98=EA=B4=80=EB=A0=A8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unimarc/unimarc/App.config | 6 ---- unimarc/unimarc/Properties/AssemblyInfo.cs | 4 +-- .../unimarc/Properties/Settings.Designer.cs | 26 +--------------- unimarc/unimarc/Properties/Settings.settings | 6 ---- unimarc/unimarc/마크/CD_LP.cs | 6 ++-- unimarc/unimarc/마크/CD_LP_AddList.cs | 4 +-- unimarc/unimarc/마크/CD_LP_List.cs | 2 +- unimarc/unimarc/마크/CD_LP_SelectList.cs | 11 +++---- unimarc/unimarc/마크/Check_Copy_Sub_List.cs | 4 +-- unimarc/unimarc/마크/Help008Tag.cs | 30 ++++++++++++------- unimarc/unimarc/마크/Mac_Input.cs | 2 +- unimarc/unimarc/마크/Mac_List_Add.cs | 8 ++--- unimarc/unimarc/마크/MarcCopySelect.cs | 6 ++-- unimarc/unimarc/마크/MarcEditorControl.cs | 2 +- unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs | 8 ++--- .../unimarc/마크/Marc_Plan_Sub_SelectList.cs | 8 ++--- .../마크/Marc_Plan_Sub_SelectList_Morge.cs | 4 +-- unimarc/unimarc/마크/Marc_mkList.cs | 10 +++---- unimarc/unimarc/마크/Set_Macro.cs | 10 +++---- unimarc/unimarc/마크/ShowDeleteMarc.cs | 2 +- unimarc/unimarc/편의기능/Send_Notice.cs | 2 +- 21 files changed, 68 insertions(+), 93 deletions(-) diff --git a/unimarc/unimarc/App.config b/unimarc/unimarc/App.config index d97add1..cdc2eef 100644 --- a/unimarc/unimarc/App.config +++ b/unimarc/unimarc/App.config @@ -56,12 +56,6 @@ - - - - - - 1.11010111.11111010.10000010 diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index cdd8b8e..5b60cac 100644 --- a/unimarc/unimarc/Properties/AssemblyInfo.cs +++ b/unimarc/unimarc/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2026.01.21.2318")] -[assembly: AssemblyFileVersion("2026.01.21.2318")] +[assembly: AssemblyVersion("2026.01.28.2200")] +[assembly: AssemblyFileVersion("2026.01.28.2200")] diff --git a/unimarc/unimarc/Properties/Settings.Designer.cs b/unimarc/unimarc/Properties/Settings.Designer.cs index 1d32235..ff9cb17 100644 --- a/unimarc/unimarc/Properties/Settings.Designer.cs +++ b/unimarc/unimarc/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace UniMarc.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -23,30 +23,6 @@ namespace UniMarc.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string compidx { - get { - return ((string)(this["compidx"])); - } - set { - this["compidx"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string User { - get { - return ((string)(this["User"])); - } - set { - this["User"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("1.11010111.11111010.10000010")] diff --git a/unimarc/unimarc/Properties/Settings.settings b/unimarc/unimarc/Properties/Settings.settings index d5250d9..2b1487d 100644 --- a/unimarc/unimarc/Properties/Settings.settings +++ b/unimarc/unimarc/Properties/Settings.settings @@ -2,12 +2,6 @@ - - - - - - 1.11010111.11111010.10000010 diff --git a/unimarc/unimarc/마크/CD_LP.cs b/unimarc/unimarc/마크/CD_LP.cs index 5ac84b1..ba1662d 100644 --- a/unimarc/unimarc/마크/CD_LP.cs +++ b/unimarc/unimarc/마크/CD_LP.cs @@ -138,7 +138,7 @@ namespace UniMarc int row = dataGridView1.CurrentRow.Index; string midx = dataGridView1.Rows[row].Cells["m_idx"].Value.ToString(); string code = dataGridView1.Rows[row].Cells["code"].Value.ToString(); - string user = Properties.Settings.Default.User; + string user = PUB.user.UserName; string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string etcData1 = etc1.Text; @@ -296,7 +296,7 @@ namespace UniMarc int row = dataGridView1.CurrentRow.Index; string code = dataGridView1.Rows[row].Cells["code"].Value.ToString(); - string user = Properties.Settings.Default.User; + string user = PUB.user.UserName;// Properties.Settings.Default.User; string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -511,7 +511,7 @@ namespace UniMarc PUB.user.CompanyIdx, lbl_ListTitle.Text, lbl_date.Text, - Properties.Settings.Default.User, + PUB.user.UserName, dataGridView1.Rows[a].Cells["num"].Value.ToString(), dataGridView1.Rows[a].Cells["code"].Value.ToString(), dataGridView1.Rows[a].Cells["title"].Value.ToString(), diff --git a/unimarc/unimarc/마크/CD_LP_AddList.cs b/unimarc/unimarc/마크/CD_LP_AddList.cs index c6e3c68..27c8995 100644 --- a/unimarc/unimarc/마크/CD_LP_AddList.cs +++ b/unimarc/unimarc/마크/CD_LP_AddList.cs @@ -48,8 +48,8 @@ namespace UniMarc { string listName = tb_ExpectList.Text; string date = DateTime.Now.ToString("yyyy-MM-dd"); - string compidx = Properties.Settings.Default.compidx; - string user = Properties.Settings.Default.User; + string compidx = PUB.user.CompanyIdx;// Properties.Settings.Default.compidx; + string user = PUB.user.UserName; if (listName == "") { MessageBox.Show("목록명이 비어있습니다!"); diff --git a/unimarc/unimarc/마크/CD_LP_List.cs b/unimarc/unimarc/마크/CD_LP_List.cs index d2df1f3..4bd0dda 100644 --- a/unimarc/unimarc/마크/CD_LP_List.cs +++ b/unimarc/unimarc/마크/CD_LP_List.cs @@ -24,7 +24,7 @@ namespace UniMarc private void CD_LP_List_Load(object sender, EventArgs e) { db.DBcon(); - compidx = Properties.Settings.Default.compidx; + compidx = PUB.user.CompanyIdx;// Properties.Settings.Default.compidx; } private void Btn_SelectList_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/CD_LP_SelectList.cs b/unimarc/unimarc/마크/CD_LP_SelectList.cs index 1b2796b..134265d 100644 --- a/unimarc/unimarc/마크/CD_LP_SelectList.cs +++ b/unimarc/unimarc/마크/CD_LP_SelectList.cs @@ -57,8 +57,9 @@ namespace UniMarc } } - public void LoadList(string compidx, int Filter, string Target) + public void LoadList( int Filter, string Target) { + var compidx = PUB.user.CompanyIdx; string Area = "`idx`, `listname`, `date`, `user`"; string Table = "DVD_List"; string FilterTable; @@ -102,9 +103,9 @@ namespace UniMarc if (MessageBox.Show("정말 삭제하시겠습니까?", "삭제", MessageBoxButtons.YesNo) == DialogResult.Yes) { string idx = dataGridView1.Rows[dataGridView1.CurrentRow.Index].Cells["idx"].Value.ToString(); - string compidx = Properties.Settings.Default.compidx; + //string compidx = Properties.Settings.Default.compidx; - string cmd = db.DB_Delete("DVD_List", "compidx", compidx, "idx", idx); + string cmd = db.DB_Delete("DVD_List", "compidx", PUB.user.CompanyIdx, "idx", idx); Helper_DB.ExcuteNonQuery(cmd); MessageBox.Show("삭제되었습니다."); @@ -120,10 +121,10 @@ namespace UniMarc { if (e.KeyCode == Keys.Enter) { - string compidx = Properties.Settings.Default.compidx; + //string compidx = Properties.Settings.Default.compidx; int ComboIndex = cb_Filter.SelectedIndex; string Target = tb_Search.Text; - LoadList(compidx, ComboIndex, Target); + LoadList( ComboIndex, Target); } } diff --git a/unimarc/unimarc/마크/Check_Copy_Sub_List.cs b/unimarc/unimarc/마크/Check_Copy_Sub_List.cs index 9cb148f..5b78cd4 100644 --- a/unimarc/unimarc/마크/Check_Copy_Sub_List.cs +++ b/unimarc/unimarc/마크/Check_Copy_Sub_List.cs @@ -58,7 +58,7 @@ namespace UniMarc dataGridView1.Rows.Clear(); string Area = "`work_list`, `date`"; - string compidx = Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx;// Properties.Settings.Default.compidx; string stat = cb_Stat.Text; string cmd = ""; @@ -109,7 +109,7 @@ namespace UniMarc void list_Select(int row) { - string compidx = Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; string list_name = dataGridView1.Rows[row].Cells["list_name"].Value.ToString(); string list_date = dataGridView1.Rows[row].Cells["list_date"].Value.ToString(); diff --git a/unimarc/unimarc/마크/Help008Tag.cs b/unimarc/unimarc/마크/Help008Tag.cs index 0b0d029..82d0699 100644 --- a/unimarc/unimarc/마크/Help008Tag.cs +++ b/unimarc/unimarc/마크/Help008Tag.cs @@ -46,6 +46,15 @@ namespace UniMarc "서간문학", "만화" }; + + // comboBox4 = 문학형식 + string[] combo4_res = { + " ", "f", "k", "j", "p", + "e", "d", "v", "m", "u", + "l", "s", "t", "w", "h", + "i", "c" + }; + /// /// 전기 5개 /// @@ -67,6 +76,7 @@ namespace UniMarc "헝가리어" }; + public string Combo_Change(string Text, string Name, int idx) { char[] textArray = Text.ToCharArray(); @@ -94,12 +104,12 @@ namespace UniMarc }; // comboBox4 = 문학형식 - string[] combo4_res = { - " ", "f", "k", "j", "p", - "e", "d", "v", "m", "u", - "l", "s", "t", "w", "h", - "i", "c" - }; + //string[] combo4_res = { + // " ", "f", "k", "j", "p", + // "e", "d", "v", "m", "u", + // "l", "s", "t", "w", "h", + // "i", "c" + //}; // comboBox5 = 전기 string[] combo5_res = { @@ -235,10 +245,10 @@ namespace UniMarc /// public int Literary_008(string value) { - string[] combo4_res = { " ", "f", "k", "j", "p", - "e", "d", "v", "m", "u", - "l", "s", "t", "w", "h", - "i" }; + //string[] combo4_res = { " ", "f", "k", "j", "p", + // "e", "d", "v", "m", "u", + // "l", "s", "t", "w", "h", + // "i" }; int result = combo4_res.ToList().FindIndex(x => x == value); if (result == -1) { diff --git a/unimarc/unimarc/마크/Mac_Input.cs b/unimarc/unimarc/마크/Mac_Input.cs index a933f86..0735085 100644 --- a/unimarc/unimarc/마크/Mac_Input.cs +++ b/unimarc/unimarc/마크/Mac_Input.cs @@ -133,7 +133,7 @@ namespace UniMarc { string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string user = PUB.user.UserName; - string compidx = UniMarc.Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx;// UniMarc.Properties.Settings.Default.compidx; string table = "Marc"; string[] GridCol = { "isbn", "book_name", "series", "author", "book_comp", "price" }; diff --git a/unimarc/unimarc/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs index 6fde103..a431d60 100644 --- a/unimarc/unimarc/마크/Mac_List_Add.cs +++ b/unimarc/unimarc/마크/Mac_List_Add.cs @@ -31,8 +31,8 @@ namespace UniMarc { db.DBcon(); - string compidx = Properties.Settings.Default.compidx; - string MyName = Properties.Settings.Default.User; + string compidx = PUB.user.CompanyIdx; + string MyName = PUB.user.UserName; #region 콤보박스 채우기 @@ -74,7 +74,7 @@ namespace UniMarc private void btn_AddList_Click(object sender, EventArgs e) { - string compidx = Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; string Today = DateTime.Now.ToString("yyyy-MM-dd"); string listName = tb_ExpectList.Text; string charge = cb_User.Text; @@ -273,7 +273,7 @@ namespace UniMarc } void LovCustom() { - string compidx = Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; var inputsearch = tb_divComp.Text.Trim(); var where = $"campanyidx={compidx}"; if (inputsearch.isEmpty() == false) diff --git a/unimarc/unimarc/마크/MarcCopySelect.cs b/unimarc/unimarc/마크/MarcCopySelect.cs index 13634cb..8078cd9 100644 --- a/unimarc/unimarc/마크/MarcCopySelect.cs +++ b/unimarc/unimarc/마크/MarcCopySelect.cs @@ -239,7 +239,7 @@ namespace UniMarc bool isMyData = true; - if (compidx != Properties.Settings.Default.compidx) { + if (compidx != PUB.user.CompanyIdx) { isMyData = false; string FindCompCmd = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", compidx); dataGridView1.Rows[a].Cells["user"].Value = db.DB_Send_CMD_Search(FindCompCmd).Replace("|", ""); @@ -454,8 +454,8 @@ namespace UniMarc string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString(); - string User = Properties.Settings.Default.User; - string compidx = Properties.Settings.Default.compidx; + string User = PUB.user.UserName; + string compidx = PUB.user.CompanyIdx; string NowDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string SelectArea = "`compidx`, `grade`, `ISBN`, `서명`, `총서명`, " + diff --git a/unimarc/unimarc/마크/MarcEditorControl.cs b/unimarc/unimarc/마크/MarcEditorControl.cs index c2324b7..f6eef12 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.cs @@ -20,7 +20,7 @@ namespace UniMarc /// //string[] data_book = { "", "", "", "", "" }; int SaveRowIdx = -1; // Keep for now but might be unused if we rely on properties - string mCompidx = UniMarc.Properties.Settings.Default.compidx; + //string mCompidx = UniMarc.Properties.Settings.Default.compidx; string mListIdx = ""; public string find; public string change; diff --git a/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs b/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs index 2d59754..0eec05c 100644 --- a/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs +++ b/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs @@ -49,12 +49,12 @@ namespace UniMarc string Area = "`idx`, `name`, `user`"; string Tabel = "PrintLabel"; - string compidx = Properties.Settings.Default.compidx; + //string compidx = PUB.user.CompanyIdxProperties.Settings.Default.compidx; string cmd = string.Format( "SELECT {0} " + "FROM {1} " + - "WHERE `compidx` = \"{2}\" AND `name` LIKE \"%{3}%\";", Area, Tabel, compidx, Text); + "WHERE `compidx` = \"{2}\" AND `name` LIKE \"%{3}%\";", Area, Tabel, PUB.user.CompanyIdx, Text); string res = db.self_Made_Cmd(cmd); InputGrid(res); } @@ -197,8 +197,8 @@ namespace UniMarc else if (row > 0) return; - string User = Properties.Settings.Default.User; - string compidx = Properties.Settings.Default.compidx; + string User = PUB.user.UserName;// Properties.Settings.Default.User; + string compidx = PUB.user.CompanyIdx;// Properties.Settings.Default.compidx; string CopyCheckCMD = string.Format( "SELECT * " + diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs index 6de9896..5a44928 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs @@ -13,7 +13,7 @@ namespace UniMarc public partial class Marc_Plan_Sub_SelectList : Form { Helper_DB db = new Helper_DB(); - string compidx; + //string compidx; public string ResultIdx { get; private set; } public string ResultListName { get; private set; } @@ -23,7 +23,7 @@ namespace UniMarc public Marc_Plan_Sub_SelectList() { InitializeComponent(); - compidx = Properties.Settings.Default.compidx; + //compidx = Properties.Settings.Default.compidx; } private void Marc_Plan_Sub_SelectList_Load(object sender, EventArgs e) @@ -66,7 +66,7 @@ namespace UniMarc string Area = "`idx`, `work_list`, `date`, `user`"; string cmd = string.Format("SELECT {0} FROM `Specs_List` WHERE `compidx` = {1} AND `state` = \"{2}\" AND `work_list` LIKE \"%{3}%\"", - Area, compidx, gu, text); + Area, PUB.user.CompanyIdx, gu, text); string res = db.DB_Send_CMD_Search(cmd); string[] ary = res.Split('|'); @@ -214,7 +214,7 @@ namespace UniMarc Helper_DB.ExcuteNonQuery(cmd); // 목록 내 마크 제거 - cmd = db.DB_Delete_No_Limit("Specs_Marc", "compidx", compidx, search_col, search_data); + cmd = db.DB_Delete_No_Limit("Specs_Marc", "compidx", PUB.user.CompanyIdx, search_col, search_data); Helper_DB.ExcuteNonQuery(cmd); MessageBox.Show("삭제되었습니다."); diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs index e6c146b..e685d65 100644 --- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs @@ -56,8 +56,8 @@ namespace UniMarc MessageBox.Show("저장될 목록명이 비어있습니다.", "Error"); return; } - string MorgeUser = Properties.Settings.Default.User; - string Compidx = Properties.Settings.Default.compidx; + string MorgeUser = PUB.user.UserName; + string Compidx = PUB.user.CompanyIdx; string NowDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss"); string[] Search_Col = { "idx" }; diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs index c2af017..26cbe8e 100644 --- a/unimarc/unimarc/마크/Marc_mkList.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -87,8 +87,8 @@ namespace UniMarc //customer idx 값이 있다면 그것을 사용한다. if (int.TryParse(marc.lbCustIDX.Text, out int custidx) == true && custidx > 0) { - string mCompidx = UniMarc.Properties.Settings.Default.compidx; - var dt = Helper_DB.GetDT("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {mCompidx} AND idx = {custidx}"); + //string mCompidx = PUB.user.CompanyIdx; + var dt = Helper_DB.GetDT("Client", "c_sangho,c_author_first,c_author_typeK,c_author_typeE,c_author_firstbook,c_author_divtype,c_author_divnum,c_author_four,c_pijunja,c_author_four_use", $"campanyidx = {PUB.user.CompanyIdx} AND idx = {custidx}"); if (dt != null && dt.Rows.Count > 0) { var row = dt.Rows[0]; @@ -208,7 +208,7 @@ namespace UniMarc string listName = tb_listName.Text; string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string outnum = tb_outnum.Text + "차"; - string user = Properties.Settings.Default.User; + string user = PUB.user.UserName;// Properties.Settings.Default.User; bool isAuthor = false; bool isBook = false; @@ -225,7 +225,7 @@ namespace UniMarc "etc", "user" }; string[] insert_list_data = { - Properties.Settings.Default.compidx, listName, Time, "진행", cb_listType.Text, + PUB.user.CompanyIdx, listName, Time, "진행", cb_listType.Text, cb_FirstAuthor.Text, cb_authorTypeK.Text, cb_authorTypeE.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text, rtb_etc.Text, user }; @@ -241,7 +241,7 @@ namespace UniMarc }; string[] insert_marc_data = { - Properties.Settings.Default.compidx, listName, Time, "", "", + PUB.user.CompanyIdx, listName, Time, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", diff --git a/unimarc/unimarc/마크/Set_Macro.cs b/unimarc/unimarc/마크/Set_Macro.cs index 9247dce..660c5a8 100644 --- a/unimarc/unimarc/마크/Set_Macro.cs +++ b/unimarc/unimarc/마크/Set_Macro.cs @@ -21,7 +21,7 @@ namespace UniMarc Marc_Plan mp; Helper_DB db = new Helper_DB(); DataGridView TargetGrid; - string compidx = UniMarc.Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; public string[] ViewMarcArray { get; set; } public string[] RunCode; @@ -182,8 +182,8 @@ namespace UniMarc string value = ""; if (sst.InputBox("생성할 목록명을 입력해주세요.", "목록 생성", ref value) == DialogResult.OK) { - string user = UniMarc.Properties.Settings.Default.User; - string compidx = UniMarc.Properties.Settings.Default.compidx; + string user = PUB.user.UserName; + string compidx = PUB.user.CompanyIdx;// UniMarc.Properties.Settings.Default.compidx; string MacroIndex = ""; for (int a = 0; a < MacroGrid.Rows.Count; a++) { @@ -218,7 +218,7 @@ namespace UniMarc string MacroIndex = ""; List tIDXList = new List(); - string compidx = UniMarc.Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; string listname = cb_SearchList.Text; //for (int a = 0; a < MacroGrid.Rows.Count; a++) //{ @@ -254,7 +254,7 @@ namespace UniMarc if (DialogResult.Yes != MessageBox.Show("현재 목록을 삭제하시겠습니까?", "목록 삭제", MessageBoxButtons.YesNo)) return; - string compidx = UniMarc.Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; string listname = cb_SearchList.Text; string Table = "Comp_SaveMacro"; diff --git a/unimarc/unimarc/마크/ShowDeleteMarc.cs b/unimarc/unimarc/마크/ShowDeleteMarc.cs index 880c6cb..a2c4d74 100644 --- a/unimarc/unimarc/마크/ShowDeleteMarc.cs +++ b/unimarc/unimarc/마크/ShowDeleteMarc.cs @@ -26,7 +26,7 @@ namespace UniMarc string Area = "`idx`, `grade`, `user_Del`, `date`, `ISBN`, " + "`서명`, `저자`, `출판사`, `가격`, `marc`"; - string compidx = Properties.Settings.Default.compidx; + string compidx = PUB.user.CompanyIdx; string cmd = string.Format("SELECT {0} FROM {1} WHERE `compidx` = {2};", Area, "Marc_Del", compidx); string res = db.self_Made_Cmd(cmd); InputGrid(res); diff --git a/unimarc/unimarc/편의기능/Send_Notice.cs b/unimarc/unimarc/편의기능/Send_Notice.cs index 57c7b05..7eaffdd 100644 --- a/unimarc/unimarc/편의기능/Send_Notice.cs +++ b/unimarc/unimarc/편의기능/Send_Notice.cs @@ -22,7 +22,7 @@ namespace UniMarc private void Send_Notice_Load(object sender, EventArgs e) { - label1.Text = Settings.Default.User + " | " + Settings.Default.compidx; + label1.Text = PUB.user.UserName + " | " + PUB.user.CompanyIdx; } } }