DB 연결 관리 개선 및 연결 해제(Dispose) 오류 해결: Helper_DB의 연결 생성 및 해제 로직을 안전하게 리팩토링하고 Search_Infor에서 지역 변수를 사용하도록 수정

D등급자료의 색상을 Red -> Darkviolet 변경, red는 데이터가 신규로 저장된다.
신규로 저장되는 자료의 인덱스를 저장하면서 바로 수집하도록 한다

unimarc/unimarc/CExt.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 
 
-namespace ExcelTest
+namespace UniMarc
 {
     public static class CExt
     {

unimarc/unimarc/Email.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using System.Web.Mail;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     class Email
     {

unimarc/unimarc/Helper_DB.cs

@@ -1,4 +1,7 @@
-using System;
+using AR;
+using MySql.Data.MySqlClient;
+using Renci.SshNet;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO.Ports;
@@ -6,16 +9,135 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using MySql.Data.MySqlClient;
+using UniMarc.BaroService_TI;
-using Renci.SshNet;
 using UniMarc.Properties;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
+
+    public partial class Helper_DB
+    {
+        //static string cs = "";
+        public enum eDbType
+        {
+            unimarc,
+            cl_marc
+        }
+        public static MySqlConnection CreateConnection(eDbType dbtype)
+        {
+            var dbname = dbtype.ToString();
+            string strConnection = string.Format(
+                          "Server={0};" +
+                          "Port={1};" +
+                          $"Database={dbname};" +
+                          "uid={2};" +
+                          "pwd={3};", ServerData[0], DBData[0], DBData[1], DBData[2]);
+            return new MySqlConnection(strConnection);
+        }
+
+        public static DataTable ExecuteQueryData(string query, MySqlConnection cn = null)
+        {
+            var bLocalCN = cn == null;
+            DataTable dt = new DataTable();
+            try
+            {
+                if (cn == null) cn = CreateConnection(eDbType.unimarc);// new MySqlConnection(cs);
+                var cmd = new MySqlCommand(query, cn);
+                cn.Open();
+                using (MySqlDataAdapter adapter = new MySqlDataAdapter(cmd))
+                {
+                    adapter.Fill(dt);
+                }
+                cmd.Dispose();
+                cn.Close();
+                if (bLocalCN) cn.Dispose();
+                return dt;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.ToString(), "ExecuteQueryData Error");
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 오류발생시 null을 반환합니다
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <param name="columns"></param>
+        /// <param name="wheres"></param>
+        /// <param name="orders"></param>
+        /// <returns></returns>
+        public static DataTable GetDT(string tableName, string columns = "*", string wheres = "", string orders = "", MySqlConnection cn = null)
+        {
+            var sql = $"select {columns} from {tableName}";
+            if (wheres.isEmpty() == false) sql += " where " + wheres;
+            if (orders.isEmpty() == false) sql += " order by " + orders;
+            return ExecuteQueryData(sql, cn);
+        }
+
+
+
+        /// <summary>
+        /// 오류발생시 -1을 반환합니다
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public static (int applyCount, string errorMessage) ExcuteNonQuery(string query, MySqlConnection cn = null)
+        {
+            try
+            {
+                var bLocalCN = cn == null;
+                if (cn == null) cn = CreateConnection(eDbType.unimarc);//new MySqlConnection(cs);
+                var cmd = new MySqlCommand(query, cn);
+                cn.Open();
+                var cnt = cmd.ExecuteNonQuery();
+                cmd.Dispose();
+                if (bLocalCN) cn.Dispose();
+                return (cnt, string.Empty);
+            }
+            catch (Exception ex)
+            {
+                return (-1, ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// Insert 명령을 수행한 후 자동 생성된 index값을 반환합니다.
+        /// 오류발생시에는 -1을 반환합니다
+        /// </summary>
+        /// <param name="cmd"></param>
+        /// <param name="cn"></param>
+        /// <returns></returns>
+        public long DB_Send_CMD_Insert_GetIdx(string cmd, MySqlConnection cn = null)
+        {
+            long lastId = -1;
+            var bLocalCN = cn == null;
+            try
+            {
+                
+                if (cn == null) cn = CreateConnection(eDbType.unimarc);//new MySqlConnection(cs);
+                using (var sqlcmd = new MySqlCommand(cmd, cn))
+                {
+                    cn.Open();
+                    sqlcmd.ExecuteNonQuery();
+                    lastId = sqlcmd.LastInsertedId;
+                }
+                if (bLocalCN) cn.Dispose();
+            }
+            catch (Exception ex)
+            {
+                UTIL.MsgE($"데이터베이스 실행오류\n{ex.Message}");
+            }
+            return lastId;
+        }
+
+
+    }
     /// <summary>
     /// DB접속을 도와주는 클래스
     /// </summary>
-    public class Helper_DB
+    public partial class Helper_DB
     {
         // 접속
         MySqlConnection conn;
@@ -23,14 +145,14 @@ namespace WindowsFormsApp1
         /// <summary>
         /// IP / Port / Uid / pwd
         /// </summary>
-        string[] ServerData = {
+        static string[] ServerData = {
             Settings.Default.IP,
             Settings.Default.Uid,
             Settings.Default.pwd
         };
         int port = Settings.Default.Port;
 
-        string[] DBData = {
+        static string[] DBData = {
             Settings.Default.dbPort,
             Settings.Default.dbUid,
             Settings.Default.dbPwd
@@ -40,7 +162,28 @@ namespace WindowsFormsApp1
         MySqlCommand sqlcmd = new MySqlCommand();
         MySqlDataReader sd;
 
-        public string comp_idx { get; internal set; }
+        public MySqlConnection CreateConnection()
+        {
+            PasswordConnectionInfo connectionInfo = new PasswordConnectionInfo(ServerData[0], port, ServerData[1], ServerData[2]);
+            connectionInfo.Timeout = TimeSpan.FromSeconds(30);
+            using (var client = new SshClient(connectionInfo))
+            {
+                client.Connect();
+                if (client.IsConnected)
+                {
+                    string strConnection = string.Format(
+                        "Server={0};" +
+                        "Port={1};" +
+                        "Database=unimarc;" +
+                        "uid={2};" +
+                        "pwd={3};", ServerData[0], DBData[0], DBData[1], DBData[2]);
+                    return new MySqlConnection(strConnection);
+                }
+            }
+
+            return null;
+        }
+
 
         /// <summary>
         /// DB를 사용하고 싶을 때 미리 저장된 DB의 기본 접속정보를 이용하여 DB에 접근한다.
@@ -60,43 +203,17 @@ namespace WindowsFormsApp1
                 client.Connect();
                 if (client.IsConnected)
                 {
-                    string strConnection = string.Format(
+                    var cs = string.Format(
                         "Server={0};" +
                         "Port={1};" +
                         "Database=unimarc;" +
                         "uid={2};" +
                         "pwd={3};", ServerData[0], DBData[0], DBData[1], DBData[2]);
-                    conn = new MySqlConnection(strConnection);
+                    conn = new MySqlConnection(cs);
                 }
             }
         }
 
-        public MySql.Data.MySqlClient.MySqlConnection CreateConnection()
-        {
-            PasswordConnectionInfo connectionInfo = new PasswordConnectionInfo(ServerData[0], port, ServerData[1], ServerData[2]);
-            connectionInfo.Timeout = TimeSpan.FromSeconds(30);
-            using (var client = new SshClient(connectionInfo))
-            {
-                if (conn != null)
-                {
-                    conn.Close();
-                    conn.Dispose();
-                }
-                client.Connect();
-                if (client.IsConnected)
-                {
-                    string strConnection = string.Format(
-                        "Server={0};" +
-                        "Port={1};" +
-                        "Database=unimarc;" +
-                        "uid={2};" +
-                        "pwd={3};", ServerData[0], DBData[0], DBData[1], DBData[2]);
-                    return new MySqlConnection(strConnection);
-                }
-            }
-
-            return null;
-        }
 
         /// <summary>
         /// 국중DB를 사용하고 싶을 때 미리 저장된 DB의 기본 접속정보를 이용하여 DB에 접근한다.
@@ -125,30 +242,8 @@ namespace WindowsFormsApp1
                 }
             }
         }
-        public DataTable ExecuteQueryData(string cmd)
-        {
-            DataTable dt = new DataTable();
-            try
-            {
-                conn.Open();
-                sqlcmd.CommandText = cmd;
-                sqlcmd.Connection = conn;
 
-                using (MySqlDataAdapter adapter = new MySqlDataAdapter(sqlcmd))
+
-                {
-                    adapter.Fill(dt);
-                }
-            }
-            catch (Exception ex)
-            {
-                 MessageBox.Show(ex.ToString(), "ExecuteQueryData Error");
-            }
-            finally
-            {
-                if (conn.State == ConnectionState.Open) conn.Close();
-            }
-            return dt;
-        }
         public string DB_Send_CMD_Search(string cmd)
         {
 
@@ -247,34 +342,8 @@ namespace WindowsFormsApp1
             }
             conn.Close();
         }
-        public void DB_Send_CMD_reVoid(string cmd)
-        {
 
 
-            //using (conn)
-            {
-                conn.Open();
-                MySqlTransaction tran = conn.BeginTransaction();
-                sqlcmd.Connection = conn;
-                sqlcmd.Transaction = tran;
-                try
-                {
-                    sqlcmd.CommandText = cmd;
-                    sqlcmd.ExecuteNonQuery();
-                    tran.Commit();
-                }
-                catch (Exception ex)
-                {
-                    tran.Rollback();
-                    MessageBox.Show(ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-                finally
-                {
-                    if (conn != null && conn.State != System.Data.ConnectionState.Closed)
-                        conn.Close();
-                }
-            }
-        }
         /// <summary>
         /// DBcon이 선진행되어야함.
         /// SELECT * FROM [DB_Table_Name] WHERE [DB_Where_Table] LIKE \"%DB_Search_Data%\"

unimarc/unimarc/Helper_DB2.cs

@@ -1,48 +0,0 @@
-using AR;
-using Microsoft.Vbe.Interop;
-using MySql.Data.MySqlClient;
-using OpenQA.Selenium.BiDi.Input;
-using Renci.SshNet;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using UniMarc;
-using UniMarc.Properties;
-
-namespace WindowsFormsApp1
-{
-    public static class DB2
-    {
-        public static DataTable GetDT(string tableName, string columns="*" , string wheres="", string orders="")
-        {
-            var sql = $"select {columns} from {tableName}";
-            if (wheres.isEmpty() == false) sql += " where " + wheres;
-            if (orders.isEmpty() == false) sql += " order by " + orders;
-            Helper_DB db = new Helper_DB();
-            var cn = db.CreateConnection();
-            var da = new MySql.Data.MySqlClient.MySqlDataAdapter(sql, cn);
-            var dt = new DataTable();
-            da.Fill(dt);
-            dt.AcceptChanges();
-            return dt;
-        }
-
-        public static int ExcuteNonQuery(string query)
-        {
-            Helper_DB db = new Helper_DB();
-            var cn = db.CreateConnection();
-            var cmd = new MySqlCommand(query, cn);
-            cn.Open();
-            var cnt = cmd.ExecuteNonQuery();
-            cmd.Dispose();
-            cn.Dispose();
-            return cnt;
-            
-        }
-    }
-}

unimarc/unimarc/Login.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class login
     {

unimarc/unimarc/Login.cs

@@ -12,7 +12,7 @@ using System.Net;
 using System.Net.Sockets;
 using Application = System.Windows.Forms.Application;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     public partial class login : Form
     {
@@ -25,7 +25,7 @@ namespace WindowsFormsApp1
 
         private void login_Load(object sender, EventArgs e)
         {
-            lbl_IP.Text = String.Format("{0}", ip.GetIP);
+            lbl_IP.Text = String.Format("{0}", ip.GetIP());
             lbl_Version.Text = string.Format("Ver.{0}", ip.VersionInfo());
 
             this.ActiveControl = ID_text;
@@ -79,7 +79,7 @@ namespace WindowsFormsApp1
                         return;
                     }
                     ((Main)(this.Owner)).IPText.Text = string.Format("접속 아이피 : {0}", lbl_IP.Text);
-                    db.DB_Send_CMD_reVoid(
+                    Helper_DB.ExcuteNonQuery(
                         string.Format("UPDATE `User_Data` SET `lastIP` = \"{0}\", `lastDate` = \"{2}\" WHERE `ID` = \"{1}\"",
                         lbl_IP.Text, ID_text.Text, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
                         );

unimarc/unimarc/Main.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class Main
     {
@@ -67,6 +67,7 @@
             this.작업지시서 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크작업 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크작성 = new System.Windows.Forms.ToolStripMenuItem();
+            this.신규마크작성NewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.마크목록 = new System.Windows.Forms.ToolStripMenuItem();
             this.소장자료검색 = new System.Windows.Forms.ToolStripMenuItem();
             this.마크정리 = new System.Windows.Forms.ToolStripMenuItem();
@@ -127,7 +128,7 @@
             this.ShortCut2 = new System.Windows.Forms.Button();
             this.ShortCut1 = new System.Windows.Forms.Button();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
+            this.lbCompanyName = new System.Windows.Forms.ToolStripLabel();
             this.VersionText = new System.Windows.Forms.ToolStripLabel();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.botUserLabel = new System.Windows.Forms.ToolStripLabel();
@@ -139,7 +140,6 @@
             this.mdiTabControl = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.신규마크작성NewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -418,7 +418,7 @@
             this.불용어,
             this.작업지시서});
             this.마크설정.Name = "마크설정";
-            this.마크설정.Size = new System.Drawing.Size(180, 22);
+            this.마크설정.Size = new System.Drawing.Size(156, 22);
             this.마크설정.Text = "설정";
             // 
             // 단축키설정
@@ -464,7 +464,7 @@
             this.복본조사2,
             this.iSBN조회});
             this.마크작업.Name = "마크작업";
-            this.마크작업.Size = new System.Drawing.Size(180, 22);
+            this.마크작업.Size = new System.Drawing.Size(156, 22);
             this.마크작업.Text = "마크 작업";
             // 
             // 마크작성
@@ -475,6 +475,13 @@
             this.마크작성.ToolTipText = "마크 작성(2)";
             this.마크작성.Click += new System.EventHandler(this.마크작성ToolStripMenuItem_Click);
             // 
+            // 신규마크작성NewToolStripMenuItem
+            // 
+            this.신규마크작성NewToolStripMenuItem.Name = "신규마크작성NewToolStripMenuItem";
+            this.신규마크작성NewToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
+            this.신규마크작성NewToolStripMenuItem.Text = "신규마크 작성(New)";
+            this.신규마크작성NewToolStripMenuItem.Click += new System.EventHandler(this.신규마크작성NewToolStripMenuItem_Click);
+            // 
             // 마크목록
             // 
             this.마크목록.Name = "마크목록";
@@ -523,7 +530,7 @@
             this.목록,
             this.편목});
             this.dVDCDLPToolStripMenuItem.Name = "dVDCDLPToolStripMenuItem";
-            this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
             this.dVDCDLPToolStripMenuItem.Text = "DVD / CD / LP";
             // 
             // 목록
@@ -547,7 +554,7 @@
             this.마크반입,
             this.마크반출});
             this.반입및반출.Name = "반입및반출";
-            this.반입및반출.Size = new System.Drawing.Size(180, 22);
+            this.반입및반출.Size = new System.Drawing.Size(156, 22);
             this.반입및반출.Text = "반입 및 반출";
             // 
             // 마크반입
@@ -572,7 +579,7 @@
             this.검수,
             this.저자기호});
             this.부가기능.Name = "부가기능";
-            this.부가기능.Size = new System.Drawing.Size(180, 22);
+            this.부가기능.Size = new System.Drawing.Size(156, 22);
             this.부가기능.Text = "부가기능";
             // 
             // 마크수집
@@ -613,7 +620,7 @@
             this.DLS조회,
             this.dLS복본조사});
             this.DLS.Name = "DLS";
-            this.DLS.Size = new System.Drawing.Size(180, 22);
+            this.DLS.Size = new System.Drawing.Size(156, 22);
             this.DLS.Text = "DLS";
             // 
             // DLS조회
@@ -637,7 +644,7 @@
             this.마크통계,
             this.장비관리});
             this.마크기타.Name = "마크기타";
-            this.마크기타.Size = new System.Drawing.Size(180, 22);
+            this.마크기타.Size = new System.Drawing.Size(156, 22);
             this.마크기타.Text = "기타";
             // 
             // 서류작성
@@ -1042,7 +1049,7 @@
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripLabel2,
+            this.lbCompanyName,
             this.VersionText,
             this.toolStripSeparator1,
             this.botUserLabel,
@@ -1056,11 +1063,11 @@
             this.toolStrip1.TabIndex = 4;
             this.toolStrip1.Text = "toolStrip1";
             // 
-            // toolStripLabel2
+            // lbCompanyName
             // 
-            this.toolStripLabel2.Name = "toolStripLabel2";
+            this.lbCompanyName.Name = "lbCompanyName";
-            this.toolStripLabel2.Size = new System.Drawing.Size(43, 22);
+            this.lbCompanyName.Size = new System.Drawing.Size(43, 22);
-            this.toolStripLabel2.Text = "회사명";
+            this.lbCompanyName.Text = "회사명";
             // 
             // VersionText
             // 
@@ -1119,7 +1126,7 @@
             // 
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Size = new System.Drawing.Size(1656, 687);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "tabPage1";
@@ -1129,19 +1136,12 @@
             // 
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1656, 688);
+            this.tabPage2.Size = new System.Drawing.Size(1656, 687);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
-            // 신규마크작성NewToolStripMenuItem
-            // 
-            this.신규마크작성NewToolStripMenuItem.Name = "신규마크작성NewToolStripMenuItem";
-            this.신규마크작성NewToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
-            this.신규마크작성NewToolStripMenuItem.Text = "신규마크 작성(New)";
-            this.신규마크작성NewToolStripMenuItem.Click += new System.EventHandler(this.신규마크작성NewToolStripMenuItem_Click);
-            // 
             // Main
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1248,7 +1248,7 @@
         private System.Windows.Forms.OpenFileDialog openFileDialog1;
         private System.Windows.Forms.ToolStripMenuItem 매출입금;
         private System.Windows.Forms.ToolStripMenuItem 반품처리;
-        public System.Windows.Forms.ToolStripLabel toolStripLabel2;
+        public System.Windows.Forms.ToolStripLabel lbCompanyName;
         private System.Windows.Forms.ToolStripMenuItem 파트타임관리;
         public System.Windows.Forms.ToolStripLabel botUserLabel;
         private System.Windows.Forms.ToolStripMenuItem 복본조사1;

unimarc/unimarc/Main.cs

@@ -12,32 +12,16 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using UniMarc;
 using UniMarc.Properties;
-using UniMarc.개발자용;
-using UniMarc.마크;
-using UniMarc.회계;
-using WindowsFormsApp1.Account;
-using WindowsFormsApp1.Convenience;
-using WindowsFormsApp1.Delivery;
-using WindowsFormsApp1.DLS;
-using WindowsFormsApp1.Home;
-using WindowsFormsApp1.Mac;
-using WindowsFormsApp1.Work_log;
-using WindowsFormsApp1.납품관리;
-using WindowsFormsApp1.마크;
-using WindowsFormsApp1.회계;
 
-
+namespace UniMarc
-namespace WindowsFormsApp1
 {
     public partial class Main : Form
     {
         Helper_DB _DB = new Helper_DB();
         IP ip = new IP();
         public string DB_User_Data;
-        public string User;
+    
-        public string com_idx;
 
         public Main()
         {
@@ -47,7 +31,7 @@ namespace WindowsFormsApp1
             this.mdiTabControl.DrawItem += MdiTabControl_DrawItem;
             PUB.Init();
             this.btDevDb.Visible = System.Diagnostics.Debugger.IsAttached;
-            if(System.Diagnostics.Debugger.IsAttached)
+            if (System.Diagnostics.Debugger.IsAttached)
             {
                 this.Size = new Size(1920, 1080);
                 this.WindowState = FormWindowState.Normal;
@@ -82,28 +66,33 @@ namespace WindowsFormsApp1
             {
                 string[] result = DB_User_Data.Split('|');
 
-                if (result[3] == null) { }
+                if (result[3] == null) {
+                    PUB.user.UserName = "";
+                    PUB.user.CompanyName = string.Empty;
+                }
                 else
                 {
-                    toolStripLabel2.Text = result[4];
+                    PUB.user.CompanyName = result[4];
-                    botUserLabel.Text = result[3];
+                    PUB.user.UserName = result[3];
-                    User = result[3];
                 }
 
                 cmd = _DB.DB_Select_Search("`idx`", "Comp", "comp_name", result[4]);
-                com_idx = _DB.DB_Send_CMD_Search(cmd).Replace("|", "");
+                PUB.user.CompanyIdx = _DB.DB_Send_CMD_Search(cmd).Replace("|", "");
 
-                if (com_idx != "1")
+                if (PUB.user.CompanyIdx != "1")
                 {
                     납품관리ToolStripMenuItem.Visible = false;
                     회계ToolStripMenuItem.Visible = false;
                 }
                 if (result[5] != "관리자") { 마스터ToolStripMenuItem.Visible = false; }
 
-                Settings.Default.compidx = com_idx;
+                lbCompanyName.Text = PUB.user.CompanyName;
-                Settings.Default.User = botUserLabel.Text;
+                botUserLabel.Text = PUB.user.UserName;
 
-                this.Text = "[ '" + com_idx + "' : " + result[4] + " - " + result[3] + "]";
+
+                
+
+                this.Text = "[ '" + PUB.user.CompanyIdx + "' : " + result[4] + " - " + result[3] + "]";
 
                 isAccess();
                 SetBtnName();
@@ -668,7 +657,7 @@ namespace WindowsFormsApp1
 
         private void dLS조회ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            OpenFormInTab(() => new School_Lookup(this));
+            OpenFormInTab(() => new DLS_Lookup(this));
         }
         private void dLS복본조사ToolStripMenuItem_Click(object sender, EventArgs e)
         {

unimarc/unimarc/PUB.cs

@@ -8,11 +8,17 @@ using UniMarc.Properties;
 
 namespace UniMarc
 {
+    public class LoginInfo
+    {
+        public string UserName { get; set; }
+        public string CompanyIdx { get; set; }
+        public string CompanyName { get; set; }
+    }
     public static class PUB
     {
         public static arUtil.Log log;
         public static UserSetting setting;
-
+        public static LoginInfo user;
         public static void Init()
         {
             #region "Log setting"
@@ -25,6 +31,8 @@ namespace UniMarc
             
             setting = new UserSetting();
             setting.Load();
+
+            user = new LoginInfo();
         }
 
     }

unimarc/unimarc/Program.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     static class Program
     {

unimarc/unimarc/SearchModel/AnsanLibSearcher.cs

@@ -17,7 +17,6 @@ using System.Threading.Tasks;
 using System.Web.UI.WebControls;
 using System.Xml.Linq;
 using UniMarc.SearchModel;
-using UniMarc.마크;
 using WebDriverManager;
 using WebDriverManager.DriverConfigs.Impl;
 

unimarc/unimarc/SearchModel/BukguLibSearcher.cs

@@ -12,7 +12,6 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using UniMarc.SearchModel;
-using UniMarc.마크;
 using WebDriverManager;
 using WebDriverManager.DriverConfigs.Impl;
 

unimarc/unimarc/SearchModel/BukguPublicLibSearcher.cs

@@ -12,7 +12,6 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using UniMarc.SearchModel;
-using UniMarc.마크;
 using WebDriverManager;
 using WebDriverManager.DriverConfigs.Impl;
 

unimarc/unimarc/SearchModel/BukguSlibSearcher.cs

@@ -12,7 +12,6 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using UniMarc.SearchModel;
-using UniMarc.마크;
 using WebDriverManager;
 using WebDriverManager.DriverConfigs.Impl;
 

unimarc/unimarc/SearchModel/DLSSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/GochangLibSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/GoheungLibSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/GwangjuCityLibSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/GwangjuSeoguLibSearcher.cs

@@ -15,7 +15,6 @@ using System.Threading.Tasks;
 using System.Web.UI.WebControls;
 using System.Xml.Linq;
 using UniMarc.SearchModel;
-using UniMarc.마크;
 using WebDriverManager;
 using WebDriverManager.DriverConfigs.Impl;
 

unimarc/unimarc/SearchModel/JeonbukEduLibSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/JunnamEduJiheaNuriSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/JunnamEduSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/NamguLibrarySearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/SearchModel/WandoLibSearcher.cs

@@ -9,7 +9,6 @@ using WebDriverManager.DriverConfigs.Impl;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniMarc.마크;
 using OpenQA.Selenium.Chromium;
 using UniMarc.SearchModel;
 using System.Runtime.CompilerServices;

unimarc/unimarc/Skill.cs

@@ -25,7 +25,7 @@ using System.Threading;
 using System.Data.SqlTypes;
 using AR;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     /// <summary>
     /// 여러 기능들이 추가될 예정.
@@ -3005,21 +3005,49 @@ namespace WindowsFormsApp1
 
     public class IP
     {
-        /// <summary>
-        /// 현 PC의 외부아이피를 가져옴
-        /// 프로그램에서 가져올 방법이 딱히 없어 꼼수로 웹사이트 크롤링을 통해 가져옴
-        /// </summary>
-        public string GetIP
-        {
-            get
-            {
-                string externalIp = new WebClient().DownloadString("http://ipinfo.io/ip").Trim();   // http://icanhazip.com
         
-                if (string.IsNullOrWhiteSpace(externalIp))
+        public string GetIP()
-                    externalIp = GetIP;
+        {
-                return externalIp;
+            // 최신 사이트 접속을 위한 TLS 1.2 활성화 (강제 지정)
+            // Windows 7 / .NET 4.0에서는 이 설정이 없으면 HTTPS 접속이 실패할 수 있습니다.
+            try { ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; } catch { }
+
+            string[] urls = {
+                "http://checkip.amazonaws.com",
+                "http://ipinfo.io/ip",
+                "https://api.ipify.org"
+            };
+
+            foreach (var url in urls)
+            {
+                try
+                {
+                    HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+                    request.Timeout = 2000;
+                    // 브라우저처럼 보이게 하기 위해 User-Agent 추가 (많은 사이트가 이를 요구함)
+                    request.UserAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36";
+
+                    using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+                    using (Stream stream = response.GetResponseStream())
+                    using (StreamReader reader = new StreamReader(stream))
+                    {
+                        string ip = reader.ReadToEnd().Trim();
+                        // IP 형식인지 검증
+                        IPAddress address;
+                        if (IPAddress.TryParse(ip, out address))
+                        {
+                            // IPv4인 경우에만 반환 (필요시 IPv6 허용 가능)
+                            if (address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                                return ip;
+                        }
+                    }
+                }
+                catch { continue; } // 다음 URL 시도
             }
+            return "IP 확인 실패";
         }
+
+
         public string VersionInfo()
         {
             string version = "0";

unimarc/unimarc/UniMarc.csproj

@@ -224,7 +224,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
-    <Compile Include="Helper_DB2.cs" />
     <Compile Include="Helper_LibraryDelaySettings.cs" />
     <Compile Include="ListOfValue\fSelectDT.cs">
       <SubType>Form</SubType>
@@ -360,6 +359,7 @@
       <DependentUpon>Help_008.cs</DependentUpon>
     </Compile>
     <Compile Include="마크\MacEditorParameter.cs" />
+    <Compile Include="마크\MacListItem.cs" />
     <Compile Include="마크\Mac_List_Add.cs">
       <SubType>Form</SubType>
     </Compile>

unimarc/unimarc/recover_v2.ps1

@@ -0,0 +1,23 @@
+$path = "s:\Source\Gloria\Unimarc\unimarc\unimarc\Helper_LibraryDelaySettings.cs"
+$utf8 = [System.Text.Encoding]::GetEncoding(65001)
+$cp949 = [System.Text.Encoding]::GetEncoding(949)
+
+# Read the CURRENT mangled file as UTF-8
+$mangledString = [System.IO.File]::ReadAllText($path, $utf8)
+
+# Convert each character to its CP949 bytes
+# Note: This is tricky because some "characters" might be multiple bytes in CP949
+# but here each character in the string represents what CP949 read from the original UTF-8 bytes.
+$byteList = New-Object System.Collections.Generic.List[byte]
+foreach ($char in $mangledString.ToCharArray()) {
+    $cBytes = $cp949.GetBytes($char)
+    foreach ($b in $cBytes) {
+        $byteList.Add($b)
+    }
+}
+
+# Now interpret these bytes as UTF-8 (the original encoding)
+$restored = $utf8.GetString($byteList.ToArray())
+
+Write-Host "--- Attempted Restoration ---"
+Write-Host ($restored -split "`r`n" | select -First 10)

unimarc/unimarc/개발자용/fDevDB.Designer.cs

@@ -1,4 +1,4 @@
-namespace UniMarc.개발자용
+namespace UniMarc
 {
     partial class fDevDB
     {

unimarc/unimarc/개발자용/fDevDB.cs

@@ -8,9 +8,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.개발자용
+namespace UniMarc
 {
     public partial class fDevDB : Form
     {

unimarc/unimarc/납품관리/Book_Lookup.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Book_Lookup
     {

unimarc/unimarc/납품관리/Book_Lookup.cs

@@ -9,10 +9,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Mac;
-using WindowsFormsApp1.납품관리;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Book_Lookup : Form
     {
@@ -22,7 +20,6 @@ namespace WindowsFormsApp1.Delivery
         List_Lookup ll;
         Bring_Back bb;
         Check_ISBN cisbn;
-        string compidx;
         string list_name;
         int idx;
         public Book_Lookup(Order_input _oin)
@@ -30,35 +27,30 @@ namespace WindowsFormsApp1.Delivery
             InitializeComponent();
             oin = _oin;
             idx = oin.grididx;
-            compidx = oin.compidx;
         }
         public Book_Lookup(Purchase _pur)
         {
             InitializeComponent();
             pur = _pur;
             idx = pur.grididx;
-            compidx = pur.compidx;
         }
         public Book_Lookup(List_Lookup _ll)
         {
             InitializeComponent();
             ll = _ll;
             idx = ll.grididx;
-            compidx = ll.compidx;
         }
         public Book_Lookup(Bring_Back _bb)
         {
             InitializeComponent();
             bb = _bb;
             idx = bb.grididx;
-            compidx = bb.compidx;
         }
         public Book_Lookup(Check_ISBN _isbn)
         {
             InitializeComponent();
             cisbn = _isbn;
             idx = cisbn.rowidx;
-            compidx = cisbn.compidx;
         }
         private void Book_Lookup_Load(object sender, EventArgs e)
         {
@@ -72,7 +64,7 @@ namespace WindowsFormsApp1.Delivery
              * idx 도서명 저자 출판사 isbn 
              * 정가 수량 입고수 합계금액 비고 
              * 주문처 주문일자 */
-            string[] List_book = { compidx, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text,
+            string[] List_book = { PUB.user.CompanyIdx, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text,
                 tb_pay.Text, tb_count.Text, tb_stock.Text, tb_total.Text, tb_etc.Text,
                 tb_order1.Text, tb_order_date.Text, tb_List_name.Text };
         }
@@ -81,7 +73,7 @@ namespace WindowsFormsApp1.Delivery
             string Area = "`order`, `pay`, `count`, `persent`, " +                      // 0-3
                           "`order_date`, `import_date`, `chk_date`, `export_date`";     // 4-7
             string[] Search_col = { "compidx", "list_name", "book_name", "author", "book_comp" };
-            string[] Search_data = { compidx, tb_List_name.Text, tb_book_name.Text, tb_author.Text, tb_book_comp.Text };
+            string[] Search_data = { PUB.user.CompanyIdx, tb_List_name.Text, tb_book_name.Text, tb_author.Text, tb_book_comp.Text };
             string cmd = db.More_DB_Search("Obj_List_Book", Search_col, Search_data, Area);
             string db_res = db.DB_Send_CMD_Search(cmd);
             string[] db_data = db_res.Split('|');
@@ -125,7 +117,7 @@ namespace WindowsFormsApp1.Delivery
                             "`total`, `header`, `num`, `order`, `etc`, " +
                             "`input_count`, `order_date`, `list_name`, `idx`";
 
-            string[] data = { compidx, book_name, author, book_comp, list_name };
+            string[] data = { PUB.user.CompanyIdx, book_name, author, book_comp, list_name };
             string[] table = { "compidx", "book_name", "author", "book_comp", "list_name" };
             string cmd = db.More_DB_Search("Obj_List_Book", table, data, search);
             string db_res = db.DB_Send_CMD_Search(cmd);
@@ -138,7 +130,7 @@ namespace WindowsFormsApp1.Delivery
                             "`total`, `header`, `num`, `order`, `etc`, " +
                             "`input_count`, `order_date`, `list_name`, `idx`";
 
-            string[] data = { compidx, idx };
+            string[] data = { PUB.user.CompanyIdx, idx };
             string[] table = { "compidx", "idx" };
             string cmd = db.More_DB_Search("Obj_List_Book", table, data, search);
             string db_res = db.DB_Send_CMD_Search(cmd);
@@ -169,7 +161,7 @@ namespace WindowsFormsApp1.Delivery
         private void list_db()
         {
             string[] where_table = { "comp_num", "list_name" };
-            string[] search_data = { compidx, list_name };
+            string[] search_data = { PUB.user.CompanyIdx, list_name };
             string cmd = db.More_DB_Search("Obj_List", where_table, search_data, 
                 "`clt`, `dly`, `charge`, `date`, `date_res`");
             cmd = db.DB_Send_CMD_Search(cmd);
@@ -186,7 +178,7 @@ namespace WindowsFormsApp1.Delivery
         private string isbn()
         {
             string[] where_table = { "compidx", "list_name", "book_name", "author", "book_comp" };
-            string[] search_data = { compidx, 
+            string[] search_data = { PUB.user.CompanyIdx, 
                 list_name, tb_book_name.Text, tb_author.Text, tb_book_comp.Text };
             string cmd = db.More_DB_Search("Obj_List_Book", where_table, search_data, "`isbn`");
             string db_res = db.DB_Send_CMD_Search(cmd);
@@ -211,14 +203,14 @@ namespace WindowsFormsApp1.Delivery
                 "pay", "count", "input_count", "total", "etc", 
                 "order", "order_date", "list_name" };
             string[] List_book = { 
-                compidx, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text, 
+                PUB.user.CompanyIdx, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text, 
                 tb_pay.Text, tb_count.Text, tb_stock.Text, tb_total.Text, tb_etc.Text, 
                 tb_order1.Text, tb_order_date.Text, tb_List_name.Text };
             string[] idx_table = { "idx" };
             string[] idx_col = { lbl_idx.Text };
 
             string U_cmd = db.More_Update("Obj_List_Book", Table, List_book, idx_table, idx_col);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
             MessageBox.Show("저장되었습니다.");
         }
         private void btn_close_Click(object sender, EventArgs e)
@@ -232,10 +224,10 @@ namespace WindowsFormsApp1.Delivery
             string[] edit_tbl = { "input_count", "import", "import_date" };
             string[] edit_col = { tb_stock.Text, "입고", DateTime.Today.ToString("yyyy-MM-dd") };
             string[] search_tbl = { "compidx", "list_name", "book_name", "author", "book_comp",  "isbn" };
-            string[] search_col = { compidx, 
+            string[] search_col = { PUB.user.CompanyIdx, 
                         tb_List_name.Text, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text };
             string U_cmd = db.More_Update("Obj_List_Book", edit_tbl, edit_col, search_tbl, search_col);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
             MessageBox.Show(tb_book_name.Text + "가 입고처리되었습니다.");
             mk_Grid();
         }
@@ -248,10 +240,10 @@ namespace WindowsFormsApp1.Delivery
             string[] edit_col = { tb_stock.Text, "미입고", "" };
             string[] search_tbl = { "compidx", 
                 "list_name", "book_name", "author", "book_comp", "isbn" };
-            string[] search_col = { compidx,
+            string[] search_col = { PUB.user.CompanyIdx,
                 tb_List_name.Text, tb_book_name.Text, tb_author.Text, tb_book_comp.Text, tb_isbn.Text };
             string U_cmd = db.More_Update("Obj_List_Book", edit_tbl, edit_col, search_tbl, search_col);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             MessageBox.Show(tb_book_name.Text + "가 미입고처리되었습니다.");
             mk_Grid();

unimarc/unimarc/납품관리/Bring_Back.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace WindowsFormsApp1.납품관리
+namespace UniMarc
 {
     partial class Bring_Back
     {

unimarc/unimarc/납품관리/Bring_Back.cs

@@ -7,13 +7,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Delivery;
 
-namespace WindowsFormsApp1.납품관리
+namespace UniMarc
 {
     public partial class Bring_Back : Form
     {
-        public string compidx;
         public int grididx;
         Main main;
         Helper_DB db = new Helper_DB();
@@ -21,14 +19,13 @@ namespace WindowsFormsApp1.납품관리
         {
             InitializeComponent();
             main = _main;
-            compidx = main.com_idx;
         }
         private void Bring_Back_Load(object sender, EventArgs e)
         {
             db.DBcon();
             string Area = "`list_name`";
             string[] sear_col = { "comp_num", "state" };
-            string[] sear_data = { compidx, "진행" };
+            string[] sear_data = { PUB.user.CompanyIdx, "진행" };
             string cmd = db.More_DB_Search("Obj_List", sear_col, sear_data, Area);
             string db_res = db.DB_Send_CMD_Search(cmd);
             string[] arr_data = db_res.Split('|');
@@ -44,7 +41,7 @@ namespace WindowsFormsApp1.납품관리
             string Area = "`idx`, `num`, `book_name`, `author`, `book_comp`, " +
                           "`isbn`, `price`, `count`, `total`, `list_name`, `etc`";
             string[] sear_col = { "compidx", "list_name" };
-            string[] sear_data = { compidx, cb_list_name.Text };
+            string[] sear_data = { PUB.user.CompanyIdx, cb_list_name.Text };
             string cmd = db.More_DB_Search("Obj_List_Book", sear_col, sear_data, Area);
             string db_res = db.DB_Send_CMD_Search(cmd);
             string[] arr_data = db_res.Split('|');
@@ -92,11 +89,11 @@ namespace WindowsFormsApp1.납품관리
         private void Return(int a)
         {
             string[] sear_col = { "idx", "compidx" };
-            string[] sear_data = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx };
+            string[] sear_data = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), PUB.user.CompanyIdx };
             string[] edit_col = { "import", "etc" };
             string[] edit_data = { "미입고", "반품처리 " + dataGridView1.Rows[a].Cells["etc"].Value.ToString() };
             string U_cmd = db.More_Update("Obj_List_Book", edit_col, edit_data, sear_col, sear_data);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
         }
         #endregion
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)

unimarc/unimarc/납품관리/Commodity_Edit.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Commodity_Edit
     {

unimarc/unimarc/납품관리/Commodity_Edit.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Commodity_Edit : Form
     {
@@ -60,7 +60,7 @@ namespace WindowsFormsApp1.Delivery
             string[] book_data = { date, New_Name.Text };
 
             string U_cmd = DB.More_Update("Obj_List_Book", book_col, book_data, book_search_col, book_search_data);
-            DB.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             ////////////////////////////////////////
 
@@ -71,7 +71,7 @@ namespace WindowsFormsApp1.Delivery
             string[] list_data = { date, New_Clit.Text, New_Dlv.Text, New_User.Text, New_Name.Text };
 
             U_cmd = DB.More_Update("Obj_List", list_col, list_data, list_search_col, list_search_data);
-            DB.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             Close();
         }

unimarc/unimarc/납품관리/Commodity_Morge.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Commodity_Morge
     {

unimarc/unimarc/납품관리/Commodity_Morge.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Commodity_Morge : Form
     {
@@ -99,7 +99,7 @@ namespace WindowsFormsApp1.Delivery
 
             string cmd = "";
             cmd = DB.More_Update("Obj_List_Book", up_col, up_data1, up_col, up_data2);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
             int cout1 = Convert.ToInt32(list1[7]);
             int cout2 = Convert.ToInt32(list2[7]);
             int cout = cout1 + cout2;
@@ -111,17 +111,17 @@ namespace WindowsFormsApp1.Delivery
             string[] edit_col = { "total", "compidx" };
             string[] edit_data = { tol.ToString(), com.comp_idx };
             cmd = DB.More_Update("Obj_List_Marc", edit_col, edit_data, up_col, up_data1);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
             cmd = DB.DB_Delete_More_term("Obj_List_Marc", "compidx", com.comp_idx, up_col, up_data2);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
 
             edit_col[1] = "vol";
             edit_data[1] = cout.ToString();
             up_col[0] = "comp_num";
             cmd = DB.More_Update("Obj_List", edit_col, edit_data, up_col, up_data1);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
             cmd = DB.DB_Delete_More_term("Obj_List", "comp_num", com.comp_idx, up_col, up_data2);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
         }
         /// <summary>
         /// data1가 data2으로 적용됨. 1 => 2로
@@ -133,7 +133,7 @@ namespace WindowsFormsApp1.Delivery
             string[] up_data2 = tmp2.ToArray();
             string cmd = "";
             cmd = DB.More_Update("Obj_List_Book", up_col, up_data2, up_col, up_data1);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
             int cout1 = Convert.ToInt32(list1[7]);
             int cout2 = Convert.ToInt32(list2[7]);
             int cout = cout1 + cout2;
@@ -145,17 +145,17 @@ namespace WindowsFormsApp1.Delivery
             string[] edit_col = { "total", "compidx" };
             string[] edit_data = { tol.ToString(), com.comp_idx };
             cmd = DB.More_Update("Obj_List_Marc", edit_col, edit_data, up_col, up_data2);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
             cmd = DB.DB_Delete_More_term("Obj_List_Marc", "compidx", com.comp_idx, up_col, up_data1);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
 
             edit_col[1] = "vol";
             edit_data[1] = cout.ToString();
             up_col[0] = "comp_num";
             cmd = DB.More_Update("Obj_List", edit_col, edit_data, up_col, up_data2);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
             cmd = DB.DB_Delete_More_term("Obj_List", "comp_num", com.comp_idx, up_col, up_data1);
-            DB.DB_Send_CMD_reVoid(cmd);
+            Helper_DB.ExcuteNonQuery(cmd);
         }
     }
 }

unimarc/unimarc/납품관리/Commodity_Search.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Commodity_Search
     {

unimarc/unimarc/납품관리/Commodity_Search.cs

@@ -7,12 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Account;
-using WindowsFormsApp1.DLS;
-using WindowsFormsApp1.Home;
-using WindowsFormsApp1.회계;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Commodity_Search : Form
     {
@@ -25,8 +21,8 @@ namespace WindowsFormsApp1.Delivery
         Sales_Lookup sb;
         Sales_In_Pay sip;
         List_Lookup ll;
-        Mac.DLS_Copy dc;
+        DLS_Copy dc;
-        School_Lookup sl;
+        DLS_Lookup sl;
 
         public Commodity_Search(Purchase _pur)
         {
@@ -68,12 +64,12 @@ namespace WindowsFormsApp1.Delivery
             InitializeComponent();
             ll = _ll;
         }
-        public Commodity_Search(Mac.DLS_Copy _dc)
+        public Commodity_Search(DLS_Copy _dc)
         {
             InitializeComponent();
             dc = _dc;
         }
-        public Commodity_Search(School_Lookup _sl)
+        public Commodity_Search(DLS_Lookup _sl)
         {
             InitializeComponent();
             sl = _sl;

unimarc/unimarc/납품관리/Commodity_registration.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Commodity_registration
     {

unimarc/unimarc/납품관리/Commodity_registration.cs

@@ -9,9 +9,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Mac;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Commodity_registration : Form
     {
@@ -53,7 +52,7 @@ namespace WindowsFormsApp1.Delivery
             }
             User_Data_temp = main.DB_User_Data;
             string[] User_Data = User_Data_temp.Split('|');
-            comp_idx = main.com_idx;
+            comp_idx = PUB.user.CompanyIdx;
 
             tb_UserName.Text = User_Data[3];
             Add_Grid("진행");
@@ -218,10 +217,10 @@ namespace WindowsFormsApp1.Delivery
                                   "chk_marc", "comp_num", "unstock" };
             string[] setData = { data[0], data[1], data[2], data[3], data[4],
                                  data[5], data[6], data[7], data[8], data[9],
-                                 data[12], main.com_idx, data[7] };
+                                 data[12], PUB.user.CompanyIdx, data[7] };
 
             string Incmd = db.DB_INSERT("Obj_List", col_name, setData);
-            db.DB_Send_CMD_reVoid(Incmd);
+            Helper_DB.ExcuteNonQuery(Incmd);
 
             Grid1_total();
             dataGridView2.Rows.Add(add_grid_data);
@@ -288,10 +287,10 @@ namespace WindowsFormsApp1.Delivery
                                             dataGridView2.Rows[delcout].Cells["list_name"].Value.ToString() };
                     string[] del_table = { "date", "list_name" };
 
-                    string cmd = db.DB_Delete_More_term("Obj_List", "comp_num", main.com_idx, del_table, del_target);
+                    string cmd = db.DB_Delete_More_term("Obj_List", "comp_num", PUB.user.CompanyIdx, del_table, del_target);
-                    db.DB_Send_CMD_reVoid(cmd);
+                    Helper_DB.ExcuteNonQuery(cmd);
                     cmd = db.DB_Delete_No_Limit("Obj_List_Book", "compidx", comp_idx, del_table, del_target);
-                    db.DB_Send_CMD_reVoid(cmd);
+                    Helper_DB.ExcuteNonQuery(cmd);
 
                     dataGridView2.Rows.Remove(dataGridView2.Rows[delcout]);
                 }
@@ -326,7 +325,7 @@ namespace WindowsFormsApp1.Delivery
             string getdata = "`date`, `clt`, `dly`, `charge`, `list_name`, " +
                              "`vol`, `total`, `state`, `chk_marc`";
             string[] othertable = { "comp_num", "state" };
-            string[] othercol = { main.com_idx, code };
+            string[] othercol = { PUB.user.CompanyIdx, code };
             string cmd = db.More_DB_Search("Obj_List", othertable, othercol, getdata);
             string db_res = db.DB_Send_CMD_Search(cmd);
 
@@ -393,7 +392,7 @@ namespace WindowsFormsApp1.Delivery
                     }
                 }
                 string Incmd = db.DB_INSERT("Obj_List_Book", DB_col_name, setData);
-                db.DB_Send_CMD_reVoid(Incmd);
+                Helper_DB.ExcuteNonQuery(Incmd);
             }
         }
         private void dataGridView2_CellClick(object sender, DataGridViewCellEventArgs e)
@@ -447,7 +446,7 @@ namespace WindowsFormsApp1.Delivery
                         string[] sear_name = { dataGridView2.Rows[a].Cells["list_date"].Value.ToString(),
                                                dataGridView2.Rows[a].Cells["list_name"].Value.ToString() };
                         string U_cmd = db.More_Update("Obj_List", edit_col, edit_name, seer_col, sear_name);
-                        db.DB_Send_CMD_reVoid(U_cmd);
+                        Helper_DB.ExcuteNonQuery(U_cmd);
                         dataGridView2.Rows[a].Cells["stat2"].Value = "진행";
                     }
                 }
@@ -469,7 +468,7 @@ namespace WindowsFormsApp1.Delivery
                         string[] sear_name = { dataGridView2.Rows[a].Cells["list_date"].Value.ToString(),
                                                dataGridView2.Rows[a].Cells["list_name"].Value.ToString() };
                         string U_cmd = db.More_Update("Obj_List", edit_col, edit_name, seer_col, sear_name);
-                        db.DB_Send_CMD_reVoid(U_cmd);
+                        Helper_DB.ExcuteNonQuery(U_cmd);
                         dataGridView2.Rows[a].Cells["stat2"].Value = "완료";
                     }
                 }

unimarc/unimarc/납품관리/Input_Lookup_Stock.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Input_Lookup_Stock
     {

unimarc/unimarc/납품관리/Input_Lookup_Stock.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Input_Lookup_Stock : Form
     {
@@ -21,7 +21,7 @@ namespace WindowsFormsApp1.Delivery
         {
             InitializeComponent();
             main = _main;
-            compidx = main.com_idx;
+            compidx = PUB.user.CompanyIdx;
         }
         private void Input_Lookup_Stock_Load(object sender, EventArgs e)
         {
@@ -85,7 +85,7 @@ namespace WindowsFormsApp1.Delivery
             string[] where = { "book_name", "isbn", "book_comp", "author", "pay",
                                "order", "count", "import_date", "compidx" };
             string Incmd = db.DB_INSERT(table_name, where, input);
-            db.DB_Send_CMD_reVoid(Incmd);
+            Helper_DB.ExcuteNonQuery(Incmd);
             MessageBox.Show("저장되었습니다!");
         }
         private bool grid_text_savechk()
@@ -181,7 +181,7 @@ namespace WindowsFormsApp1.Delivery
             string[] edit_where = { "book_name", "isbn", "book_comp", "author", "pay",
                                     "order", "count" };
             string U_cmd = db.More_Update(table_name, edit_where, edit_data, ser_where, ser_data);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             dataGridView1.Rows[rowidx].Cells["book_name"].Value = tb_book_name.Text;
             dataGridView1.Rows[rowidx].Cells["isbn"].Value = tb_isbn.Text;

unimarc/unimarc/납품관리/List_Chk_Work.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class List_Chk_Work
     {

unimarc/unimarc/납품관리/List_Chk_Work.cs

@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class List_Chk_Work : Form
     {
@@ -105,7 +105,7 @@ namespace WindowsFormsApp1.Delivery
                     dataGridView1.Rows[a].Cells["book_name"].Value.ToString() };
 
                 string U_cmd = db.More_Update("Obj_List_Book", edit_col, edit_data, search_col, search_data);
-                db.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
         }
         /// <summary>

unimarc/unimarc/납품관리/List_Lookup.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class List_Lookup
     {

unimarc/unimarc/납품관리/List_Lookup.cs

@@ -10,7 +10,7 @@ using System.Windows.Forms;
 using System.Drawing.Printing;
 using System.IO;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class List_Lookup : Form
     {
@@ -35,7 +35,7 @@ namespace WindowsFormsApp1.Delivery
         {
             InitializeComponent();
             main = _main;
-            compidx = main.com_idx;
+            compidx = PUB.user.CompanyIdx;
         }
         private void List_Lookup_Load(object sender, EventArgs e)
         {

unimarc/unimarc/납품관리/List_aggregation.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class List_aggregation
     {

unimarc/unimarc/납품관리/List_aggregation.cs

@@ -9,9 +9,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Mac;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class List_aggregation : Form
     {
@@ -24,7 +23,7 @@ namespace WindowsFormsApp1.Delivery
         {
             InitializeComponent();
             main = _main;
-            compidx = main.com_idx;
+            compidx = PUB.user.CompanyIdx;
         }
         /////// TODO: 
         // 새로운 폼 작업 필요.
@@ -62,7 +61,7 @@ namespace WindowsFormsApp1.Delivery
             #endregion
 
             combo_user.Items.Add("전체");
-            string cmd = db.self_Made_Cmd("SELECT `name` FROM `User_Data` WHERE `affil` = '" + main.toolStripLabel2.Text + "';");
+            string cmd = db.self_Made_Cmd("SELECT `name` FROM `User_Data` WHERE `affil` = '" + main.lbCompanyName.Text + "';");
             string[] user_name = cmd.Split('|');
             for(int a = 0; a < user_name.Length; a++)
             {
@@ -245,7 +244,7 @@ namespace WindowsFormsApp1.Delivery
                     dataGridView1.Rows[a].Cells["idx"].Value.ToString()
                 };
                 string U_cmd = db.More_Update(table, Edit_col, Edit_Data, Search_col, Search_Data);
-                db.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
             MessageBox.Show("저장되었습니다.");
         }
@@ -273,10 +272,10 @@ namespace WindowsFormsApp1.Delivery
             Sales(db_res, value);
 
             string U_cmd = db.More_Update("Obj_List_Marc", Edit_col, Edit_data, Search_col, Search_data);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
             Search_col[0] = "comp_num";
             U_cmd = db.More_Update("Obj_List", Edit_col, Edit_data, Search_col, Search_data);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             MessageBox.Show("정상적으로 완료처리 되었습니다.");
         }
@@ -324,7 +323,7 @@ namespace WindowsFormsApp1.Delivery
                 book[5], out_per, total[0], total[1], total[2], book[6], etc };
 
             string Incmd = db.DB_INSERT("Sales", col_name, insert_data);
-            db.DB_Send_CMD_reVoid(Incmd);
+            Helper_DB.ExcuteNonQuery(Incmd);
         }
         private string[] Cal_out_price(string price_st, string count_st, string out_per_st, string in_per_st)
         {

unimarc/unimarc/납품관리/Order_Send_Chk.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace WindowsFormsApp1.납품관리
+namespace UniMarc
 {
     partial class Order_Send_Chk
     {

unimarc/unimarc/납품관리/Order_Send_Chk.cs

@@ -10,9 +10,8 @@ using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Delivery;
 
-namespace WindowsFormsApp1.납품관리
+namespace UniMarc
 {
     public partial class Order_Send_Chk : Form
     {

unimarc/unimarc/납품관리/Order_input.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Order_input
     {

unimarc/unimarc/납품관리/Order_input.cs

@@ -10,9 +10,8 @@ using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.납품관리;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Order_input : Form
     {
@@ -31,7 +30,7 @@ namespace WindowsFormsApp1.Delivery
         private void Order_input_Load(object sender, EventArgs e)
         {
             db.DBcon();
-            compidx = main.com_idx;
+            compidx = PUB.user.CompanyIdx;
 
             dataGridView1.Columns["book_name"].DefaultCellStyle.Font = new Font("굴림", 8, FontStyle.Regular);
             dataGridView1.Columns["author"].DefaultCellStyle.Font = new Font("굴림", 8, FontStyle.Regular);
@@ -47,7 +46,7 @@ namespace WindowsFormsApp1.Delivery
 
             // 사용자 구분
             cb_user.Items.Add("전체");
-            string compName = main.toolStripLabel2.Text;
+            string compName = main.lbCompanyName.Text;
             string cmd = db.self_Made_Cmd("SELECT `name` FROM `User_Data` WHERE `affil` = '" + compName + "';");
             string[] user_name = cmd.Split('|');
             for (int a = 0; a < user_name.Length; a++)
@@ -280,7 +279,7 @@ namespace WindowsFormsApp1.Delivery
                 if (edit_data[1] == "") { edit_data[1] = "0"; }
                 else if (edit_data[1] == "V") { edit_data[1] = "1"; }
                 string U_cmd = db.More_Update("Obj_List_Book", edit_col, edit_data, sear_col, sear_data);
-                db.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
             MessageBox.Show("저장되었습니다!");
         }
@@ -639,12 +638,12 @@ namespace WindowsFormsApp1.Delivery
             string Fax_Key = fax.Send_BaroFax(filename, fax_param);
 
             string U_cmd = db.DB_Update("Comp", "fax_Key", Fax_Key, "idx", compidx);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             string[] col_Name = { "compidx", "구분", "팩스전송키", "날짜", "시간", "전송파일명" };
             string[] set_Data = { compidx, "팩스", Fax_Key, Date, Time, filename };
             string Incmd = db.DB_INSERT("Send_Order", col_Name, set_Data);
-            db.DB_Send_CMD_reVoid(Incmd);
+            Helper_DB.ExcuteNonQuery(Incmd);
 
             return true;
         }
@@ -702,7 +701,7 @@ namespace WindowsFormsApp1.Delivery
                 string[] col_Name = { "compidx", "구분", "거래처명", "날짜", "시간", "보낸이", "받는이", "전송파일명", "전송결과" };
                 string[] set_Data = { compidx, "메일", pur, Date, Time, arr_db[0], m_send, filename, "성공" };
                 string Incmd = db.DB_INSERT("Send_Order", col_Name, set_Data);
-                db.DB_Send_CMD_reVoid(Incmd);
+                Helper_DB.ExcuteNonQuery(Incmd);
                 lbl_OrderStat.Text = "메일 전송 성공!";
                 return true;
             }

unimarc/unimarc/납품관리/Order_input_Search.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Order_input_Search
     {

unimarc/unimarc/납품관리/Order_input_Search.cs

@@ -7,10 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Account;
-using WindowsFormsApp1.Mac;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Order_input_Search : Form
     {

unimarc/unimarc/납품관리/Purchase.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     partial class Purchase
     {

unimarc/unimarc/납품관리/Purchase.cs

@@ -9,9 +9,8 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.IO;
 using System.Windows.Forms.VisualStyles;
-using WindowsFormsApp1.Home;
 
-namespace WindowsFormsApp1.Delivery
+namespace UniMarc
 {
     public partial class Purchase : Form
     {
@@ -25,7 +24,7 @@ namespace WindowsFormsApp1.Delivery
         {
             InitializeComponent();
             main = _main;
-            compidx = main.com_idx;
+            compidx = PUB.user.CompanyIdx;
         }
         private void Purchase_Load(object sender, EventArgs e)
         {
@@ -652,7 +651,7 @@ namespace WindowsFormsApp1.Delivery
                 string[] edit_Data = { "입고", dataGridView2.Rows[a].Cells["Date"].Value.ToString(), 
                                        dataGridView2.Rows[a].Cells["isbn2"].Value.ToString() };
                 string U_cmd = db.More_Update("Obj_List_Book", edit_Col, edit_Data, search_Col, search_Data);
-                db.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
             /* 입고작업을 하려는 책이 재고에 있을 경우, 재고 -1이 되어야함.
              * 만약 재고수보다 입고수가 더 많을경우는?
@@ -695,7 +694,7 @@ namespace WindowsFormsApp1.Delivery
                 string[] Edit_col = { "input_count" };
                 string[] Edit_data = { Inven_count(db_data[0], dataGridView2.Rows[a].Cells["count2"].Value.ToString(), a) };
                 string U_cmd = db.More_Update("Obj_List_Book", Edit_col, Edit_data, Search_col, Search_data);
-                db.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
         }
         /// <summary>
@@ -737,7 +736,7 @@ namespace WindowsFormsApp1.Delivery
                 dataGridView2.Rows[row].Cells["list_name2"].Value.ToString()
             };
             string U_cmd = db.More_Update("Obj_List_Book", Edit_Col, Edit_Data, Search_Name, Search_Data);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
 
             dataGridView2.Rows[row].Cells["edasd"].Value = res.ToString();
         }
@@ -792,7 +791,7 @@ namespace WindowsFormsApp1.Delivery
             if (db_res.Length < 3)
             {
                 string Incmd = db.DB_INSERT("Inven", input_col, input_data);
-                db.DB_Send_CMD_reVoid(Incmd);
+                Helper_DB.ExcuteNonQuery(Incmd);
                 MessageBox.Show("DB 새로 추가");
                 return;
             }
@@ -805,7 +804,7 @@ namespace WindowsFormsApp1.Delivery
                 count += data;
                 MessageBox.Show("DB 수정");
                 string U_cmd = db.DB_Update("Inven", "count", count.ToString(), "idx", cout[0]);
-                db.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
             
         }
@@ -834,7 +833,7 @@ namespace WindowsFormsApp1.Delivery
                     tata[9] = "재고가감";
                 }
                 string Incmd = db.DB_INSERT("Buy_ledger", Area, tata);
-                db.DB_Send_CMD_reVoid(Incmd);
+                Helper_DB.ExcuteNonQuery(Incmd);
             }
         }
         /// <summary>

unimarc/unimarc/마스터/Batch_processing.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Home
+namespace UniMarc
 {
     partial class Batch_processing
     {

unimarc/unimarc/마스터/Batch_processing.cs

@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1.Home
+namespace UniMarc
 {
     public partial class Batch_processing : Form
     {

unimarc/unimarc/마스터/From_User_manage_List.cs

@@ -1,5 +1,4 @@
 using AR;
-using ExcelTest;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,7 +9,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
 namespace UniMarc
 {
@@ -72,13 +70,13 @@ namespace UniMarc
                 ,nudCompIDX.Value.ToString(),tbIP.Text
             };  // 15
             tCmd = mDb.DB_INSERT("Comp", tInsertCol, tInsertData);
-            mDb.DB_Send_CMD_reVoid(tCmd);
+            Helper_DB.ExcuteNonQuery(tCmd);
 
             //// IP 적용
             //string[] IP_Col = { "compidx", "comp", "IP" };
             //string[] IP_Data = { mDb.chk_comp(tb_sangho.Text), tb_sangho.Text, tbIP.Text };//cb_IPList.Text
             //tCmd = mDb.DB_INSERT("Comp_IP", IP_Col, IP_Data);
-            //mDb.DB_Send_CMD_reVoid(tCmd);
+            //Helper_DB.ExcuteNonQuery(tCmd);
 
             RefreshList();
 
@@ -108,7 +106,7 @@ namespace UniMarc
                 string[] tSearch_col = { dgvList.SelectedRows[0].Cells["dbIDX"].Value.ToString() };
                 string U_cmd = mDb.More_Update("Comp", tEdit_tbl, tEdit_col, tSearch_tbl, tSearch_col);
 
-                mDb.DB_Send_CMD_reVoid(U_cmd);
+                Helper_DB.ExcuteNonQuery(U_cmd);
             }
             RefreshList();
         }
@@ -125,7 +123,7 @@ namespace UniMarc
             if (UTIL.MsgQ(tText) == DialogResult.Yes)
             {
                 string tD_cmd = mDb.DB_Delete("Comp", "idx", dgvList.SelectedRows[0].Cells["dbIDX"].Value.ToString(), "comp_name", dgvList.SelectedRows[0].Cells["comp_name"].Value.ToString());
-                mDb.DB_Send_CMD_reVoid(tD_cmd);
+                Helper_DB.ExcuteNonQuery(tD_cmd);
                 TextClear();
             }
             RefreshList();

unimarc/unimarc/마스터/Mac_Setting.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class Mac_Setting
     {

unimarc/unimarc/마스터/Mac_Setting.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     public partial class Mac_Setting : Form
     {

unimarc/unimarc/마스터/Notice_Send.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class Notice_Send
     {

unimarc/unimarc/마스터/Notice_Send.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     public partial class Notice_Send : Form
     {

unimarc/unimarc/마스터/Sales_Details.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class Sales_Details
     {

unimarc/unimarc/마스터/Sales_Details.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     public partial class Sales_Details : Form
     {

unimarc/unimarc/마스터/User_account_inquiry.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class User_account_inquiry
     {

unimarc/unimarc/마스터/User_account_inquiry.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     public partial class User_account_inquiry : Form
     {

unimarc/unimarc/마스터/User_manage.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     partial class User_manage
     {

unimarc/unimarc/마스터/User_manage.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace WindowsFormsApp1
+namespace UniMarc
 {
     public partial class User_manage : Form
     {
@@ -28,7 +28,7 @@ namespace WindowsFormsApp1
             button1.ForeColor = Color.Red;
 
             IP ip = new IP();
-            string[] IPList = { "ALL", ip.GetIP };
+            string[] IPList = { "ALL", ip.GetIP() };
             cb_IPList.Items.AddRange(IPList);
             cb_IPList.SelectedIndex = 0;
         }
@@ -106,13 +106,13 @@ namespace WindowsFormsApp1
                 tb_bank_comp.Text, tb_bank_no.Text, tb_email.Text, tb_barea.Text, "외부업체"
             };  // 15
 
-            db.DB_Send_CMD_reVoid(db.DB_INSERT("Comp", InsertCol, InsertData));
+            Helper_DB.ExcuteNonQuery(db.DB_INSERT("Comp", InsertCol, InsertData));
 
             // IP 적용
             string[] IP_Col = { "compidx","comp", "IP" };
             string[] IP_Data = { db.chk_comp(tb_sangho.Text), tb_sangho.Text,tbIP.Text  };//cb_IPList.Text
 
-            db.DB_Send_CMD_reVoid(db.DB_INSERT("Comp_IP", IP_Col, IP_Data));
+            Helper_DB.ExcuteNonQuery(db.DB_INSERT("Comp_IP", IP_Col, IP_Data));
 
             InsertAccount(tb_sangho.Text);
         }
@@ -129,11 +129,11 @@ namespace WindowsFormsApp1
             string[] InsertUserSubData = { ID };
             string[] InsertUserSubCol = { "id" };
 
-            db.DB_Send_CMD_reVoid(db.DB_INSERT("User_Data", InsertCol, InsertData));
+            Helper_DB.ExcuteNonQuery(db.DB_INSERT("User_Data", InsertCol, InsertData));
 
             // User_ShortCut, User_Access 추가.
-            db.DB_Send_CMD_reVoid(db.DB_INSERT("User_ShortCut", InsertUserSubCol, InsertUserSubData));
+            Helper_DB.ExcuteNonQuery(db.DB_INSERT("User_ShortCut", InsertUserSubCol, InsertUserSubData));
-            db.DB_Send_CMD_reVoid(db.DB_INSERT("User_Access", InsertUserSubCol, InsertUserSubData));
+            Helper_DB.ExcuteNonQuery(db.DB_INSERT("User_Access", InsertUserSubCol, InsertUserSubData));
         }
 
         private void btn_close_Click(object sender, EventArgs e)

unimarc/unimarc/마크/AddMarc.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class AddMarc
     {

unimarc/unimarc/마크/AddMarc.cs

@@ -1,5 +1,4 @@
-using ExcelTest;
+using SHDocVw;
-using SHDocVw;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,25 +9,29 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class AddMarc : Form
     {
         Helper_DB db = new Helper_DB();
         String_Text st = new String_Text();
         Help008Tag tag008 = new Help008Tag();
-        public string mUserName;
-        public string mCompidx;
         private string mOldMarc = string.Empty;
         Main m;
         public AddMarc(Main _m)
         {
             InitializeComponent();
             m = _m;
-            mUserName = m.User;
+        }
-            mCompidx = m.com_idx;
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Alt || keyData == (Keys.Alt | Keys.Menu))
+            {
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
         }
     
         private void AddMarc_Load(object sender, EventArgs e)
@@ -296,12 +299,12 @@ namespace UniMarc.마크
             };
             string[] EditColumn =
             {
-                mCompidx, oriMarc, "1",mOldMarc, "0", etc1.Text,
+                 PUB.user.CompanyIdx, oriMarc, "1",mOldMarc, "0", etc1.Text,
-                etc2.Text, tag056, text008.Text, date, mUserName,
+                etc2.Text, tag056, text008.Text, date, PUB.user.UserName,
                 grade.ToString()
             };
             string[] SearchTable = { "idx","compidx" };
-            string[] SearchColumn = { MarcIndex, mCompidx };
+            string[] SearchColumn = { MarcIndex, PUB.user.CompanyIdx };
 
             //int marcChk = subMarcChk(Table, MarcIndex);
             //if (IsCovertDate)
@@ -331,8 +334,8 @@ namespace UniMarc.마크
             //        break;
             //}
             string UpCMD = db.More_Update(Table, EditTable, EditColumn, SearchTable, SearchColumn);
-            PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpCMD.Replace("\r", " ").Replace("\n", " ")));
+            PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, UpCMD.Replace("\r", " ").Replace("\n", " ")));
-            db.DB_Send_CMD_reVoid(UpCMD);
+            Helper_DB.ExcuteNonQuery(UpCMD);
         }
     
 
@@ -357,12 +360,12 @@ namespace UniMarc.마크
             {
                 BookData[0], BookData[1], BookData[2], BookData[3], BookData[4],
                 oriMarc, etc1.Text, etc2.Text, grade.ToString(), "1",
-                mUserName, tag056, text008.Text, date, mCompidx
+                PUB.user.UserName, tag056, text008.Text, date, PUB.user.CompanyIdx
             };
 
             string InCMD = db.DB_INSERT(Table, InsertTable, InsertColumn);
-            PUB.log.Add("ADDMarcINSERT", string.Format("{0}({1}) : {2}", mUserName, mCompidx, InCMD.Replace("\r", " ").Replace("\n", " ")));
+            PUB.log.Add("ADDMarcINSERT", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, InCMD.Replace("\r", " ").Replace("\n", " ")));
-            db.DB_Send_CMD_reVoid(InCMD);
+            Helper_DB.ExcuteNonQuery(InCMD);
         }
 
         /// <summary>
@@ -375,7 +378,7 @@ namespace UniMarc.마크
         {
             if (TimeSpanDaysValue < -1)
                 return false;
-            if (user != mUserName)
+            if (user != PUB.user.UserName)
                 return false;
             return true;
         }
@@ -2762,21 +2765,22 @@ namespace UniMarc.마크
         {
             TextBox tb = sender as TextBox;
 
+            if (e.Alt && e.KeyCode >= Keys.A && e.KeyCode <= Keys.Z)
+            {
+                var letter = e.KeyCode.ToString().ToLower();
+                tb.InvokeInsertText("▽" + letter);
+                e.SuppressKeyPress = true;
+                return;
+            }
+
             if (e.KeyCode == Keys.F3)
             {
                 tb.InvokeInsertText("▽");
-                
-                //tb.Select(tb.Text.Length, 0);
             }
             else if (e.KeyCode == Keys.F4)
             {
                 tb.InvokeInsertText("△");
-                //tb.Select(tb.Text.Length, 0);
             }
-               
-
-            //tb.SelectionStart = tb.Text.Length;
-            //tb.Select(tb.Text.Length, 0);
         }
         private void etc_KeyDown(object sender, KeyEventArgs e)
         {

unimarc/unimarc/마크/AddMarc2.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class AddMarc2
     {
@@ -36,7 +36,7 @@ namespace UniMarc.마크
             this.panel2 = new System.Windows.Forms.Panel();
             this.Btn_SearchKolis = new System.Windows.Forms.Button();
             this.btn_Empty = new System.Windows.Forms.Button();
-            this.marcEditorControl1 = new ExcelTest.MarcEditorControl();
+            this.marcEditorControl1 = new MarcEditorControl();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
@@ -152,6 +152,6 @@ namespace UniMarc.마크
         private System.Windows.Forms.ComboBox cb_SearchCol;
         private System.Windows.Forms.Button btn_Empty;
         private System.Windows.Forms.Button Btn_SearchKolis;
-        private ExcelTest.MarcEditorControl marcEditorControl1;
+        private MarcEditorControl marcEditorControl1;
     }
 }

unimarc/unimarc/마크/AddMarc2.cs

@@ -1,5 +1,4 @@
-using ExcelTest;
+using SHDocVw;
-using SHDocVw;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,25 +9,20 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class AddMarc2 : Form
     {
         Helper_DB db = new Helper_DB();
         String_Text st = new String_Text();
         Help008Tag tag008 = new Help008Tag();
-        public string mUserName;
-        public string mCompidx;
         private string mOldMarc = string.Empty;
         Main m;
         public AddMarc2(Main _m)
         {
             InitializeComponent();
             m = _m;
-            mUserName = m.User;
-            mCompidx = m.com_idx;
         }
 
         private void AddMarc_Load(object sender, EventArgs e)
@@ -50,7 +44,7 @@ namespace UniMarc.마크
         }
         private void MarcEditorControl1_BookSaved(object sender, MarcEditorControl.BookSavedEventArgs e)
         {
-            string tag056 = Tag056(e.DBMarc, e.griddata);
+            string tag056 = Tag056(e.DBMarc, e.Param);
             string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string orimarc = st.made_Ori_marc(e.DBMarc).Replace(@"\", "￦");
 
@@ -64,11 +58,11 @@ namespace UniMarc.마크
             string[] BookData = GetBookData(MarcText);
             bool IsCoverDate = false;
 
-            if (e.griddata.SaveDate != "")
+            if (e.Param.SaveDate != "")
             {
                 // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인
-                TimeSpan sp = CheckDate(e.griddata.SaveDate, date);
+                TimeSpan sp = CheckDate(e.Param.SaveDate, date);
-                IsCoverDate = IsCoverData(sp.Days, e.griddata.User);
+                IsCoverDate = IsCoverData(sp.Days, e.Param.User);
                 //if (IsCoverDate)
                 //    etc2.Text = etc2.Text.Replace(SaveData[0], date);
             }
@@ -81,12 +75,12 @@ namespace UniMarc.마크
             else
                 isUpdate = false;
 
-            var grade = int.Parse(e.griddata.Grade);
+            var grade = int.Parse(e.Param.Grade);
 
             if (isUpdate)
-                UpdateMarc(Table, midx, orimarc, grade, tag056, date, IsCoverDate,e.griddata);
+                UpdateMarc(Table, midx, orimarc, grade, tag056, date, IsCoverDate,e.Param);
             else
-                InsertMarc(Table, BookData, orimarc, grade, tag056, date, e.griddata);
+                InsertMarc(Table, BookData, orimarc, grade, tag056, date, e.Param);
 
             MessageBox.Show("저장되었습니다.", "저장");
         }
@@ -235,12 +229,12 @@ namespace UniMarc.마크
             };
             string[] EditColumn =
             {
-                mCompidx, oriMarc, "1",mOldMarc, "0", param.Remark1,
+                PUB.user.CompanyIdx, oriMarc, "1",mOldMarc, "0", param.Remark1,
-                param.Remark2, tag056, param.text008, date, mUserName,
+                param.Remark2, tag056, param.text008, date, PUB.user.UserName,
                 grade.ToString()
             };
             string[] SearchTable = { "idx", "compidx" };
-            string[] SearchColumn = { MarcIndex, mCompidx };
+            string[] SearchColumn = { MarcIndex, PUB.user.CompanyIdx };
 
             //int marcChk = subMarcChk(Table, MarcIndex);
             //if (IsCovertDate)
@@ -270,8 +264,8 @@ namespace UniMarc.마크
             //        break;
             //}
             string UpCMD = db.More_Update(Table, EditTable, EditColumn, SearchTable, SearchColumn);
-            PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpCMD.Replace("\r", " ").Replace("\n", " ")));
+            PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, UpCMD.Replace("\r", " ").Replace("\n", " ")));
-            db.DB_Send_CMD_reVoid(UpCMD);
+            Helper_DB.ExcuteNonQuery(UpCMD);
         }
 
         /// <summary>
@@ -295,12 +289,12 @@ namespace UniMarc.마크
             {
                 BookData[0], BookData[1], BookData[2], BookData[3], BookData[4],
                 oriMarc, param.Remark1, param.Remark2, grade.ToString(), "1",
-                mUserName, tag056, param.text008, date, mCompidx
+                PUB.user.UserName, tag056, param.text008, date, PUB.user.CompanyIdx
             };
 
             string InCMD = db.DB_INSERT(Table, InsertTable, InsertColumn);
-            PUB.log.Add("ADDMarcINSERT", string.Format("{0}({1}) : {2}", mUserName, mCompidx, InCMD.Replace("\r", " ").Replace("\n", " ")));
+            PUB.log.Add("ADDMarcINSERT", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, InCMD.Replace("\r", " ").Replace("\n", " ")));
-            db.DB_Send_CMD_reVoid(InCMD);
+            Helper_DB.ExcuteNonQuery(InCMD);
         }
 
         /// <summary>
@@ -313,7 +307,7 @@ namespace UniMarc.마크
         {
             if (TimeSpanDaysValue < -1)
                 return false;
-            if (user != mUserName)
+            if (user != PUB.user.UserName)
                 return false;
             return true;
         }

unimarc/unimarc/마크/AddMarc_FillBlank.Designer.cs

@@ -1,4 +1,4 @@
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class AddMarc_FillBlank
     {

unimarc/unimarc/마크/AddMarc_FillBlank.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class AddMarc_FillBlank : Form
     {

unimarc/unimarc/마크/All_Book_Detail.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class All_Book_Detail
     {

unimarc/unimarc/마크/All_Book_Detail.cs

@@ -7,10 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1.Mac;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class All_Book_Detail : Form
     {
@@ -22,14 +20,12 @@ namespace UniMarc.마크
         /// </summary>
         public string[] data = { "", "", "", "" };
 
-        string compidx;
         Helper_DB db = new Helper_DB();
         All_Book_manage manage;
         public All_Book_Detail(All_Book_manage _manage)
         {
             InitializeComponent();
             manage = _manage;
-            compidx = manage.compidx;
         }
 
         private void All_Book_Detail_Load(object sender, EventArgs e)

unimarc/unimarc/마크/All_Book_manage.Designer.cs

@@ -1,4 +1,4 @@
-namespace WindowsFormsApp1.Mac
+namespace UniMarc
 {
     partial class All_Book_manage
     {

unimarc/unimarc/마크/All_Book_manage.cs

@@ -7,22 +7,17 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using UniMarc.마크;
 
-namespace WindowsFormsApp1.Mac
+namespace UniMarc
 {
     public partial class All_Book_manage : Form
     {
-        public string compidx;
-        public string charge;
         Helper_DB db = new Helper_DB();
         Main main;
         public All_Book_manage(Main _main)
         {
             InitializeComponent();
             main = _main;
-            compidx = main.com_idx;
-            charge = main.User;
         }
 
         private void All_Book_manage_Load(object sender, EventArgs e)
@@ -36,7 +31,7 @@ namespace WindowsFormsApp1.Mac
             string text = textBox1.Text;
             // 세트명 세트ISBN 세트수량 세트정가 저자 출판사 추가자
             string Area_db = "`set_name`, `set_isbn`, `set_count`, `set_price`, `author`, `book_comp`, `charge`";
-            string cmd = db.DB_Contains("Set_Book", compidx, "set_name", text, Area_db);
+            string cmd = db.DB_Contains("Set_Book", PUB.user.CompanyIdx, "set_name", text, Area_db);
             string db_res = db.DB_Send_CMD_Search(cmd);
             string[] db_data = db_res.Split('|');
             input_Grid(db_data);
@@ -176,8 +171,8 @@ namespace WindowsFormsApp1.Mac
                     dataGridView1.Rows[V_idx].Cells["set_count"].Value.ToString(),
                     dataGridView1.Rows[V_idx].Cells["set_price"].Value.ToString() };
 
-                string cmd = db.DB_Delete_No_Limit("Set_Book", "compidx", compidx, delete_area, delete_data);
+                string cmd = db.DB_Delete_No_Limit("Set_Book", "compidx", PUB.user.CompanyIdx, delete_area, delete_data);
-                db.DB_Send_CMD_reVoid(cmd);
+                Helper_DB.ExcuteNonQuery(cmd);
             }
 
             btn_Search_Click(null, null);

unimarc/unimarc/마크/All_Book_manage_Add.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class All_Book_manage_Add
     {

unimarc/unimarc/마크/All_Book_manage_Add.cs

@@ -7,10 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
-using WindowsFormsApp1.Mac;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class All_Book_manage_Add : Form
     {
@@ -75,7 +73,7 @@ namespace UniMarc.마크
                                         "set_name", "set_count", "set_isbn", "set_price", "set_pubyear",
                                         "book_name", "series_title", "sub_title", "series_num", "author", "book_comp", "isbn", "price", 
                                         "charge" };
-                string[] insert_col = { manage.compidx,
+                string[] insert_col = {  PUB.user.CompanyIdx,
                                         tb_setName.Text, tb_setCount.Text, tb_setISBN.Text, tb_setPrice.Text, tb_setYear.Text,
                                         dataGridView1.Rows[a].Cells["book_name"].Value.ToString(),
                                         dataGridView1.Rows[a].Cells["series_title"].Value.ToString(),
@@ -84,10 +82,10 @@ namespace UniMarc.마크
                                         dataGridView1.Rows[a].Cells["author"].Value.ToString(),
                                         dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(),
                                         dataGridView1.Rows[a].Cells["ISBN"].Value.ToString(),
-                                        dataGridView1.Rows[a].Cells["price"].Value.ToString(), manage.charge };
+                                        dataGridView1.Rows[a].Cells["price"].Value.ToString(), PUB.user.UserName };
 
                 string Incmd = db.DB_INSERT("Set_Book", insert_tbl, insert_col);
-                db.DB_Send_CMD_reVoid(Incmd);
+                Helper_DB.ExcuteNonQuery(Incmd);
             }
 
             MessageBox.Show("저장완료");

unimarc/unimarc/마크/All_Book_manage_Edit.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class All_Book_manage_Edit
     {

unimarc/unimarc/마크/All_Book_manage_Edit.cs

@@ -7,21 +7,17 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
-using WindowsFormsApp1.Mac;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class All_Book_manage_Edit : Form
     {
         All_Book_manage manage;
         Helper_DB db = new Helper_DB();
-        string compidx;
         public All_Book_manage_Edit(All_Book_manage _manage)
         {
             InitializeComponent();
             manage = _manage;
-            compidx = manage.compidx;
         }
 
         private void All_Book_manage_Edit_Load(object sender, EventArgs e)
@@ -48,7 +44,7 @@ namespace UniMarc.마크
         {
             string table = "Set_Book";
             string[] sear_tbl = { "compidx", "set_name", "set_isbn", "set_count", "set_price" };
-            string[] sear_col = { compidx, 
+            string[] sear_col = {  PUB.user.CompanyIdx, 
                                   tb_set_name_old.Text,
                                   tb_set_isbn_old.Text,
                                   tb_set_count_old.Text,
@@ -61,7 +57,7 @@ namespace UniMarc.마크
                                   tb_set_price_new.Text };
 
             string U_cmd = db.More_Update(table, edit_tbl, edit_col, sear_tbl, sear_col);
-            db.DB_Send_CMD_reVoid(U_cmd);
+            Helper_DB.ExcuteNonQuery(U_cmd);
             MessageBox.Show("변경되었습니다!");
             manage.btn_Search_Click(null, null);
             this.Close();

unimarc/unimarc/마크/CD_LP.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class CD_LP
     {

unimarc/unimarc/마크/CD_LP.cs

@@ -7,16 +7,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class CD_LP : Form
     {
         Main main;
         Helper_DB db = new Helper_DB();
-        string compidx;
-        string name;
         public CD_LP(Main _m)
         {
             InitializeComponent();
@@ -26,8 +23,6 @@ namespace UniMarc.마크
         private void CD_LP_Load(object sender, EventArgs e)
         {
             db.DBcon();
-            compidx = main.com_idx;
-            name = main.User;
 
             string[] Site = { "교보문고", "알라딘" };
             cb_SiteCon.Items.AddRange(Site);
@@ -62,7 +57,7 @@ namespace UniMarc.마크
         {
             CD_LP_SelectList selectList = new CD_LP_SelectList(this);
             selectList.Show();
-            selectList.LoadList(compidx);
+            selectList.LoadList(PUB.user.CompanyIdx);
             dataGridView1.Rows.Clear();
         }
 
@@ -74,7 +69,7 @@ namespace UniMarc.마크
             string Table = "DVD_List_Product";
             string Area = "`idx`, `num`, `code`, `title`, `artist`, `comp`, `price`, `m_idx`";
             string[] Search_Table = { "compidx", "listname", "date" };
-            string[] Search_Column = { compidx, ListName, date };
+            string[] Search_Column = { PUB.user.CompanyIdx, ListName, date };
 
             string cmd = db.More_DB_Search(Table, Search_Table, Search_Column, Area);
             string res = db.DB_Send_CMD_Search(cmd);
@@ -169,7 +164,7 @@ namespace UniMarc.마크
             string[] SearchCol = { "idx" };
             string[] SearchData = { midx };
 
-            db.DB_Send_CMD_reVoid(db.More_Update("DVD_Marc", EditCol, EditData, SearchCol, SearchData));
+            Helper_DB.ExcuteNonQuery(db.More_Update("DVD_Marc", EditCol, EditData, SearchCol, SearchData));
             dataGridView1.Rows[row].Cells["marc"].Value = orimarc;
         }
 
@@ -338,7 +333,7 @@ namespace UniMarc.마크
 
             string[] InsertCol = { "Code", "user", "date", "Marc", "etc1", "etc2" };
             string[] InsertData = { code, user, date, orimarc, etcData1, etcData2 };
-            db.DB_Send_CMD_reVoid(db.DB_INSERT("DVD_Marc", InsertCol, InsertData));
+            Helper_DB.ExcuteNonQuery(db.DB_INSERT("DVD_Marc", InsertCol, InsertData));
 
             dataGridView1.Rows[row].Cells["m_idx"].Value =
                 db.DB_Send_CMD_Search(
@@ -513,7 +508,7 @@ namespace UniMarc.마크
                     string[] Insert_col = { "compidx", "listname", "date", "user", "num", "code", "title", "artist", "comp", "price" };
                     string[] Insert_data =
                     {
-                        compidx,
+                         PUB.user.CompanyIdx,
                         lbl_ListTitle.Text,
                         lbl_date.Text,
                         Properties.Settings.Default.User,
@@ -524,7 +519,7 @@ namespace UniMarc.마크
                         dataGridView1.Rows[a].Cells["comp"].Value.ToString(),
                         dataGridView1.Rows[a].Cells["price"].Value.ToString()
                     };
-                    db.DB_Send_CMD_reVoid(db.DB_INSERT("DVD_List_Product", Insert_col, Insert_data));
+                    Helper_DB.ExcuteNonQuery(db.DB_INSERT("DVD_List_Product", Insert_col, Insert_data));
                 }
             }
 
@@ -532,7 +527,7 @@ namespace UniMarc.마크
 
             for (int a = 0; a < DeleteIndex.Count; a++)
             {
-                db.DB_Send_CMD_reVoid(db.DB_Delete("DVD_List_Product", "compidx", compidx, "idx", DeleteIndex[a]));
+                Helper_DB.ExcuteNonQuery(db.DB_Delete("DVD_List_Product", "compidx", PUB.user.CompanyIdx, "idx", DeleteIndex[a]));
             }
         }
 

unimarc/unimarc/마크/CD_LP_AddList.Designer.cs

@@ -1,4 +1,4 @@
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class CD_LP_AddList
     {

unimarc/unimarc/마크/CD_LP_AddList.cs

@@ -7,9 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class CD_LP_AddList : Form
     {
@@ -85,8 +84,8 @@ namespace UniMarc.마크
             ProductCMD = ProductCMD.TrimEnd(',');
             ProductCMD += ";";
 
-            db.DB_Send_CMD_reVoid(listCMD);
+            Helper_DB.ExcuteNonQuery(listCMD);
-            db.DB_Send_CMD_reVoid(ProductCMD);
+            Helper_DB.ExcuteNonQuery(ProductCMD);
 
             MessageBox.Show("저장되었습니다.");
         }

unimarc/unimarc/마크/CD_LP_List.Designer.cs

@@ -1,4 +1,4 @@
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class CD_LP_List
     {

unimarc/unimarc/마크/CD_LP_List.cs

@@ -7,10 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
-using WindowsFormsApp1.Mac;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class CD_LP_List : Form
     {
@@ -365,7 +363,7 @@ namespace UniMarc.마크
             for (int a = SelectIndex.Count - 1; a >= 0; a--)
             {
                 dataGridView1.Rows.RemoveAt(SelectIndex[a]);
-                db.DB_Send_CMD_reVoid(
+                Helper_DB.ExcuteNonQuery(
                     db.DB_Delete("DVD_List_Product", "idx", dataGridView1.Rows[SelectIndex[a]].Cells["idx"].Value.ToString(), "compidx", compidx)
                     );
             }

unimarc/unimarc/마크/CD_LP_SelectList.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class CD_LP_SelectList
     {

unimarc/unimarc/마크/CD_LP_SelectList.cs

@@ -7,9 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class CD_LP_SelectList : Form
     {
@@ -106,7 +105,7 @@ namespace UniMarc.마크
                 string compidx = Properties.Settings.Default.compidx;
 
                 string cmd = db.DB_Delete("DVD_List", "compidx", compidx, "idx", idx);
-                db.DB_Send_CMD_reVoid(cmd);
+                Helper_DB.ExcuteNonQuery(cmd);
 
                 MessageBox.Show("삭제되었습니다.");
             }

unimarc/unimarc/마크/CD_LP_Sub.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class CD_LP_Sub
     {

unimarc/unimarc/마크/CD_LP_Sub.cs

@@ -10,9 +10,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class CD_LP_Sub : Form
     {

unimarc/unimarc/마크/Check_Copy_Login.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class Check_Copy_Login
     {

unimarc/unimarc/마크/Check_Copy_Login.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class Check_Copy_Login : Form
     {

unimarc/unimarc/마크/Check_Copy_Sub_List.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class Check_Copy_Sub_List
     {

unimarc/unimarc/마크/Check_Copy_Sub_List.cs

@@ -7,11 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-//
-using WindowsFormsApp1;
-using WindowsFormsApp1.Mac;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class Check_Copy_Sub_List : Form
     {

unimarc/unimarc/마크/Check_Copy_Sub_Search.Designer.cs

@@ -1,5 +1,5 @@
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     partial class Check_Copy_Sub_Search
     {

unimarc/unimarc/마크/Check_Copy_Sub_Search.cs

@@ -7,10 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using WindowsFormsApp1;
-using WindowsFormsApp1.Mac;
 
-namespace UniMarc.마크
+namespace UniMarc
 {
     public partial class Check_Copy_Sub_Search : Form
     {