dsdf

diff --git a/.vs/newton-cn/v16/.suo b/.vs/newton-cn/v16/.suo
index 08c27a1f79918841aeaf23c01e59a7043c905575..2964a2d21fd9f0842ec11f585e99fcc40760ef58 100644 (file)
Binary files a/.vs/newton-cn/v16/.suo and b/.vs/newton-cn/v16/.suo differ

diff --git a/newton-cn/DBConnector.cs b/newton-cn/DBConnector.cs
index 3fef8b99b637a646642e87e624b9da0c9c8f41ea..40feebfe4c81d0db0d3031ab2958cd97c0916b86 100644 (file)
--- a/newton-cn/DBConnector.cs
+++ b/newton-cn/DBConnector.cs
@@ -228,7 +228,8 @@ namespace newton_cn
             string sql = "";
             sql += @"
                 select
-                    a1.pr_name, a2.kind_name, a1.pr_order, a2.kind_order, a1.pr_price1, isnull(a3.location, '') as pr_location, a1.pr_code
+                    a1.pr_name, a2.kind_name, a1.pr_order, a2.kind_order, a1.pr_price1, isnull(a3.location, '') as pr_location, a1.pr_code,
+                    (select count(kind_code) from kind where kind_visible= 0) as tkind
                 from
                     pr a1
                     join kind a2
@@ -256,6 +257,7 @@ namespace newton_cn
                 dict["kind_order"] = rd["kind_order"].ToString();
                 dict["pr_location"] = rd["pr_location"].ToString();
                 dict["pr_code"] = rd["pr_code"].ToString();
+                dict["tkind"] = rd["tkind"].ToString();
                 result.Add(dict);
             }
 

diff --git a/newton-cn/Form2.cs b/newton-cn/Form2.cs
index a1560c53dd69745c1f85ad336240067ac59321b6..a02ccde2f1ddc0a9b1b8a127fac898b09cab0065 100644 (file)
--- a/newton-cn/Form2.cs
+++ b/newton-cn/Form2.cs
@@ -60,6 +60,7 @@ namespace newton_cn
             listView1.Columns.Add("액상위치", 50);
             listView1.Columns.Add("메뉴위치", 50);
             listView1.Columns.Add("prcode", 1);
+            listView1.Columns.Add("tkind", 1);
 
             this.ActiveControl = textBox1;
         }
@@ -91,7 +92,8 @@ namespace newton_cn
                     list[i]["pr_location"],
                     list[i]["pr_order"],
                     list[i]["kind_order"],
-                    list[i]["pr_code"]
+                    list[i]["pr_code"],
+                    list[i]["tkind"],
                 };
                 ListViewItem lvi = new ListViewItem(item);
                 listView1.Items.Add(lvi);
@@ -102,6 +104,7 @@ namespace newton_cn
         {
             int pr= 0;
             int kind= 0;
+            int tkind = 0;
             ListView.SelectedListViewItemCollection selected = listView1.SelectedItems;
             foreach(ListViewItem item in selected)
             {
@@ -116,7 +119,10 @@ namespace newton_cn
                     {
                         kind = Int32.Parse(item.SubItems[i].Text);
                     }
-                    
+                    else if (i == 7)
+                    {
+                        tkind = Int32.Parse(item.SubItems[i].Text);
+                    }
                 }
             }
 
@@ -127,7 +133,7 @@ namespace newton_cn
                 return;
             }
             Application.OpenForms["Form2"].Close();
-            MouseEvent1 me = new MouseEvent1(pr, kind, 1);
+            MouseEvent1 me = new MouseEvent1(pr, kind, 1, tkind: tkind);
             ThreadStart ts = new ThreadStart(me.find);
             Thread th = new Thread(ts);
             th.Start();

diff --git a/newton-cn/MouseEvent1.cs b/newton-cn/MouseEvent1.cs
index 848b9387669a721692a1e02cc4dc0b21891a20e5..a3e45b046386a9936e7285c6a8735c5075191b6a 100644 (file)
--- a/newton-cn/MouseEvent1.cs
+++ b/newton-cn/MouseEvent1.cs
@@ -20,14 +20,16 @@ namespace newton_cn
         private int kind;
         private int aCount;
         private bool mInit;
+        private int tkind;
 
-        public MouseEvent1(int pr, int kind, int aCount = 1, bool mInit = true)
+        public MouseEvent1(int pr, int kind, int aCount = 1, bool mInit = true, int tkind= 0)
 
         {
             this.pr = pr;
             this.kind = kind;
             this.aCount = aCount;
             this.mInit = mInit;
+            this.tkind = tkind;
 
         }
         public MouseEvent1()

diff --git a/newton-cn/bin/Debug/newton-cn.exe b/newton-cn/bin/Debug/newton-cn.exe
index d7ecdacd038d0151e5b8cde9ecd2026c0087da35..7d621aaa2c12b6c912c66d66e3bbf0ea60cf2e59 100644 (file)
Binary files a/newton-cn/bin/Debug/newton-cn.exe and b/newton-cn/bin/Debug/newton-cn.exe differ

diff --git a/newton-cn/bin/Debug/newton-cn.pdb b/newton-cn/bin/Debug/newton-cn.pdb
index f5bfd0700971f0d4426f94a028f034243038c02c..cefab0c71be190dc51023958f3f600d1c5af4098 100644 (file)
Binary files a/newton-cn/bin/Debug/newton-cn.pdb and b/newton-cn/bin/Debug/newton-cn.pdb differ

diff --git a/newton-cn/bin/Release/newton-cn.exe b/newton-cn/bin/Release/newton-cn.exe
index 02cb51415060ae34c00ea2d8722cd35bec36cfa5..da929dd6aec38e5e28e126d3f80c6ed51e5ee1d0 100644 (file)
Binary files a/newton-cn/bin/Release/newton-cn.exe and b/newton-cn/bin/Release/newton-cn.exe differ

diff --git a/newton-cn/bin/Release/newton-cn.pdb b/newton-cn/bin/Release/newton-cn.pdb
index b55895623bdbcec6570906b931e21d1cb10dec3d..4e3c9319cda48b480dc7618f2e61a7a99fe871d8 100644 (file)
Binary files a/newton-cn/bin/Release/newton-cn.pdb and b/newton-cn/bin/Release/newton-cn.pdb differ

diff --git a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 7e5848f5c80a5f8b4aff7ff368dc1635609544b6..7f32b3008935cd73716ab95a3ddb9d4e27ab74eb 100644 (file)
Binary files a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ

diff --git a/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache b/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache
index f5e894aea93a73e58fa9d4feab241bc197ee1a40..654fe63c3d45a2e8165502122afabf3ee530b55b 100644 (file)
Binary files a/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache and b/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache differ

diff --git a/newton-cn/obj/Debug/newton-cn.exe b/newton-cn/obj/Debug/newton-cn.exe
index d7ecdacd038d0151e5b8cde9ecd2026c0087da35..7d621aaa2c12b6c912c66d66e3bbf0ea60cf2e59 100644 (file)
Binary files a/newton-cn/obj/Debug/newton-cn.exe and b/newton-cn/obj/Debug/newton-cn.exe differ

diff --git a/newton-cn/obj/Debug/newton-cn.pdb b/newton-cn/obj/Debug/newton-cn.pdb
index f5bfd0700971f0d4426f94a028f034243038c02c..cefab0c71be190dc51023958f3f600d1c5af4098 100644 (file)
Binary files a/newton-cn/obj/Debug/newton-cn.pdb and b/newton-cn/obj/Debug/newton-cn.pdb differ

diff --git a/newton-cn/obj/Release/newton-cn.exe b/newton-cn/obj/Release/newton-cn.exe
index 02cb51415060ae34c00ea2d8722cd35bec36cfa5..da929dd6aec38e5e28e126d3f80c6ed51e5ee1d0 100644 (file)
Binary files a/newton-cn/obj/Release/newton-cn.exe and b/newton-cn/obj/Release/newton-cn.exe differ

diff --git a/newton-cn/obj/Release/newton-cn.pdb b/newton-cn/obj/Release/newton-cn.pdb
index b55895623bdbcec6570906b931e21d1cb10dec3d..4e3c9319cda48b480dc7618f2e61a7a99fe871d8 100644 (file)
Binary files a/newton-cn/obj/Release/newton-cn.pdb and b/newton-cn/obj/Release/newton-cn.pdb differ