diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index 4ebd5e2..af308ac 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index 55fd536..d36aa8b 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb index 85dc26a..360b3d0 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll index 0113fb4..190c319 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8289da1..3a7737e 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index 468a8c7..f253276 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache index 368c47e..ff9ae30 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe index 55fd536..d36aa8b 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb index 85dc26a..360b3d0 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll index 0113fb4..190c319 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.Designer.cs index 36f7914..bdcbb4e 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.Designer.cs @@ -32,7 +32,7 @@ this.Old_Dlv = new System.Windows.Forms.TextBox(); this.Old_Clit = new System.Windows.Forms.TextBox(); this.Old_User = new System.Windows.Forms.TextBox(); - this.Old_Num = new System.Windows.Forms.TextBox(); + this.Old_Name = new System.Windows.Forms.TextBox(); this.panel1 = new System.Windows.Forms.Panel(); this.label5 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); @@ -42,9 +42,9 @@ this.label6 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); this.label11 = new System.Windows.Forms.Label(); - this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.New_Date = new System.Windows.Forms.DateTimePicker(); this.label10 = new System.Windows.Forms.Label(); - this.New_Num = new System.Windows.Forms.TextBox(); + this.New_Name = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); this.New_Dlv = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); @@ -60,7 +60,7 @@ // Old_Date // this.Old_Date.Enabled = false; - this.Old_Date.Location = new System.Drawing.Point(69, 14); + this.Old_Date.Location = new System.Drawing.Point(69, 9); this.Old_Date.Name = "Old_Date"; this.Old_Date.Size = new System.Drawing.Size(100, 21); this.Old_Date.TabIndex = 0; @@ -68,7 +68,7 @@ // Old_Dlv // this.Old_Dlv.Enabled = false; - this.Old_Dlv.Location = new System.Drawing.Point(69, 41); + this.Old_Dlv.Location = new System.Drawing.Point(69, 63); this.Old_Dlv.Name = "Old_Dlv"; this.Old_Dlv.Size = new System.Drawing.Size(100, 21); this.Old_Dlv.TabIndex = 0; @@ -76,7 +76,7 @@ // Old_Clit // this.Old_Clit.Enabled = false; - this.Old_Clit.Location = new System.Drawing.Point(69, 68); + this.Old_Clit.Location = new System.Drawing.Point(69, 90); this.Old_Clit.Name = "Old_Clit"; this.Old_Clit.Size = new System.Drawing.Size(100, 21); this.Old_Clit.TabIndex = 0; @@ -84,76 +84,77 @@ // Old_User // this.Old_User.Enabled = false; - this.Old_User.Location = new System.Drawing.Point(69, 95); + this.Old_User.Location = new System.Drawing.Point(69, 117); this.Old_User.Name = "Old_User"; this.Old_User.Size = new System.Drawing.Size(100, 21); this.Old_User.TabIndex = 0; // - // Old_Num + // Old_Name // - this.Old_Num.Enabled = false; - this.Old_Num.Location = new System.Drawing.Point(69, 122); - this.Old_Num.Name = "Old_Num"; - this.Old_Num.Size = new System.Drawing.Size(100, 21); - this.Old_Num.TabIndex = 0; + this.Old_Name.Enabled = false; + this.Old_Name.Location = new System.Drawing.Point(69, 36); + this.Old_Name.Name = "Old_Name"; + this.Old_Name.Size = new System.Drawing.Size(100, 21); + this.Old_Name.TabIndex = 0; // // panel1 // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel1.Controls.Add(this.label5); this.panel1.Controls.Add(this.label4); this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.Old_Date); - this.panel1.Controls.Add(this.Old_Num); + this.panel1.Controls.Add(this.Old_Name); this.panel1.Controls.Add(this.Old_Dlv); this.panel1.Controls.Add(this.Old_User); this.panel1.Controls.Add(this.Old_Clit); this.panel1.Location = new System.Drawing.Point(12, 12); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(181, 154); + this.panel1.Size = new System.Drawing.Size(181, 150); this.panel1.TabIndex = 1; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(13, 126); + this.label5.Location = new System.Drawing.Point(19, 121); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 12); + this.label5.Size = new System.Drawing.Size(41, 12); this.label5.TabIndex = 1; - this.label5.Text = "목록번호"; + this.label5.Text = "담당자"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(13, 99); + this.label4.Location = new System.Drawing.Point(19, 94); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 1; - this.label4.Text = "담당자"; + this.label4.Text = "거래처"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(13, 72); + this.label3.Location = new System.Drawing.Point(13, 67); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 1; - this.label3.Text = "거래처"; + this.label3.Text = "납품목록"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(13, 45); + this.label2.Location = new System.Drawing.Point(19, 40); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 1; - this.label2.Text = "납품목록"; + this.label2.Text = "목록명"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(13, 18); + this.label1.Location = new System.Drawing.Point(13, 13); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 1; @@ -165,16 +166,17 @@ this.label6.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label6.Location = new System.Drawing.Point(206, 85); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(50, 16); + this.label6.Size = new System.Drawing.Size(56, 16); this.label6.TabIndex = 1; - this.label6.Text = "= = >"; + this.label6.Text = "====>"; // // panel2 // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel2.Controls.Add(this.label11); - this.panel2.Controls.Add(this.dateTimePicker2); + this.panel2.Controls.Add(this.New_Date); this.panel2.Controls.Add(this.label10); - this.panel2.Controls.Add(this.New_Num); + this.panel2.Controls.Add(this.New_Name); this.panel2.Controls.Add(this.label9); this.panel2.Controls.Add(this.New_Dlv); this.panel2.Controls.Add(this.label8); @@ -183,55 +185,55 @@ this.panel2.Controls.Add(this.New_Clit); this.panel2.Location = new System.Drawing.Point(267, 12); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(181, 154); + this.panel2.Size = new System.Drawing.Size(181, 150); this.panel2.TabIndex = 1; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(10, 126); + this.label11.Location = new System.Drawing.Point(16, 121); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(53, 12); + this.label11.Size = new System.Drawing.Size(41, 12); this.label11.TabIndex = 1; - this.label11.Text = "목록번호"; + this.label11.Text = "담당자"; // - // dateTimePicker2 + // New_Date // - this.dateTimePicker2.CustomFormat = "yyyy-MM-dd"; - this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker2.Location = new System.Drawing.Point(69, 14); - this.dateTimePicker2.Name = "dateTimePicker2"; - this.dateTimePicker2.Size = new System.Drawing.Size(85, 21); - this.dateTimePicker2.TabIndex = 6; + this.New_Date.CustomFormat = "yyyy-MM-dd"; + this.New_Date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.New_Date.Location = new System.Drawing.Point(69, 9); + this.New_Date.Name = "New_Date"; + this.New_Date.Size = new System.Drawing.Size(100, 21); + this.New_Date.TabIndex = 6; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(10, 99); + this.label10.Location = new System.Drawing.Point(16, 94); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(41, 12); this.label10.TabIndex = 1; - this.label10.Text = "담당자"; + this.label10.Text = "거래처"; // - // New_Num + // New_Name // - this.New_Num.Location = new System.Drawing.Point(69, 122); - this.New_Num.Name = "New_Num"; - this.New_Num.Size = new System.Drawing.Size(100, 21); - this.New_Num.TabIndex = 0; + this.New_Name.Location = new System.Drawing.Point(69, 36); + this.New_Name.Name = "New_Name"; + this.New_Name.Size = new System.Drawing.Size(100, 21); + this.New_Name.TabIndex = 0; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(10, 72); + this.label9.Location = new System.Drawing.Point(10, 67); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(41, 12); + this.label9.Size = new System.Drawing.Size(53, 12); this.label9.TabIndex = 1; - this.label9.Text = "거래처"; + this.label9.Text = "납품목록"; // // New_Dlv // - this.New_Dlv.Location = new System.Drawing.Point(69, 41); + this.New_Dlv.Location = new System.Drawing.Point(69, 63); this.New_Dlv.Name = "New_Dlv"; this.New_Dlv.Size = new System.Drawing.Size(100, 21); this.New_Dlv.TabIndex = 0; @@ -239,15 +241,15 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(10, 45); + this.label8.Location = new System.Drawing.Point(16, 40); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(53, 12); + this.label8.Size = new System.Drawing.Size(41, 12); this.label8.TabIndex = 1; - this.label8.Text = "납품목록"; + this.label8.Text = "목록명"; // // New_User // - this.New_User.Location = new System.Drawing.Point(69, 95); + this.New_User.Location = new System.Drawing.Point(69, 117); this.New_User.Name = "New_User"; this.New_User.Size = new System.Drawing.Size(100, 21); this.New_User.TabIndex = 0; @@ -255,7 +257,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(10, 18); + this.label7.Location = new System.Drawing.Point(10, 13); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(53, 12); this.label7.TabIndex = 1; @@ -263,7 +265,7 @@ // // New_Clit // - this.New_Clit.Location = new System.Drawing.Point(69, 68); + this.New_Clit.Location = new System.Drawing.Point(69, 90); this.New_Clit.Name = "New_Clit"; this.New_Clit.Size = new System.Drawing.Size(100, 21); this.New_Clit.TabIndex = 0; @@ -272,7 +274,7 @@ // btn_OK // this.btn_OK.Font = new System.Drawing.Font("굴림", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btn_OK.Location = new System.Drawing.Point(110, 178); + this.btn_OK.Location = new System.Drawing.Point(110, 168); this.btn_OK.Name = "btn_OK"; this.btn_OK.Size = new System.Drawing.Size(88, 40); this.btn_OK.TabIndex = 2; @@ -283,7 +285,7 @@ // Btn_Cancel // this.Btn_Cancel.Font = new System.Drawing.Font("굴림", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.Btn_Cancel.Location = new System.Drawing.Point(262, 178); + this.Btn_Cancel.Location = new System.Drawing.Point(262, 168); this.Btn_Cancel.Name = "Btn_Cancel"; this.Btn_Cancel.Size = new System.Drawing.Size(88, 40); this.Btn_Cancel.TabIndex = 2; @@ -295,14 +297,14 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(460, 231); + this.ClientSize = new System.Drawing.Size(460, 216); this.Controls.Add(this.Btn_Cancel); this.Controls.Add(this.btn_OK); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Controls.Add(this.label6); this.Name = "Commodity_Edit"; - this.Text = "Commodity_Edit"; + this.Text = " "; this.Load += new System.EventHandler(this.Commodity_Edit_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); @@ -319,7 +321,7 @@ private System.Windows.Forms.TextBox Old_Dlv; private System.Windows.Forms.TextBox Old_Clit; private System.Windows.Forms.TextBox Old_User; - private System.Windows.Forms.TextBox Old_Num; + private System.Windows.Forms.TextBox Old_Name; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label4; @@ -328,11 +330,11 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label6; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.TextBox New_Num; + private System.Windows.Forms.TextBox New_Name; private System.Windows.Forms.TextBox New_Dlv; private System.Windows.Forms.TextBox New_User; private System.Windows.Forms.Label label11; - private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.DateTimePicker New_Date; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label8; diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.cs index 306dbac..99e029e 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_Edit.cs @@ -24,39 +24,45 @@ namespace WindowsFormsApp1.Delivery private void Commodity_Edit_Load(object sender, EventArgs e) { DB.DBcon(); - Old_Date.Text= com.dataGridView2.Rows[com.EditNumber].Cells[0].Value.ToString(); - Old_Clit.Text= com.dataGridView2.Rows[com.EditNumber].Cells[1].Value.ToString(); - Old_Dlv.Text = com.dataGridView2.Rows[com.EditNumber].Cells[2].Value.ToString(); - Old_User.Text= com.dataGridView2.Rows[com.EditNumber].Cells[3].Value.ToString(); - Old_Num.Text = com.dataGridView2.Rows[com.EditNumber].Cells[4].Value.ToString(); + Old_Date.Text= com.dataGridView2.Rows[com.EditNumber].Cells["list_date"].Value.ToString(); + Old_Clit.Text= com.dataGridView2.Rows[com.EditNumber].Cells["pur"].Value.ToString(); + Old_Dlv.Text = com.dataGridView2.Rows[com.EditNumber].Cells["dly"].Value.ToString(); + Old_User.Text= com.dataGridView2.Rows[com.EditNumber].Cells["charge"].Value.ToString(); + Old_Name.Text = com.dataGridView2.Rows[com.EditNumber].Cells["list_name"].Value.ToString(); - dateTimePicker2.Value = DateTime.Parse(Old_Date.Text); + New_Date.Value = DateTime.Parse(Old_Date.Text); New_Clit.Text = Old_Clit.Text; New_Dlv.Text = Old_Dlv.Text; New_User.Text = Old_User.Text; - New_Num.Text = Old_Num.Text; + New_Name.Text = Old_Name.Text; Old_Date.Enabled = false; Old_Clit.Enabled = false; Old_Dlv.Enabled = false; Old_User.Enabled = false; - Old_Num.Enabled = false; + Old_Name.Enabled = false; compidx = com.comp_idx; } private void btn_OK_Click(object sender, EventArgs e) { - string date = dateTimePicker2.Value.ToString().Substring(0,10); - string[] Old_data = { - Old_Date.Text, // 목록일자 - Old_Clit.Text, // 거래처명 - Old_Dlv.Text, // 납품처명 - Old_User.Text, // 담당자 - Old_Num.Text}; // 목록번호 + /* 변경되어야함 + * Obj_List = 목록일자, 목록명, 납품목록, 거래처, 담당자 + * Obj_List_Book = 목록일자, 목록명 + * Obj_List_Marc = connect_data, 목록명, 담당자 + */ + string date = New_Date.Value.ToString().Substring(0,10); + string[] list_search_col = { "comp_num", "date", "list_name", "clt", "dly", "charge" }; + string[] list_search_data = { compidx, Old_Date.Text, Old_Name.Text, Old_Clit.Text, Old_Dlv.Text, Old_User.Text }; string[] DB_Tabel = { "date", "clt", "dly", "charge", "list_num" }; - string[] New_data = { date, New_Clit.Text, New_Dlv.Text, New_User.Text, New_Num.Text }; + string[] New_data = { date, New_Clit.Text, New_Dlv.Text, New_User.Text, New_Name.Text }; + DB.More_Update("Obj_List", DB_Tabel, New_data, list_search_col, list_search_data); + + + + /* string list_chk = DB.self_Made_Cmd("SELECT idx FROM Obj_List WHERE " + "`comp_num`= '" + compidx + "' AND " + "`date`= '" + Old_data[0] + "' AND " + @@ -79,7 +85,7 @@ namespace WindowsFormsApp1.Delivery com.dataGridView2.Rows[com.EditNumber].Cells[a].Value = New_data[a]; Close(); } - } + }*/ } private void Btn_Cancel_Click(object sender, EventArgs e) { diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.Designer.cs index b900421..c78401d 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.Designer.cs @@ -28,154 +28,25 @@ /// private void InitializeComponent() { - this.panel1 = new System.Windows.Forms.Panel(); - this.rbtn1_2 = new System.Windows.Forms.RadioButton(); - this.rbtn1_1 = new System.Windows.Forms.RadioButton(); - this.tb_date_res = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.tb_date2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.tb_date1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); this.btn_OK = new System.Windows.Forms.Button(); this.btn_Cancel = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.rbtn2_2 = new System.Windows.Forms.RadioButton(); - this.rbtn2_1 = new System.Windows.Forms.RadioButton(); - this.tb_dlv_res = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.tb_dlv2 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.tb_dlv1 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.panel5 = new System.Windows.Forms.Panel(); - this.rbtn3_2 = new System.Windows.Forms.RadioButton(); - this.rbtn3_1 = new System.Windows.Forms.RadioButton(); - this.tb_clt_res = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.tb_clt2 = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); - this.tb_clt1 = new System.Windows.Forms.TextBox(); - this.label9 = new System.Windows.Forms.Label(); - this.panel6 = new System.Windows.Forms.Panel(); - this.rbtn4_2 = new System.Windows.Forms.RadioButton(); - this.rbtn4_1 = new System.Windows.Forms.RadioButton(); - this.tb_user_res = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.tb_user2 = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); - this.tb_user1 = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.panel7 = new System.Windows.Forms.Panel(); - this.rbtn5_2 = new System.Windows.Forms.RadioButton(); - this.rbtn5_1 = new System.Windows.Forms.RadioButton(); - this.tb_num_res = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.tb_num2 = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.tb_num1 = new System.Windows.Forms.TextBox(); this.label15 = new System.Windows.Forms.Label(); - this.chk_keep2 = new System.Windows.Forms.CheckBox(); - this.chk_keep1 = new System.Windows.Forms.CheckBox(); - this.panel1.SuspendLayout(); - this.panel4.SuspendLayout(); - this.panel5.SuspendLayout(); - this.panel6.SuspendLayout(); + this.tb_list1 = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.tb_list2 = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.tb_list_res = new System.Windows.Forms.TextBox(); + this.rbtn5_1 = new System.Windows.Forms.RadioButton(); + this.rbtn5_2 = new System.Windows.Forms.RadioButton(); + this.panel7 = new System.Windows.Forms.Panel(); this.panel7.SuspendLayout(); this.SuspendLayout(); // - // panel1 - // - this.panel1.Controls.Add(this.rbtn1_2); - this.panel1.Controls.Add(this.rbtn1_1); - this.panel1.Controls.Add(this.tb_date_res); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.tb_date2); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.tb_date1); - this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(10, 14); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(600, 59); - this.panel1.TabIndex = 0; - // - // rbtn1_2 - // - this.rbtn1_2.AutoSize = true; - this.rbtn1_2.Location = new System.Drawing.Point(327, 7); - this.rbtn1_2.Name = "rbtn1_2"; - this.rbtn1_2.Size = new System.Drawing.Size(47, 16); - this.rbtn1_2.TabIndex = 3; - this.rbtn1_2.TabStop = true; - this.rbtn1_2.Text = "변경"; - this.rbtn1_2.UseVisualStyleBackColor = true; - this.rbtn1_2.Click += new System.EventHandler(this.rbtn1_2_Click); - // - // rbtn1_1 - // - this.rbtn1_1.AutoSize = true; - this.rbtn1_1.Location = new System.Drawing.Point(123, 7); - this.rbtn1_1.Name = "rbtn1_1"; - this.rbtn1_1.Size = new System.Drawing.Size(47, 16); - this.rbtn1_1.TabIndex = 3; - this.rbtn1_1.TabStop = true; - this.rbtn1_1.Text = "변경"; - this.rbtn1_1.UseVisualStyleBackColor = true; - this.rbtn1_1.Click += new System.EventHandler(this.rbtn1_2_Click); - // - // tb_date_res - // - this.tb_date_res.Location = new System.Drawing.Point(434, 26); - this.tb_date_res.Name = "tb_date_res"; - this.tb_date_res.Size = new System.Drawing.Size(149, 21); - this.tb_date_res.TabIndex = 2; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(437, 11); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(81, 12); - this.label3.TabIndex = 1; - this.label3.Text = "목록일자 결과"; - // - // tb_date2 - // - this.tb_date2.Location = new System.Drawing.Point(227, 26); - this.tb_date2.Name = "tb_date2"; - this.tb_date2.Size = new System.Drawing.Size(149, 21); - this.tb_date2.TabIndex = 2; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(225, 11); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); - this.label2.TabIndex = 1; - this.label2.Text = "목록일자"; - // - // tb_date1 - // - this.tb_date1.Location = new System.Drawing.Point(21, 26); - this.tb_date1.Name = "tb_date1"; - this.tb_date1.Size = new System.Drawing.Size(149, 21); - this.tb_date1.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(19, 11); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); - this.label1.TabIndex = 1; - this.label1.Text = "목록일자"; - // // btn_OK // - this.btn_OK.Location = new System.Drawing.Point(155, 375); + this.btn_OK.Location = new System.Drawing.Point(163, 83); this.btn_OK.Name = "btn_OK"; this.btn_OK.Size = new System.Drawing.Size(94, 34); this.btn_OK.TabIndex = 1; @@ -185,7 +56,7 @@ // // btn_Cancel // - this.btn_Cancel.Location = new System.Drawing.Point(365, 375); + this.btn_Cancel.Location = new System.Drawing.Point(368, 83); this.btn_Cancel.Name = "btn_Cancel"; this.btn_Cancel.Size = new System.Drawing.Size(94, 34); this.btn_Cancel.TabIndex = 1; @@ -196,306 +67,69 @@ // panel2 // this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Location = new System.Drawing.Point(201, 7); + this.panel2.Location = new System.Drawing.Point(209, 7); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(2, 362); + this.panel2.Size = new System.Drawing.Size(2, 70); this.panel2.TabIndex = 2; // // panel3 // this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel3.Location = new System.Drawing.Point(411, 7); + this.panel3.Location = new System.Drawing.Point(414, 7); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(2, 362); + this.panel3.Size = new System.Drawing.Size(2, 70); this.panel3.TabIndex = 2; // - // panel4 + // label15 // - this.panel4.Controls.Add(this.rbtn2_2); - this.panel4.Controls.Add(this.rbtn2_1); - this.panel4.Controls.Add(this.tb_dlv_res); - this.panel4.Controls.Add(this.label4); - this.panel4.Controls.Add(this.tb_dlv2); - this.panel4.Controls.Add(this.label5); - this.panel4.Controls.Add(this.tb_dlv1); - this.panel4.Controls.Add(this.label6); - this.panel4.Location = new System.Drawing.Point(10, 79); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(600, 59); - this.panel4.TabIndex = 0; + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(19, 11); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(41, 12); + this.label15.TabIndex = 1; + this.label15.Text = "목록명"; // - // rbtn2_2 + // tb_list1 // - this.rbtn2_2.AutoSize = true; - this.rbtn2_2.Location = new System.Drawing.Point(327, 9); - this.rbtn2_2.Name = "rbtn2_2"; - this.rbtn2_2.Size = new System.Drawing.Size(47, 16); - this.rbtn2_2.TabIndex = 3; - this.rbtn2_2.TabStop = true; - this.rbtn2_2.Text = "변경"; - this.rbtn2_2.UseVisualStyleBackColor = true; - this.rbtn2_2.Click += new System.EventHandler(this.rbtn1_2_Click); + this.tb_list1.Enabled = false; + this.tb_list1.Location = new System.Drawing.Point(21, 26); + this.tb_list1.Name = "tb_list1"; + this.tb_list1.Size = new System.Drawing.Size(149, 21); + this.tb_list1.TabIndex = 2; // - // rbtn2_1 + // label14 // - this.rbtn2_1.AutoSize = true; - this.rbtn2_1.Location = new System.Drawing.Point(123, 9); - this.rbtn2_1.Name = "rbtn2_1"; - this.rbtn2_1.Size = new System.Drawing.Size(47, 16); - this.rbtn2_1.TabIndex = 3; - this.rbtn2_1.TabStop = true; - this.rbtn2_1.Text = "변경"; - this.rbtn2_1.UseVisualStyleBackColor = true; - this.rbtn2_1.Click += new System.EventHandler(this.rbtn1_2_Click); + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(225, 11); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(41, 12); + this.label14.TabIndex = 1; + this.label14.Text = "목록명"; // - // tb_dlv_res + // tb_list2 // - this.tb_dlv_res.Location = new System.Drawing.Point(434, 26); - this.tb_dlv_res.Name = "tb_dlv_res"; - this.tb_dlv_res.Size = new System.Drawing.Size(149, 21); - this.tb_dlv_res.TabIndex = 2; + this.tb_list2.Enabled = false; + this.tb_list2.Location = new System.Drawing.Point(227, 26); + this.tb_list2.Name = "tb_list2"; + this.tb_list2.Size = new System.Drawing.Size(149, 21); + this.tb_list2.TabIndex = 2; // - // label4 + // label13 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(437, 11); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(81, 12); - this.label4.TabIndex = 1; - this.label4.Text = "납품목록 결과"; + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(432, 11); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(69, 12); + this.label13.TabIndex = 1; + this.label13.Text = "목록명 결과"; // - // tb_dlv2 + // tb_list_res // - this.tb_dlv2.Location = new System.Drawing.Point(227, 26); - this.tb_dlv2.Name = "tb_dlv2"; - this.tb_dlv2.Size = new System.Drawing.Size(149, 21); - this.tb_dlv2.TabIndex = 2; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(225, 11); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 12); - this.label5.TabIndex = 1; - this.label5.Text = "납품목록"; - // - // tb_dlv1 - // - this.tb_dlv1.Location = new System.Drawing.Point(21, 26); - this.tb_dlv1.Name = "tb_dlv1"; - this.tb_dlv1.Size = new System.Drawing.Size(149, 21); - this.tb_dlv1.TabIndex = 2; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(19, 11); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(53, 12); - this.label6.TabIndex = 1; - this.label6.Text = "납품목록"; - // - // panel5 - // - this.panel5.Controls.Add(this.rbtn3_2); - this.panel5.Controls.Add(this.rbtn3_1); - this.panel5.Controls.Add(this.tb_clt_res); - this.panel5.Controls.Add(this.label7); - this.panel5.Controls.Add(this.tb_clt2); - this.panel5.Controls.Add(this.label8); - this.panel5.Controls.Add(this.tb_clt1); - this.panel5.Controls.Add(this.label9); - this.panel5.Location = new System.Drawing.Point(10, 144); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(600, 59); - this.panel5.TabIndex = 0; - // - // rbtn3_2 - // - this.rbtn3_2.AutoSize = true; - this.rbtn3_2.Location = new System.Drawing.Point(327, 7); - this.rbtn3_2.Name = "rbtn3_2"; - this.rbtn3_2.Size = new System.Drawing.Size(47, 16); - this.rbtn3_2.TabIndex = 3; - this.rbtn3_2.TabStop = true; - this.rbtn3_2.Text = "변경"; - this.rbtn3_2.UseVisualStyleBackColor = true; - this.rbtn3_2.Click += new System.EventHandler(this.rbtn1_2_Click); - // - // rbtn3_1 - // - this.rbtn3_1.AutoSize = true; - this.rbtn3_1.Location = new System.Drawing.Point(123, 7); - this.rbtn3_1.Name = "rbtn3_1"; - this.rbtn3_1.Size = new System.Drawing.Size(47, 16); - this.rbtn3_1.TabIndex = 3; - this.rbtn3_1.TabStop = true; - this.rbtn3_1.Text = "변경"; - this.rbtn3_1.UseVisualStyleBackColor = true; - this.rbtn3_1.Click += new System.EventHandler(this.rbtn1_2_Click); - // - // tb_clt_res - // - this.tb_clt_res.Location = new System.Drawing.Point(434, 26); - this.tb_clt_res.Name = "tb_clt_res"; - this.tb_clt_res.Size = new System.Drawing.Size(149, 21); - this.tb_clt_res.TabIndex = 2; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(437, 11); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(69, 12); - this.label7.TabIndex = 1; - this.label7.Text = "거래처 결과"; - // - // tb_clt2 - // - this.tb_clt2.Location = new System.Drawing.Point(227, 26); - this.tb_clt2.Name = "tb_clt2"; - this.tb_clt2.Size = new System.Drawing.Size(149, 21); - this.tb_clt2.TabIndex = 2; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(225, 11); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(41, 12); - this.label8.TabIndex = 1; - this.label8.Text = "거래처"; - // - // tb_clt1 - // - this.tb_clt1.Location = new System.Drawing.Point(21, 26); - this.tb_clt1.Name = "tb_clt1"; - this.tb_clt1.Size = new System.Drawing.Size(149, 21); - this.tb_clt1.TabIndex = 2; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(19, 11); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(41, 12); - this.label9.TabIndex = 1; - this.label9.Text = "거래처"; - // - // panel6 - // - this.panel6.Controls.Add(this.rbtn4_2); - this.panel6.Controls.Add(this.rbtn4_1); - this.panel6.Controls.Add(this.tb_user_res); - this.panel6.Controls.Add(this.label10); - this.panel6.Controls.Add(this.tb_user2); - this.panel6.Controls.Add(this.label11); - this.panel6.Controls.Add(this.tb_user1); - this.panel6.Controls.Add(this.label12); - this.panel6.Location = new System.Drawing.Point(10, 209); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(600, 59); - this.panel6.TabIndex = 0; - // - // rbtn4_2 - // - this.rbtn4_2.AutoSize = true; - this.rbtn4_2.Location = new System.Drawing.Point(327, 7); - this.rbtn4_2.Name = "rbtn4_2"; - this.rbtn4_2.Size = new System.Drawing.Size(47, 16); - this.rbtn4_2.TabIndex = 3; - this.rbtn4_2.TabStop = true; - this.rbtn4_2.Text = "변경"; - this.rbtn4_2.UseVisualStyleBackColor = true; - this.rbtn4_2.Click += new System.EventHandler(this.rbtn1_2_Click); - // - // rbtn4_1 - // - this.rbtn4_1.AutoSize = true; - this.rbtn4_1.Location = new System.Drawing.Point(123, 7); - this.rbtn4_1.Name = "rbtn4_1"; - this.rbtn4_1.Size = new System.Drawing.Size(47, 16); - this.rbtn4_1.TabIndex = 3; - this.rbtn4_1.TabStop = true; - this.rbtn4_1.Text = "변경"; - this.rbtn4_1.UseVisualStyleBackColor = true; - this.rbtn4_1.Click += new System.EventHandler(this.rbtn1_2_Click); - // - // tb_user_res - // - this.tb_user_res.Location = new System.Drawing.Point(434, 26); - this.tb_user_res.Name = "tb_user_res"; - this.tb_user_res.Size = new System.Drawing.Size(149, 21); - this.tb_user_res.TabIndex = 2; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(437, 11); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(69, 12); - this.label10.TabIndex = 1; - this.label10.Text = "담당자 결과"; - // - // tb_user2 - // - this.tb_user2.Location = new System.Drawing.Point(227, 26); - this.tb_user2.Name = "tb_user2"; - this.tb_user2.Size = new System.Drawing.Size(149, 21); - this.tb_user2.TabIndex = 2; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(225, 11); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(41, 12); - this.label11.TabIndex = 1; - this.label11.Text = "담당자"; - // - // tb_user1 - // - this.tb_user1.Location = new System.Drawing.Point(21, 26); - this.tb_user1.Name = "tb_user1"; - this.tb_user1.Size = new System.Drawing.Size(149, 21); - this.tb_user1.TabIndex = 2; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(19, 11); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(41, 12); - this.label12.TabIndex = 1; - this.label12.Text = "담당자"; - // - // panel7 - // - this.panel7.Controls.Add(this.rbtn5_2); - this.panel7.Controls.Add(this.rbtn5_1); - this.panel7.Controls.Add(this.tb_num_res); - this.panel7.Controls.Add(this.label13); - this.panel7.Controls.Add(this.tb_num2); - this.panel7.Controls.Add(this.label14); - this.panel7.Controls.Add(this.tb_num1); - this.panel7.Controls.Add(this.label15); - this.panel7.Location = new System.Drawing.Point(10, 274); - this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(600, 59); - this.panel7.TabIndex = 0; - // - // rbtn5_2 - // - this.rbtn5_2.AutoSize = true; - this.rbtn5_2.Location = new System.Drawing.Point(327, 9); - this.rbtn5_2.Name = "rbtn5_2"; - this.rbtn5_2.Size = new System.Drawing.Size(47, 16); - this.rbtn5_2.TabIndex = 3; - this.rbtn5_2.TabStop = true; - this.rbtn5_2.Text = "변경"; - this.rbtn5_2.UseVisualStyleBackColor = true; - this.rbtn5_2.Click += new System.EventHandler(this.rbtn1_2_Click); + this.tb_list_res.Enabled = false; + this.tb_list_res.Location = new System.Drawing.Point(433, 26); + this.tb_list_res.Name = "tb_list_res"; + this.tb_list_res.Size = new System.Drawing.Size(149, 21); + this.tb_list_res.TabIndex = 2; // // rbtn5_1 // @@ -509,162 +143,65 @@ this.rbtn5_1.UseVisualStyleBackColor = true; this.rbtn5_1.Click += new System.EventHandler(this.rbtn1_2_Click); // - // tb_num_res + // rbtn5_2 // - this.tb_num_res.Location = new System.Drawing.Point(433, 26); - this.tb_num_res.Name = "tb_num_res"; - this.tb_num_res.Size = new System.Drawing.Size(149, 21); - this.tb_num_res.TabIndex = 2; + this.rbtn5_2.AutoSize = true; + this.rbtn5_2.Location = new System.Drawing.Point(327, 9); + this.rbtn5_2.Name = "rbtn5_2"; + this.rbtn5_2.Size = new System.Drawing.Size(47, 16); + this.rbtn5_2.TabIndex = 3; + this.rbtn5_2.TabStop = true; + this.rbtn5_2.Text = "변경"; + this.rbtn5_2.UseVisualStyleBackColor = true; + this.rbtn5_2.Click += new System.EventHandler(this.rbtn1_2_Click); // - // label13 + // panel7 // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(437, 11); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(81, 12); - this.label13.TabIndex = 1; - this.label13.Text = "목록번호 결과"; - // - // tb_num2 - // - this.tb_num2.Location = new System.Drawing.Point(227, 26); - this.tb_num2.Name = "tb_num2"; - this.tb_num2.Size = new System.Drawing.Size(149, 21); - this.tb_num2.TabIndex = 2; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(225, 11); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(53, 12); - this.label14.TabIndex = 1; - this.label14.Text = "목록번호"; - // - // tb_num1 - // - this.tb_num1.Location = new System.Drawing.Point(21, 26); - this.tb_num1.Name = "tb_num1"; - this.tb_num1.Size = new System.Drawing.Size(149, 21); - this.tb_num1.TabIndex = 2; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(19, 11); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(53, 12); - this.label15.TabIndex = 1; - this.label15.Text = "목록번호"; - // - // chk_keep2 - // - this.chk_keep2.AutoSize = true; - this.chk_keep2.Location = new System.Drawing.Point(243, 344); - this.chk_keep2.Name = "chk_keep2"; - this.chk_keep2.Size = new System.Drawing.Size(116, 16); - this.chk_keep2.TabIndex = 3; - this.chk_keep2.Text = "기존 데이터 유지"; - this.chk_keep2.UseVisualStyleBackColor = true; - this.chk_keep2.Click += new System.EventHandler(this.chk_Keep_data); - // - // chk_keep1 - // - this.chk_keep1.AutoSize = true; - this.chk_keep1.Location = new System.Drawing.Point(37, 344); - this.chk_keep1.Name = "chk_keep1"; - this.chk_keep1.Size = new System.Drawing.Size(116, 16); - this.chk_keep1.TabIndex = 3; - this.chk_keep1.Text = "기존 데이터 유지"; - this.chk_keep1.UseVisualStyleBackColor = true; - this.chk_keep1.Click += new System.EventHandler(this.chk_Keep_data); + this.panel7.Controls.Add(this.rbtn5_2); + this.panel7.Controls.Add(this.rbtn5_1); + this.panel7.Controls.Add(this.tb_list_res); + this.panel7.Controls.Add(this.label13); + this.panel7.Controls.Add(this.tb_list2); + this.panel7.Controls.Add(this.label14); + this.panel7.Controls.Add(this.tb_list1); + this.panel7.Controls.Add(this.label15); + this.panel7.Location = new System.Drawing.Point(8, 12); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(600, 59); + this.panel7.TabIndex = 0; // // Commodity_Morge // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(621, 415); - this.Controls.Add(this.chk_keep1); - this.Controls.Add(this.chk_keep2); + this.ClientSize = new System.Drawing.Size(620, 127); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.btn_Cancel); this.Controls.Add(this.btn_OK); this.Controls.Add(this.panel7); - this.Controls.Add(this.panel6); - this.Controls.Add(this.panel5); - this.Controls.Add(this.panel4); - this.Controls.Add(this.panel1); this.Name = "Commodity_Morge"; this.Text = "Commodity_Morge"; this.Load += new System.EventHandler(this.Commodity_Morge_Load); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); - this.panel5.ResumeLayout(false); - this.panel5.PerformLayout(); - this.panel6.ResumeLayout(false); - this.panel6.PerformLayout(); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.TextBox tb_date1; - private System.Windows.Forms.Label label1; private System.Windows.Forms.Button btn_OK; private System.Windows.Forms.Button btn_Cancel; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.RadioButton rbtn1_2; - private System.Windows.Forms.RadioButton rbtn1_1; - private System.Windows.Forms.TextBox tb_date_res; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox tb_date2; - private System.Windows.Forms.Label label2; private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.RadioButton rbtn2_2; - private System.Windows.Forms.RadioButton rbtn2_1; - private System.Windows.Forms.TextBox tb_dlv_res; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox tb_dlv2; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox tb_dlv1; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.RadioButton rbtn3_2; - private System.Windows.Forms.RadioButton rbtn3_1; - private System.Windows.Forms.TextBox tb_clt_res; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.TextBox tb_clt2; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.TextBox tb_clt1; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.RadioButton rbtn4_2; - private System.Windows.Forms.RadioButton rbtn4_1; - private System.Windows.Forms.TextBox tb_user_res; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.TextBox tb_user2; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.TextBox tb_user1; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Panel panel7; - private System.Windows.Forms.RadioButton rbtn5_2; - private System.Windows.Forms.RadioButton rbtn5_1; - private System.Windows.Forms.TextBox tb_num_res; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.TextBox tb_num2; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.TextBox tb_num1; private System.Windows.Forms.Label label15; - private System.Windows.Forms.CheckBox chk_keep2; - private System.Windows.Forms.CheckBox chk_keep1; + private System.Windows.Forms.TextBox tb_list1; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox tb_list2; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox tb_list_res; + private System.Windows.Forms.RadioButton rbtn5_1; + private System.Windows.Forms.RadioButton rbtn5_2; + private System.Windows.Forms.Panel panel7; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.cs index e1171f7..ffb9d63 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_Morge.cs @@ -14,8 +14,8 @@ namespace WindowsFormsApp1.Delivery { Commodity_registration com; Helper_DB DB = new Helper_DB(); - bool keep_data1 = true; - bool keep_data2 = true; + string[] list1 = { "", "", "", "", "", "", "", "", "" }; + string[] list2 = { "", "", "", "", "", "", "", "", "" }; public Commodity_Morge(Commodity_registration _com) { InitializeComponent(); @@ -24,56 +24,37 @@ namespace WindowsFormsApp1.Delivery private void Commodity_Morge_Load(object sender, EventArgs e) { - rbtn1_1.Checked = true; - rbtn2_1.Checked = true; - rbtn3_1.Checked = true; - rbtn4_1.Checked = true; rbtn5_1.Checked = true; - tb_date1.Text = com.dataGridView2.Rows[com.MorgeNum[0]].Cells[0].Value.ToString(); - tb_clt1.Text = com.dataGridView2.Rows[com.MorgeNum[0]].Cells[1].Value.ToString(); - tb_dlv1.Text = com.dataGridView2.Rows[com.MorgeNum[0]].Cells[2].Value.ToString(); - tb_user1.Text = com.dataGridView2.Rows[com.MorgeNum[0]].Cells[3].Value.ToString(); - tb_num1.Text = com.dataGridView2.Rows[com.MorgeNum[0]].Cells[4].Value.ToString(); + list1[0] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["list_date"].Value.ToString(); + list1[1] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["pur"].Value.ToString(); + list1[2] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["dly"].Value.ToString(); + list1[3] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["charge"].Value.ToString(); + list1[4] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["list_name"].Value.ToString(); + list1[5] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["chk_marc"].Value.ToString(); + list1[6] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["stat2"].Value.ToString(); + list1[7] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["cout"].Value.ToString(); + list1[8] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["tol"].Value.ToString(); - tb_date2.Text = com.dataGridView2.Rows[com.MorgeNum[1]].Cells[0].Value.ToString(); - tb_clt2.Text = com.dataGridView2.Rows[com.MorgeNum[1]].Cells[1].Value.ToString(); - tb_dlv2.Text = com.dataGridView2.Rows[com.MorgeNum[1]].Cells[2].Value.ToString(); - tb_user2.Text = com.dataGridView2.Rows[com.MorgeNum[1]].Cells[3].Value.ToString(); - tb_num2.Text = com.dataGridView2.Rows[com.MorgeNum[1]].Cells[4].Value.ToString(); + list2[0] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["list_date"].Value.ToString(); + list2[1] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["pur"].Value.ToString(); + list2[2] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["dly"].Value.ToString(); + list2[3] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["charge"].Value.ToString(); + list2[4] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["list_name"].Value.ToString(); + list2[5] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["chk_marc"].Value.ToString(); + list2[6] = com.dataGridView2.Rows[com.MorgeNum[1]].Cells["stat2"].Value.ToString(); + list2[7] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["cout"].Value.ToString(); + list2[8] = com.dataGridView2.Rows[com.MorgeNum[0]].Cells["tol"].Value.ToString(); - tb_date1.Enabled = false; - tb_date2.Enabled = false; - tb_clt1.Enabled = false; - tb_clt2.Enabled = false; - tb_dlv1.Enabled = false; - tb_dlv2.Enabled = false; - tb_user1.Enabled = false; - tb_user2.Enabled = false; - tb_num1.Enabled = false; - tb_num2.Enabled = false; - - chk_keep1.Checked = true; - chk_keep2.Checked = true; + tb_list1.Text = list1[4]; + tb_list2.Text = list2[4]; rbtn1_2_Click(null, null); } private void rbtn1_2_Click(object sender, EventArgs e) { - if (rbtn1_1.Checked == true) { tb_date_res.Text = tb_date1.Text; } - else { tb_date_res.Text = tb_date2.Text; } - - if (rbtn2_1.Checked == true) { tb_dlv_res.Text = tb_dlv1.Text; } - else { tb_dlv_res.Text = tb_dlv2.Text; } - - if (rbtn3_1.Checked == true) { tb_clt_res.Text = tb_clt1.Text; } - else { tb_clt_res.Text = tb_clt2.Text; } - - if (rbtn4_1.Checked == true) { tb_user_res.Text = tb_user1.Text; } - else { tb_user_res.Text = tb_user2.Text; } - - if (rbtn5_1.Checked == true) { tb_num_res.Text = tb_num1.Text; } - else { tb_num_res.Text = tb_num2.Text; } + if (rbtn5_1.Checked) { tb_list_res.Text = tb_list1.Text; } + else { tb_list_res.Text = tb_list2.Text; } } private void btn_Cancel_Click(object sender, EventArgs e) { @@ -81,43 +62,88 @@ namespace WindowsFormsApp1.Delivery } private void btn_OK_Click(object sender, EventArgs e) { + string area = "`date`, `list_name`, `dly`, `clt`, `charge`, `chk_marc`, `state`"; + + string[] up_col = { "compidx", "date", "list_name" }; + List tmp_col = new List(); + tmp_col.AddRange(up_col); + + List tmp1 = new List(); + string[] up_data1 = { com.comp_idx, list1[0], list1[4] }; + tmp1.AddRange(up_data1); + + List tmp2 = new List(); + string[] up_data2 = { com.comp_idx, list2[0], list2[4] }; + tmp2.AddRange(up_data2); + DB.DBcon(); - bool create = false; - string cmd = "INSERT INTO Obj_List (`comp_num`, `date`, `clt`, `dly`, `charge`, `list_num`) " + - "Values (" + - "'" + com.comp_idx + "'," + - "'" + tb_date_res.Text + "'," + - "'" + tb_clt_res.Text + "'," + - "'" + tb_dlv_res.Text + "'," + - "'" + tb_user_res.Text + "'," + - "'" + tb_num_res.Text + "');"; - if (keep_data1 == false) { DB.DB_Delete("Obj_List", "comp_num", com.comp_idx, "dly", tb_dlv1.Text); } - if (keep_data2 == false) { DB.DB_Delete("Obj_List", "comp_num", com.comp_idx, "dly", tb_dlv2.Text); } - if (tb_dlv_res.Text == "") - { - create = false; - MessageBox.Show("납품목록의 이름을 변경해주세요."); + + if (rbtn5_1.Checked) { + // 2 => 1로 + TwoToOne(tmp_col, tmp1, tmp2); } - else if(tb_dlv_res.Text == tb_dlv1.Text || tb_dlv_res.Text == tb_dlv2.Text) - { - create = false; - MessageBox.Show("납품목록의 이름이 중복되지않게 변경해주세요."); - } - else { create = true; } - if (create == true) { - DB.self_Made_Cmd(cmd); + else { + // 1 => 2로 + OneToTwo(tmp_col, tmp1, tmp2); } + this.Close(); } - private void chk_Keep_data(object sender, EventArgs e) + /// + /// data2가 data1으로 적용됨. 2 => 1로 + /// + private void TwoToOne(List col, List tmp1, List tmp2) { - if(((CheckBox)sender).Name == "chk_keep1" && ((CheckBox)sender).Checked == false) - { keep_data1 = false; } - else if(((CheckBox)sender).Name == "chk_keep1" && ((CheckBox)sender).Checked == true) - { keep_data1 = true; } - if(((CheckBox)sender).Name == "chk_keep2" && ((CheckBox)sender).Checked == false) - { keep_data2 = false; } - else if(((CheckBox)sender).Name == "chk_keep2" && ((CheckBox)sender).Checked == true) - { keep_data2 = true; } + string[] up_col = col.ToArray(); + string[] up_data1 = tmp1.ToArray(); + string[] up_data2 = tmp2.ToArray(); + + DB.More_Update("Obj_List_Book", up_col, up_data1, up_col, up_data2); + int cout1 = Convert.ToInt32(list1[7]); + int cout2 = Convert.ToInt32(list2[7]); + int cout = cout1 + cout2; + + int tol1 = Convert.ToInt32(list1[8]); + int tol2 = Convert.ToInt32(list2[8]); + int tol = tol1 + tol2; + + string[] edit_col = { "total", "compidx" }; + string[] edit_data = { tol.ToString(), com.comp_idx }; + DB.More_Update("Obj_List_Marc", edit_col, edit_data, up_col, up_data1); + DB.DB_Delete_More_term("Obj_List_Marc", "compidx", com.comp_idx, up_col, up_data2); + + edit_col[1] = "vol"; + edit_data[1] = cout.ToString(); + up_col[0] = "comp_num"; + DB.More_Update("Obj_List", edit_col, edit_data, up_col, up_data1); + DB.DB_Delete_More_term("Obj_List", "comp_num", com.comp_idx, up_col, up_data2); + } + /// + /// data1가 data2으로 적용됨. 1 => 2로 + /// + private void OneToTwo(List col, List tmp1, List tmp2) + { + string[] up_col = col.ToArray(); + string[] up_data1 = tmp1.ToArray(); + string[] up_data2 = tmp2.ToArray(); + DB.More_Update("Obj_List_Book", up_col, up_data2, up_col, up_data1); + int cout1 = Convert.ToInt32(list1[7]); + int cout2 = Convert.ToInt32(list2[7]); + int cout = cout1 + cout2; + + int tol1 = Convert.ToInt32(list1[8]); + int tol2 = Convert.ToInt32(list2[8]); + int tol = tol1 + tol2; + + string[] edit_col = { "total", "compidx" }; + string[] edit_data = { tol.ToString(), com.comp_idx }; + DB.More_Update("Obj_List_Marc", edit_col, edit_data, up_col, up_data2); + DB.DB_Delete_More_term("Obj_List_Marc", "compidx", com.comp_idx, up_col, up_data1); + + edit_col[1] = "vol"; + edit_data[1] = cout.ToString(); + up_col[0] = "comp_num"; + DB.More_Update("Obj_List", edit_col, edit_data, up_col, up_data2); + DB.DB_Delete_More_term("Obj_List", "comp_num", com.comp_idx, up_col, up_data1); } } } diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs index 8545db1..7883b5a 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs @@ -73,6 +73,17 @@ this.panel1 = new System.Windows.Forms.Panel(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); + this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pur = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dly = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cout = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tol = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.stat2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid_btn_ISBN = new System.Windows.Forms.DataGridViewButtonColumn(); + this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Grid_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.btn_morge = new System.Windows.Forms.Button(); this.btn_Edit = new System.Windows.Forms.Button(); this.btn_Del = new System.Windows.Forms.Button(); @@ -94,17 +105,6 @@ this.rbtn_all = new System.Windows.Forms.RadioButton(); this.panel2 = new System.Windows.Forms.Panel(); this.label14 = new System.Windows.Forms.Label(); - this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pur = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dly = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cout = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tol = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.stat2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Grid_btn_ISBN = new System.Windows.Forms.DataGridViewButtonColumn(); - this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Grid_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); @@ -274,7 +274,7 @@ // // btn_Exit // - this.btn_Exit.Location = new System.Drawing.Point(1092, 45); + this.btn_Exit.Location = new System.Drawing.Point(1089, 45); this.btn_Exit.Name = "btn_Exit"; this.btn_Exit.Size = new System.Drawing.Size(50, 23); this.btn_Exit.TabIndex = 27; @@ -488,6 +488,81 @@ this.dataGridView2.TabIndex = 29; this.dataGridView2.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView2_CellClick); // + // list_date + // + this.list_date.HeaderText = "목록일자"; + this.list_date.Name = "list_date"; + this.list_date.Width = 70; + // + // pur + // + this.pur.HeaderText = "거래처명"; + this.pur.Name = "pur"; + this.pur.Width = 150; + // + // dly + // + this.dly.HeaderText = "납품목록"; + this.dly.Name = "dly"; + this.dly.Width = 150; + // + // charge + // + this.charge.HeaderText = "담당자"; + this.charge.Name = "charge"; + // + // list_name + // + this.list_name.HeaderText = "목록명"; + this.list_name.Name = "list_name"; + this.list_name.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.list_name.Width = 250; + // + // cout + // + this.cout.HeaderText = "수량"; + this.cout.Name = "cout"; + this.cout.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.cout.Width = 50; + // + // tol + // + dataGridViewCellStyle6.Format = "N0"; + dataGridViewCellStyle6.NullValue = null; + this.tol.DefaultCellStyle = dataGridViewCellStyle6; + this.tol.HeaderText = "합계"; + this.tol.Name = "tol"; + this.tol.Width = 80; + // + // stat2 + // + this.stat2.HeaderText = "상태"; + this.stat2.Name = "stat2"; + this.stat2.Width = 50; + // + // Grid_btn_ISBN + // + this.Grid_btn_ISBN.HeaderText = "ISBN조회"; + this.Grid_btn_ISBN.Name = "Grid_btn_ISBN"; + this.Grid_btn_ISBN.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Grid_btn_ISBN.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // chk_marc + // + this.chk_marc.HeaderText = "MarcCheck"; + this.chk_marc.Name = "chk_marc"; + this.chk_marc.ReadOnly = true; + this.chk_marc.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.chk_marc.Visible = false; + // + // Grid_Check + // + this.Grid_Check.HeaderText = "체크"; + this.Grid_Check.Name = "Grid_Check"; + this.Grid_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Grid_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.Grid_Check.Width = 40; + // // btn_morge // this.btn_morge.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -528,7 +603,7 @@ this.btn_Complet.Name = "btn_Complet"; this.btn_Complet.Size = new System.Drawing.Size(62, 23); this.btn_Complet.TabIndex = 28; - this.btn_Complet.Text = "완 료"; + this.btn_Complet.Text = "완료처리"; this.btn_Complet.UseVisualStyleBackColor = true; this.btn_Complet.Click += new System.EventHandler(this.btn_Complet_Click); // @@ -539,7 +614,7 @@ this.btn_ing.Name = "btn_ing"; this.btn_ing.Size = new System.Drawing.Size(62, 23); this.btn_ing.TabIndex = 28; - this.btn_ing.Text = "진 행"; + this.btn_ing.Text = "진행처리"; this.btn_ing.UseVisualStyleBackColor = true; this.btn_ing.Click += new System.EventHandler(this.btn_ing_Click); // @@ -626,9 +701,9 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(1049, 12); + this.button2.Location = new System.Drawing.Point(1036, 12); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(85, 23); + this.button2.Size = new System.Drawing.Size(103, 23); this.button2.TabIndex = 15; this.button2.Text = "자동목록번호"; this.button2.UseVisualStyleBackColor = true; @@ -687,81 +762,6 @@ this.label14.TabIndex = 22; this.label14.Text = "작업\n대상"; // - // list_date - // - this.list_date.HeaderText = "목록일자"; - this.list_date.Name = "list_date"; - this.list_date.Width = 70; - // - // pur - // - this.pur.HeaderText = "거래처명"; - this.pur.Name = "pur"; - this.pur.Width = 150; - // - // dly - // - this.dly.HeaderText = "납품목록"; - this.dly.Name = "dly"; - this.dly.Width = 150; - // - // charge - // - this.charge.HeaderText = "담당자"; - this.charge.Name = "charge"; - // - // list_name - // - this.list_name.HeaderText = "목록명"; - this.list_name.Name = "list_name"; - this.list_name.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.list_name.Width = 250; - // - // cout - // - this.cout.HeaderText = "수량"; - this.cout.Name = "cout"; - this.cout.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.cout.Width = 50; - // - // tol - // - dataGridViewCellStyle6.Format = "N0"; - dataGridViewCellStyle6.NullValue = null; - this.tol.DefaultCellStyle = dataGridViewCellStyle6; - this.tol.HeaderText = "합계"; - this.tol.Name = "tol"; - this.tol.Width = 80; - // - // stat2 - // - this.stat2.HeaderText = "상태"; - this.stat2.Name = "stat2"; - this.stat2.Width = 50; - // - // Grid_btn_ISBN - // - this.Grid_btn_ISBN.HeaderText = "ISBN조회"; - this.Grid_btn_ISBN.Name = "Grid_btn_ISBN"; - this.Grid_btn_ISBN.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Grid_btn_ISBN.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // chk_marc - // - this.chk_marc.HeaderText = "MarcCheck"; - this.chk_marc.Name = "chk_marc"; - this.chk_marc.ReadOnly = true; - this.chk_marc.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.chk_marc.Visible = false; - // - // Grid_Check - // - this.Grid_Check.HeaderText = "체크"; - this.Grid_Check.Name = "Grid_Check"; - this.Grid_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Grid_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.Grid_Check.Width = 40; - // // Commodity_registration // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs index 74d939a..6fdbd60 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.cs @@ -154,7 +154,8 @@ namespace WindowsFormsApp1.Delivery { if(dataGridView1.Rows[a].Cells["count"].Value == null) { break; } Strvol = dataGridView1.Rows[a].Cells["count"].Value.ToString(); - Strprice = dataGridView1.Rows[a].Cells["unit"].Value.ToString(); + Strprice = dataGridView1.Rows[a].Cells["unit"].Value.ToString().Replace(",", ""); + if(dataGridView1.Rows[a].Cells["total"].Value == null) { int vol_tmp = Convert.ToInt32(Strvol); int price_tmp = Convert.ToInt32(Strprice); @@ -260,20 +261,20 @@ namespace WindowsFormsApp1.Delivery { int cout = 0; int delcout = 0; - if(MessageBox.Show("정말 삭제하시겠습니까?\n삭제는 1개씩입니다.", "Danger!!!", MessageBoxButtons.YesNo) == DialogResult.Yes) + if (MessageBox.Show("정말 삭제하시겠습니까?\n삭제는 1개씩입니다.", "Danger!!!", MessageBoxButtons.YesNo) == DialogResult.Yes) { - for(int a = 0; a < dataGridView2.Rows.Count; a++) + for (int a = 0; a < dataGridView2.Rows.Count; a++) { bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { - if(cout == 0) { delcout = a; cout++; } + if (cout == 0) { delcout = a; cout++; } else { MessageBox.Show("체크가 2개이상 되어있습니다!"); cout++; break; } } } richTextBox1.Text = delcout.ToString(); - if(cout == 0) { MessageBox.Show("체크된 사항이 없습니다."); return; } - else if(cout == 1) + if (cout == 0) { MessageBox.Show("체크된 사항이 없습니다."); return; } + else if (cout == 1) { string[] del_target = { dataGridView2.Rows[delcout].Cells["list_date"].Value.ToString(), dataGridView2.Rows[delcout].Cells["list_name"].Value.ToString() }; @@ -352,7 +353,7 @@ namespace WindowsFormsApp1.Delivery { string marc_tmp = dataGridView2.Rows[a].Cells["chk_marc"].Value.ToString(); int marc = Convert.ToInt32(marc_tmp); - if (marc > 1) { + if (marc >= 1) { dataGridView2.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; } } @@ -377,7 +378,7 @@ namespace WindowsFormsApp1.Delivery { dataGridView1.Rows[a].Cells[ea].Value = ""; } - if(dataGridView1.Columns[ea].Name == "unit" || dataGridView1.Columns[ea].Name == "total") { + if (dataGridView1.Columns[ea].Name == "unit" || dataGridView1.Columns[ea].Name == "total") { setData[ea + 2] = dataGridView1.Rows[a].Cells[ea].Value.ToString().Replace(",", ""); } else { @@ -432,8 +433,13 @@ namespace WindowsFormsApp1.Delivery bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { - dataGridView2.Rows[a].Cells[7].Value = "진행"; - db.DB_Update("Obj_List", "state", "진행", "dly", dataGridView2.Rows[a].Cells[2].Value.ToString()); + string[] edit_col = { "state" }; + string[] edit_name = { "진행" }; + string[] seer_col = { "date", "list_name" }; + string[] sear_name = { dataGridView2.Rows[a].Cells["list_date"].Value.ToString(), + dataGridView2.Rows[a].Cells["list_name"].Value.ToString() }; + db.More_Update("Obj_List", edit_col, edit_name, seer_col, sear_name); + dataGridView2.Rows[a].Cells["stat2"].Value = "진행"; } } Add_Grid("완료"); @@ -448,8 +454,13 @@ namespace WindowsFormsApp1.Delivery bool isChecked = Convert.ToBoolean(dataGridView2.Rows[a].Cells["Grid_Check"].Value); if (isChecked) { - dataGridView2.Rows[a].Cells[7].Value = "완료"; - db.DB_Update("Obj_List", "state", "완료", "dly", dataGridView2.Rows[a].Cells[2].Value.ToString()); + string[] edit_col = { "state" }; + string[] edit_name = { "완료" }; + string[] seer_col = { "date", "list_name" }; + string[] sear_name = { dataGridView2.Rows[a].Cells["list_date"].Value.ToString(), + dataGridView2.Rows[a].Cells["list_name"].Value.ToString() }; + db.More_Update("Obj_List", edit_col, edit_name, seer_col, sear_name); + dataGridView2.Rows[a].Cells["stat2"].Value = "완료"; } } Add_Grid("진행"); @@ -469,21 +480,20 @@ namespace WindowsFormsApp1.Delivery if (tb_user2.Text != "") { cmd += " AND `charge` LIKE '%" + tb_user2.Text + "%'"; } cmd += ";"; string res_temp = db.self_Made_Cmd(cmd); - string[] result = { "", "", "", "", "", "", "", "", "", "ISBN 조회", "" }; // 0-10 + string[] result = { "", "", "", "", "", "", "", "", "ISBN 조회", "" }; // 0-9 string[] tmp = res_temp.Split('|'); dataGridView2.Rows.Clear(); for (int a = 0; a < tmp.Length; a++) { - if(a==0 || a % 10 == 0) { result[0] = tmp[a]; } - if(a % 10 == 1) { result[1] = tmp[a]; } - if(a % 10 == 2) { result[2] = tmp[a]; } - if(a % 10 == 3) { result[3] = tmp[a]; } - if(a % 10 == 4) { result[4] = tmp[a]; } - if(a % 10 == 5) { result[5] = tmp[a]; } - if(a % 10 == 6) { result[6] = tmp[a]; } - if(a % 10 == 7) { result[7] = tmp[a]; } - if(a % 10 == 8) { result[8] = tmp[a]; } - if(a % 10 == 9) { result[10] = tmp[a]; dataGridView2.Rows.Add(result); } + if (a % 9 == 0) { result[0] = tmp[a]; } + if (a % 9 == 1) { result[1] = tmp[a]; } + if (a % 9 == 2) { result[2] = tmp[a]; } + if (a % 9 == 3) { result[3] = tmp[a]; } + if (a % 9 == 4) { result[4] = tmp[a]; } + if (a % 9 == 5) { result[5] = tmp[a]; } + if (a % 9 == 6) { result[6] = tmp[a]; } + if (a % 9 == 7) { result[7] = tmp[a]; } + if (a % 9 == 8) { result[9] = tmp[a]; dataGridView2.Rows.Add(result); } } GridColorChange(); } diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs index 50934da..43eb73e 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs @@ -582,6 +582,9 @@ namespace WindowsFormsApp1.Mac private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { rowidx = e.RowIndex; + if (dataGridView1.Rows[rowidx].Cells["api_data"].Value == null) { + return; + } richTextBox1.Text = dataGridView1.Rows[rowidx].Cells["api_data"].Value.ToString(); } private void Check_ISBN_FormClosing(object sender, FormClosingEventArgs e) diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs index abedb43..f0082f2 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs @@ -71,7 +71,6 @@ namespace WindowsFormsApp1.마크 private string change_Date_type(string date) { if (Call_API == "알라딘") { - MessageBox.Show(date); return String.Format("{0:yyyy/MM/dd}", DateTime.Parse(date.Remove(date.IndexOf(" G")))); } else if (Call_API == "네이버")