diff --git a/unimarc/.vs/unimarc/FileContentIndex/d636f72a-4025-4b37-a984-91c81d91b8ae.vsidx b/unimarc/.vs/unimarc/FileContentIndex/208514c1-7538-4fc4-b2c9-4897c31e0060.vsidx
similarity index 100%
rename from unimarc/.vs/unimarc/FileContentIndex/d636f72a-4025-4b37-a984-91c81d91b8ae.vsidx
rename to unimarc/.vs/unimarc/FileContentIndex/208514c1-7538-4fc4-b2c9-4897c31e0060.vsidx
diff --git a/unimarc/.vs/unimarc/FileContentIndex/f1fec19f-19b4-4df5-9735-3f15e4d3b54e.vsidx b/unimarc/.vs/unimarc/FileContentIndex/5a4be321-b835-4442-a2e0-e5b56a9abcff.vsidx
similarity index 67%
rename from unimarc/.vs/unimarc/FileContentIndex/f1fec19f-19b4-4df5-9735-3f15e4d3b54e.vsidx
rename to unimarc/.vs/unimarc/FileContentIndex/5a4be321-b835-4442-a2e0-e5b56a9abcff.vsidx
index 5980e4b..b74b722 100644
Binary files a/unimarc/.vs/unimarc/FileContentIndex/f1fec19f-19b4-4df5-9735-3f15e4d3b54e.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/5a4be321-b835-4442-a2e0-e5b56a9abcff.vsidx differ
diff --git a/unimarc/.vs/unimarc/FileContentIndex/ae4b227c-a2a0-4dfe-90ea-408b65432b09.vsidx b/unimarc/.vs/unimarc/FileContentIndex/ae4b227c-a2a0-4dfe-90ea-408b65432b09.vsidx
new file mode 100644
index 0000000..fcb8e87
Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/ae4b227c-a2a0-4dfe-90ea-408b65432b09.vsidx differ
diff --git a/unimarc/.vs/unimarc/FileContentIndex/b120a45b-8a07-4795-b260-510ad7bf0988.vsidx b/unimarc/.vs/unimarc/FileContentIndex/b120a45b-8a07-4795-b260-510ad7bf0988.vsidx
deleted file mode 100644
index 527a590..0000000
Binary files a/unimarc/.vs/unimarc/FileContentIndex/b120a45b-8a07-4795-b260-510ad7bf0988.vsidx and /dev/null differ
diff --git a/unimarc/.vs/unimarc/FileContentIndex/db048953-eab3-4424-b03e-e937f021bdbd.vsidx b/unimarc/.vs/unimarc/FileContentIndex/db048953-eab3-4424-b03e-e937f021bdbd.vsidx
new file mode 100644
index 0000000..393c9a9
Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/db048953-eab3-4424-b03e-e937f021bdbd.vsidx differ
diff --git a/unimarc/.vs/unimarc/FileContentIndex/f63d50f8-11b4-44c3-b103-dac8f2410995.vsidx b/unimarc/.vs/unimarc/FileContentIndex/f63d50f8-11b4-44c3-b103-dac8f2410995.vsidx
deleted file mode 100644
index 0e7d31b..0000000
Binary files a/unimarc/.vs/unimarc/FileContentIndex/f63d50f8-11b4-44c3-b103-dac8f2410995.vsidx and /dev/null differ
diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo
index 34f5994..ea9b1f0 100644
Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index 07eab40..caadec1 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index b8cfaba..630b272 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index 41990e4..f47393d 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index b3442e7..bfeac0e 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index 07eab40..caadec1 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index b8cfaba..630b272 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index 41990e4..f47393d 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/납품관리/List_Lookup.cs b/unimarc/unimarc/납품관리/List_Lookup.cs
index ed2af49..7f7bd07 100644
--- a/unimarc/unimarc/납품관리/List_Lookup.cs
+++ b/unimarc/unimarc/납품관리/List_Lookup.cs
@@ -380,8 +380,6 @@ namespace WindowsFormsApp1.Delivery
continue;
dataGridView1.Rows.Add(mkgrid);
- // if (filter(mkgrid))
-
}
}
}
@@ -389,7 +387,7 @@ namespace WindowsFormsApp1.Delivery
{
string[] ary_where = { "", "", "", "", "", "" };
- ary_where[0] = string.Format("`list_name` IN (SELECT `list_name` FROM `Obj_List` WHERE `state` = \"{0}\")", cb_stat.Text);
+ ary_where[0] = string.Format("`l_idx` IN (SELECT `idx` FROM `Obj_List` WHERE `state` = \"{0}\" AND `comp_num` = \"{1}\")", cb_stat.Text, compidx);
if (tb_search.Text != "")
{
if (cb_search.SelectedIndex == 0) // 도서명
@@ -433,65 +431,12 @@ namespace WindowsFormsApp1.Delivery
return cmd;
}
- private bool filter(string[] array)
- {
- /* 주 | 번호 | 도서명 | 저자 | 출판사
- * 수량 | 단가 | 합계 | 상태 | 비고
- * 구분 | 주문처 | 입고상태 | 출고상태 */
- if (tb_search.Text != "")
- {
- if (cb_search.SelectedIndex == 0)
- {
- if (!array[3].Contains(tb_search.Text))
- {
- return false;
- }
- }
- else if (cb_search.SelectedIndex == 1)
- {
- if (!array[5].Contains(tb_search.Text))
- {
- return false;
- }
- }
- }
- if (tb_clt.Text != "")
- {
- if (!array[12].Contains(tb_clt.Text))
- {
- return false;
- }
- }
- if (cb_list_name.SelectedIndex != 0)
- {
- if (!array[11].Contains(cb_list_name.Text))
- {
- return false;
- }
- }
- if (cb_import.SelectedIndex != 0)
- {
- if (array[13] != cb_import.Text)
- {
- return false;
- }
- }
- if (cb_export.SelectedIndex != 0)
- {
- if (array[14] != cb_export.Text)
- {
- return false;
- }
- }
- return true;
- }
-
private void res_total()
{
int itcount = 0;
int itpay = 0;
int ittotal = 0;
- for(int a = 0; a < dataGridView1.Rows.Count; a++)
+ for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
itcount += Convert.ToInt32(dataGridView1.Rows[a].Cells["count"].Value.ToString());
itpay += Convert.ToInt32(dataGridView1.Rows[a].Cells["pay"].Value.ToString());
diff --git a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs
index a939668..1acd06c 100644
--- a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs
+++ b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs
@@ -28,9 +28,9 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List_aggregation));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.btn_lookup = new System.Windows.Forms.Button();
this.btn_save = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
@@ -49,6 +49,7 @@
this.combo_year = new System.Windows.Forms.ComboBox();
this.btn_close = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
+ this.date_res_Value = new System.Windows.Forms.DateTimePicker();
this.panel3 = new System.Windows.Forms.Panel();
this.rtb_etc = new System.Windows.Forms.RichTextBox();
this.panel2 = new System.Windows.Forms.Panel();
@@ -80,6 +81,7 @@
this.label14 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.btn_apply = new System.Windows.Forms.Button();
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
@@ -89,6 +91,7 @@
this.lbl_total = new System.Windows.Forms.Label();
this.lbl_count = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
+ this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.date_res = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -107,8 +110,6 @@
this.chk_label = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.clt = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Chk_Column = new System.Windows.Forms.DataGridViewCheckBoxColumn();
- this.label17 = new System.Windows.Forms.Label();
- this.date_res_Value = new System.Windows.Forms.DateTimePicker();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
this.panel3.SuspendLayout();
@@ -195,15 +196,16 @@
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.idx,
this.list_name,
this.list_date,
this.date_res,
@@ -252,7 +254,7 @@
//
// btn_process
//
- this.btn_process.Location = new System.Drawing.Point(306, 5);
+ this.btn_process.Location = new System.Drawing.Point(306, 6);
this.btn_process.Name = "btn_process";
this.btn_process.Size = new System.Drawing.Size(65, 23);
this.btn_process.TabIndex = 4;
@@ -262,7 +264,7 @@
//
// btn_ISBN
//
- this.btn_ISBN.Location = new System.Drawing.Point(212, 5);
+ this.btn_ISBN.Location = new System.Drawing.Point(212, 6);
this.btn_ISBN.Name = "btn_ISBN";
this.btn_ISBN.Size = new System.Drawing.Size(65, 23);
this.btn_ISBN.TabIndex = 2;
@@ -272,7 +274,7 @@
//
// btn_checkup
//
- this.btn_checkup.Location = new System.Drawing.Point(118, 5);
+ this.btn_checkup.Location = new System.Drawing.Point(118, 6);
this.btn_checkup.Name = "btn_checkup";
this.btn_checkup.Size = new System.Drawing.Size(65, 23);
this.btn_checkup.TabIndex = 1;
@@ -353,6 +355,17 @@
this.panel1.Size = new System.Drawing.Size(381, 634);
this.panel1.TabIndex = 14;
//
+ // date_res_Value
+ //
+ this.date_res_Value.Checked = false;
+ this.date_res_Value.CustomFormat = "yyyy-MM-dd";
+ this.date_res_Value.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.date_res_Value.Location = new System.Drawing.Point(74, 360);
+ this.date_res_Value.Name = "date_res_Value";
+ this.date_res_Value.ShowCheckBox = true;
+ this.date_res_Value.Size = new System.Drawing.Size(109, 21);
+ this.date_res_Value.TabIndex = 19;
+ //
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -647,6 +660,16 @@
this.label4.TabIndex = 16;
this.label4.Text = "업체명";
//
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.label17.Location = new System.Drawing.Point(10, 365);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(59, 13);
+ this.label17.TabIndex = 16;
+ this.label17.Text = "완료일자";
+ //
// label10
//
this.label10.AutoSize = true;
@@ -659,7 +682,7 @@
//
// btn_apply
//
- this.btn_apply.Location = new System.Drawing.Point(24, 5);
+ this.btn_apply.Location = new System.Drawing.Point(24, 6);
this.btn_apply.Name = "btn_apply";
this.btn_apply.Size = new System.Drawing.Size(65, 23);
this.btn_apply.TabIndex = 0;
@@ -722,6 +745,12 @@
this.label16.TabIndex = 0;
this.label16.Text = "목록 총 합계";
//
+ // idx
+ //
+ this.idx.HeaderText = "idx";
+ this.idx.Name = "idx";
+ this.idx.Visible = false;
+ //
// list_name
//
this.list_name.HeaderText = "목록명";
@@ -736,9 +765,9 @@
//
// date_res
//
- dataGridViewCellStyle6.Format = "d";
- dataGridViewCellStyle6.NullValue = null;
- this.date_res.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle2.Format = "d";
+ dataGridViewCellStyle2.NullValue = null;
+ this.date_res.DefaultCellStyle = dataGridViewCellStyle2;
this.date_res.HeaderText = "완료일자";
this.date_res.Name = "date_res";
this.date_res.Width = 80;
@@ -835,27 +864,6 @@
this.Chk_Column.Visible = false;
this.Chk_Column.Width = 40;
//
- // label17
- //
- this.label17.AutoSize = true;
- this.label17.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label17.Location = new System.Drawing.Point(10, 365);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(59, 13);
- this.label17.TabIndex = 16;
- this.label17.Text = "완료일자";
- //
- // date_res_Value
- //
- this.date_res_Value.Checked = false;
- this.date_res_Value.CustomFormat = "yyyy-MM-dd";
- this.date_res_Value.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
- this.date_res_Value.Location = new System.Drawing.Point(74, 360);
- this.date_res_Value.Name = "date_res_Value";
- this.date_res_Value.ShowCheckBox = true;
- this.date_res_Value.Size = new System.Drawing.Size(109, 21);
- this.date_res_Value.TabIndex = 19;
- //
// List_aggregation
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -955,6 +963,9 @@
private System.Windows.Forms.Label lbl_total;
private System.Windows.Forms.Label lbl_count;
private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.DateTimePicker date_res_Value;
+ private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn list_name;
private System.Windows.Forms.DataGridViewTextBoxColumn list_date;
private System.Windows.Forms.DataGridViewTextBoxColumn date_res;
@@ -973,7 +984,5 @@
private System.Windows.Forms.DataGridViewTextBoxColumn chk_label;
private System.Windows.Forms.DataGridViewTextBoxColumn clt;
private System.Windows.Forms.DataGridViewCheckBoxColumn Chk_Column;
- private System.Windows.Forms.Label label17;
- private System.Windows.Forms.DateTimePicker date_res_Value;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/납품관리/List_aggregation.cs b/unimarc/unimarc/납품관리/List_aggregation.cs
index da1e75f..843a7b2 100644
--- a/unimarc/unimarc/납품관리/List_aggregation.cs
+++ b/unimarc/unimarc/납품관리/List_aggregation.cs
@@ -73,10 +73,10 @@ namespace WindowsFormsApp1.Delivery
}
public void btn_lookup_Click(object sender, EventArgs e) // 조회
{
- /// 목록명 / 목록일자 / 완료일자 / 담당자 / 작업명
+ /// idx / 목록명 / 목록일자 / 완료일자 / 담당자 / 작업명
/// 작업방법 / 배송방법 / 합계금액 / 입고금액 / 수량
- /// 입고 / 미입고 / 목록번호 / 마크여부
- string searchdb = "`list_name`, `date`, `date_res`, `charge`, `work_name`, " +
+ /// 입고 / 미입고 / 목록번호 / 마크여부 / 거래처명
+ string searchdb = "`idx`, `list_name`, `date`, `date_res`, `charge`, `work_name`, " +
"`work_way`, `send_way`, `total`, `stock_money`, `vol`, " +
"`stock`, `unstock`, `list_num`, `chk_marc`, `clt`";
@@ -128,27 +128,25 @@ namespace WindowsFormsApp1.Delivery
"", "", "", "", "",
"", "", "", "", "",
"", "", "", "", "",
- "", "" };
- int count = 15;
+ "", "", "" };
+ int count = 16;
for (int a = 0; a < db_data.Length; a++)
{
if (a % count == 0) { grid[0] = db_data[a]; }
- if (a % count == 1)
+ if (a % count == 1) { grid[1] = db_data[a]; }
+ if (a % count == 2)
{
- if (db_data[a].Length < 3)
- {
- grid[1] = db_data[a];
- }
- else { grid[1] = db_data[a].Substring(0, 10); }
- grid[1] = db_data[a];
- }
- if (a % count == 2) {
if (db_data[a].Length < 3) {
grid[2] = db_data[a];
}
else { grid[2] = db_data[a].Substring(0, 10); }
}
- if (a % count == 3) { grid[3] = db_data[a]; }
+ if (a % count == 3) {
+ if (db_data[a].Length < 3) {
+ grid[3] = db_data[a];
+ }
+ else { grid[3] = db_data[a].Substring(0, 10); }
+ }
if (a % count == 4) { grid[4] = db_data[a]; }
if (a % count == 5) { grid[5] = db_data[a]; }
if (a % count == 6) { grid[6] = db_data[a]; }
@@ -157,10 +155,12 @@ namespace WindowsFormsApp1.Delivery
if (a % count == 9) { grid[9] = db_data[a]; }
if (a % count == 10) { grid[10] = db_data[a]; }
if (a % count == 11) { grid[11] = db_data[a]; }
- if (a % count == 12) { grid[14] = db_data[a]; }
+ if (a % count == 12) { grid[12] = db_data[a]; }
+
if (a % count == 13) { grid[15] = db_data[a]; }
- if (a % count == 14) {
- grid[16] = db_data[a];
+ if (a % count == 14) { grid[16] = db_data[a]; }
+ if (a % count == 15) {
+ grid[17] = db_data[a];
if (Grid_filter(grid))
{
dataGridView1.Rows.Add(grid);
@@ -225,26 +225,24 @@ namespace WindowsFormsApp1.Delivery
{
string table = "Obj_List";
string[] Edit_col = { "work_name", "work_way", "send_way", "date_res" };
- string[] Search_col = { "list_name", "date" };
- string edit1, edit2, edit3, edit4;
+ string[] Search_col = { "idx" };
+ string[] Edit_Data = { "", "", "", "" };
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
- if(dataGridView1.Rows[a].Cells["work_name"].Value.ToString() == null) { edit1 = ""; }
- else { edit1 = dataGridView1.Rows[a].Cells["work_name"].Value.ToString(); }
+ if (dataGridView1.Rows[a].Cells["work_name"].Value.ToString() == null) { Edit_Data[0] = ""; }
+ else { Edit_Data[0] = dataGridView1.Rows[a].Cells["work_name"].Value.ToString(); }
- if(dataGridView1.Rows[a].Cells["work_way"].Value.ToString() == null) { edit2 = ""; }
- else { edit2 = dataGridView1.Rows[a].Cells["work_way"].Value.ToString(); }
+ if (dataGridView1.Rows[a].Cells["work_way"].Value.ToString() == null) { Edit_Data[1] = ""; }
+ else { Edit_Data[1] = dataGridView1.Rows[a].Cells["work_way"].Value.ToString(); }
- if(dataGridView1.Rows[a].Cells["send_way"].Value.ToString() == null) { edit3 = ""; }
- else { edit3 = dataGridView1.Rows[a].Cells["send_way"].Value.ToString(); }
+ if (dataGridView1.Rows[a].Cells["send_way"].Value.ToString() == null) { Edit_Data[2] = ""; }
+ else { Edit_Data[2] = dataGridView1.Rows[a].Cells["send_way"].Value.ToString(); }
- if(dataGridView1.Rows[a].Cells["date_res"].Value.ToString() == null) { edit4 = ""; }
- else { edit4 = dataGridView1.Rows[a].Cells["date_res"].Value.ToString(); }
+ if (dataGridView1.Rows[a].Cells["date_res"].Value.ToString() == null) { Edit_Data[3] = ""; }
+ else { Edit_Data[3] = dataGridView1.Rows[a].Cells["date_res"].Value.ToString(); }
- string[] Edit_Data = { edit1, edit2, edit3, edit4 };
string[] Search_Data = {
- dataGridView1.Rows[a].Cells["list_name"].Value.ToString(),
- dataGridView1.Rows[a].Cells["list_date"].Value.ToString()
+ 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);
@@ -263,11 +261,10 @@ namespace WindowsFormsApp1.Delivery
string[] Edit_col = { "state" };
string[] Edit_data = { "완료" };
- string[] Search_col = { "compidx", "list_name", "date" };
+ string[] Search_col = { "compidx", "idx" };
string[] Search_data = {
compidx,
- dataGridView1.Rows[row].Cells["list_name"].Value.ToString(),
- dataGridView1.Rows[row].Cells["list_date"].Value.ToString()
+ dataGridView1.Rows[row].Cells["idx"].Value.ToString()
};
string Area = "`isbn`, `isbn_import`, `book_name`, `author`, `book_comp`, `price`, `input_count`, `persent`";
@@ -444,7 +441,6 @@ namespace WindowsFormsApp1.Delivery
if (temp % 40 == 0)
{
- MessageBox.Show("40으로 나눠졌다.");
e.HasMorePages = true;
pageNo++;
return;
@@ -474,10 +470,6 @@ namespace WindowsFormsApp1.Delivery
isbn.DataLoad();
isbn.Show();
}
- private void btn_date_Click(object sender, EventArgs e) // 일정
- {
- // TODO: 별도의 일정폼이 만들어져야함.
- }
//////////////////////////////////////////////////////////////////////////////////////
@@ -500,11 +492,11 @@ namespace WindowsFormsApp1.Delivery
}
private void combo_state_SelectedIndexChanged(object sender, EventArgs e)
{
- if(combo_state.Text == "진행")
+ if (combo_state.Text == "진행")
{
combo_year.Visible = false;
}
- else if(combo_state.Text == "완료")
+ else if (combo_state.Text == "완료")
{
combo_year.Visible = true;
}
@@ -521,7 +513,7 @@ namespace WindowsFormsApp1.Delivery
skill.DataGrid_to_Delete(sender, e);
}
- // gird 선택시 우측란에 해당 정보로 초기화 및 최신화
+ // grid 선택시 우측란에 해당 정보로 초기화 및 최신화
if(e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
{
int row = dataGridView1.CurrentRow.Index;
diff --git a/unimarc/unimarc/납품관리/List_aggregation.resx b/unimarc/unimarc/납품관리/List_aggregation.resx
index 58c6dc5..776a2d0 100644
--- a/unimarc/unimarc/납품관리/List_aggregation.resx
+++ b/unimarc/unimarc/납품관리/List_aggregation.resx
@@ -117,6 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
True
diff --git a/unimarc/unimarc/마크/Check_ISBN.Designer.cs b/unimarc/unimarc/마크/Check_ISBN.Designer.cs
index 2f42846..5f599d4 100644
--- a/unimarc/unimarc/마크/Check_ISBN.Designer.cs
+++ b/unimarc/unimarc/마크/Check_ISBN.Designer.cs
@@ -128,7 +128,7 @@
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1632, 594);
+ this.dataGridView1.Size = new System.Drawing.Size(1630, 591);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
@@ -347,6 +347,7 @@
//
// richTextBox1
//
+ this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
this.richTextBox1.Name = "richTextBox1";
@@ -395,7 +396,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1632, 30);
+ this.panel1.Size = new System.Drawing.Size(1632, 31);
this.panel1.TabIndex = 10;
//
// btn_ComparePrice
@@ -419,11 +420,12 @@
//
// panel3
//
+ this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel3.Controls.Add(this.dataGridView1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel3.Location = new System.Drawing.Point(0, 30);
+ this.panel3.Location = new System.Drawing.Point(0, 31);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(1632, 594);
+ this.panel3.Size = new System.Drawing.Size(1632, 593);
this.panel3.TabIndex = 12;
//
// Check_ISBN
diff --git a/unimarc/unimarc/마크/MarcCopySelect.cs b/unimarc/unimarc/마크/MarcCopySelect.cs
index 0fc2a1f..8310a95 100644
--- a/unimarc/unimarc/마크/MarcCopySelect.cs
+++ b/unimarc/unimarc/마크/MarcCopySelect.cs
@@ -57,12 +57,15 @@ namespace UniMarc.마크
switch (cb_SearchFilter.SelectedIndex)
{
case 0:
- search_Col = "서명";
+ search_Col = "ISBN";
break;
case 1:
- search_Col = "저자";
+ search_Col = "서명";
break;
case 2:
+ search_Col = "저자";
+ break;
+ case 3:
search_Col = "출판사";
break;
}
diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs
index fda71d7..d1dbe83 100644
--- a/unimarc/unimarc/마크/Marc_Plan.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.cs
@@ -142,8 +142,6 @@ namespace WindowsFormsApp1.Mac
string TypeView = ConvertMarcType(Grid[19]);
Grid[19] = st.made_Ori_marc(AddTagInMarc(AddTag, TypeView));
-
-
dataGridView1.Rows.Add(Grid);
}
}
@@ -189,7 +187,10 @@ namespace WindowsFormsApp1.Mac
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
foreach (DataGridViewRow r in dataGridView1.Rows) {
- r.Cells["colCheck"].Value = ((CheckBox)sender).Checked;
+ if (((CheckBox)sender).Checked)
+ r.Cells["colCheck"].Value = "T";
+ else
+ r.Cells["colCheck"].Value = "F";
}
}
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
index 9b684f4..b850258 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
@@ -288,7 +288,7 @@ namespace UniMarc.마크
// 저자, 출판사, 정가, midx, 마크
author_Fin, Search_Res[12], Search_Res[13], "", grid[a],
// 검색태그
- "" };
+ "", "T" };
mp.dataGridView1.Rows.Add(AddGrid);
this.Close();
}