일회용적립 할인을 제일 앞으로

diff --git a/.vs/newton-cn/v16/.suo b/.vs/newton-cn/v16/.suo
index 28b6fff303a1f712f605f0401093ea0637dc4310..41ba35c56f41c604ffb786d5780264ff1223ecc9 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 48822f679876c2512be20c5c97c2ffff8426f665..20763cffc1d2ff0cdc01aa830a148f8f0d57463f 100644 (file)
--- a/newton-cn/DBConnector.cs
+++ b/newton-cn/DBConnector.cs
@@ -77,7 +77,7 @@ namespace newton_cn
             List<Dictionary<string, string>> result = new List<Dictionary<string, string>>();
 
 
-            string procedure = "usp_GetProductSalesDetailsByDate";
+            string procedure = "disposable_analysis_earn";
 #if DEBUG
             SqlConnection conn = new SqlConnection("Data Source=newton-cn1.iptime.org, 1818; Initial Catalog=food; User ID=newton; Password=newton123!;");
 #else

diff --git a/newton-cn/Form5.cs b/newton-cn/Form5.cs
index 337e89c15e507e19544b1b9ff23a5905d9d8a84a..3ce6649604ec8583ff0e7676533644c769e7a424 100644 (file)
--- a/newton-cn/Form5.cs
+++ b/newton-cn/Form5.cs
@@ -28,20 +28,20 @@ namespace newton_cn
             listView1.GridLines = true;
             listView1.FullRowSelect = true;
 
+            listView1.Columns.Add("할인", 40);
             listView1.Columns.Add("구매일시", 160);
             listView1.Columns.Add("회원명", 105);
             listView1.Columns.Add("상품명", 160);
             listView1.Columns.Add("갯수", 50);
             listView1.Columns.Add("대상금액", 70);
             listView1.Columns.Add("적립", 40);
-            listView1.Columns.Add("할인", 40);
             listView1.Columns.Add("pe_id", 70);
             listView1.Columns.Add("ps_no", 70);
             listView1.Columns.Add("ct_code", 70);
 
-            Console.WriteLine(dateTimePicker1.Text);
+            //Console.WriteLine(dateTimePicker1.Text);
 
-            Console.WriteLine(dateTimePicker1.Text);
+            //Console.WriteLine(dateTimePicker1.Text);
             listView1.Items.Clear();
             string selected = dateTimePicker1.Text;
             DBConnector dbc = new DBConnector();
@@ -51,13 +51,13 @@ namespace newton_cn
             {
                 String[] item =
                 {
+                    list[i]["is_dc"],
                     list[i]["ps_date"],
                     list[i]["ct_name"],
                     list[i]["ps_prname"],
                     list[i]["ps_qty"],
                     list[i]["pe_bamt"],
                     Convert.ToBoolean(list[i]["is_earn"]) ? "O" : "X",
-                    list[i]["is_dc"],
                     list[i]["pe_id"],
                     list[i]["ps_no"],
                     list[i]["ct_code"],
@@ -75,7 +75,7 @@ namespace newton_cn
         private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
         {
             
-            Console.WriteLine(dateTimePicker1.Text);
+            //Console.WriteLine(dateTimePicker1.Text);
             listView1.Items.Clear();
             string selected = dateTimePicker1.Text;
             DBConnector dbc = new DBConnector();
@@ -85,13 +85,13 @@ namespace newton_cn
             {
                 String[] item =
                 {
+                    list[i]["is_dc"],
                     list[i]["ps_date"],
                     list[i]["ct_name"],
                     list[i]["ps_prname"],
                     list[i]["ps_qty"],
                     list[i]["pe_bamt"],
                     Convert.ToBoolean(list[i]["is_earn"]) ? "O" : "X",
-                    list[i]["is_dc"],
                     list[i]["pe_id"],
                     list[i]["ps_no"],
                     list[i]["ct_code"],
@@ -121,7 +121,7 @@ namespace newton_cn
 
                 for (int i = 0; i < listView1.Columns.Count; i++)
                 {
-                    if (i == 4)
+                    if (i == 5)
                     {
                         point = Convert.ToInt32(item.SubItems[i].Text);
                     }
@@ -130,7 +130,7 @@ namespace newton_cn
                     {
                         point = point * Convert.ToInt32(item.SubItems[i].Text);
                     }*/
-                    else if (i == 5)
+                    else if (i == 6)
                     {
                         is_earn = item.SubItems[i].Text == "X" ? 0 : 1;
                     }
@@ -146,7 +146,7 @@ namespace newton_cn
                     {
                         ct_code = item.SubItems[i].Text;
                     }
-                    else if (i == 6)
+                    else if (i == 0)
                     {
                         is_dc = item.SubItems[i].Text == "X" ? 0 : 1;
                     }
@@ -167,6 +167,12 @@ namespace newton_cn
                 return;
             }
 
+            if (is_dc == 1)
+            {
+                MessageBox.Show(new Form { TopMost = true }, "상품이 할인결제된 항목입니다 수기로 적립해주세요.");
+                return;
+            }
+
             DBConnector dbc = new DBConnector();
             int result = dbc.updateDisposableIsEarn(ct_code, addPoint);
 
@@ -196,7 +202,7 @@ namespace newton_cn
                 for (int i = 0; i < listView1.Columns.Count; i++)
                 {
 
-                    if (i == 5)
+                    if (i == 6)
                     {
                         is_earn = item.SubItems[i].Text == "X" ? 0 : 1;
                     }
@@ -208,7 +214,7 @@ namespace newton_cn
                     {
                         ps_no = item.SubItems[i].Text;
                     }
-                    else if (i == 6)
+                    else if (i == 0)
                     {
                         is_dc = item.SubItems[i].Text == "X" ? 0 : 1;
                     }

diff --git a/newton-cn/bin/Debug/newton-cn.exe b/newton-cn/bin/Debug/newton-cn.exe
index 258a21d9fc50f6d03f160ad069cc5605727c15b7..17e35375194d241960943933beb693f8892989a5 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 ff7dfa14d3846f587c81a3dd2893fad95553871c..1c38bf75729a37a1a2e4222f8fb4c94f37b7f8a7 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 500fe40242bbc1f2894e4d611ee69244dec6661d..a098464cc1f18e119a0a76e2b5beae20bafe54c9 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 503c93875442e39db4ba8067cf183065c79c7668..6c84e5b46d162888887ccec992a1fe0d058f2198 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 2e4a33e50bfc117ed10cb7369a11d19cb7b82002..8f7c0b2f7d247c0ffbefe65aae8a0814c57ae791 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.exe b/newton-cn/obj/Debug/newton-cn.exe
index 258a21d9fc50f6d03f160ad069cc5605727c15b7..17e35375194d241960943933beb693f8892989a5 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 ff7dfa14d3846f587c81a3dd2893fad95553871c..1c38bf75729a37a1a2e4222f8fb4c94f37b7f8a7 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 500fe40242bbc1f2894e4d611ee69244dec6661d..a098464cc1f18e119a0a76e2b5beae20bafe54c9 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 503c93875442e39db4ba8067cf183065c79c7668..6c84e5b46d162888887ccec992a1fe0d058f2198 100644 (file)
Binary files a/newton-cn/obj/Release/newton-cn.pdb and b/newton-cn/obj/Release/newton-cn.pdb differ