From: newton-cn Date: Thu, 29 Jan 2026 06:26:10 +0000 (+0900) Subject: dsdf X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=a5f62d91eb69d8616f572c74b2e1dfd75d3cff0f;p=newton-cn_pos.git dsdf --- diff --git a/.vs/newton-cn/v16/.suo b/.vs/newton-cn/v16/.suo index 08c27a1..2964a2d 100644 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 3fef8b9..40feebf 100644 --- 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 a1560c5..a02ccde 100644 --- 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 848b938..a3e45b0 100644 --- 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 d7ecdac..7d621aa 100644 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 f5bfd07..cefab0c 100644 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 02cb514..da929dd 100644 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 b558956..4e3c931 100644 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 7e5848f..7f32b30 100644 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 f5e894a..654fe63 100644 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 d7ecdac..7d621aa 100644 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 f5bfd07..cefab0c 100644 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 02cb514..da929dd 100644 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 b558956..4e3c931 100644 Binary files a/newton-cn/obj/Release/newton-cn.pdb and b/newton-cn/obj/Release/newton-cn.pdb differ