* unimarc

a. 팩스전송 완료.
 b. 마크목록 폼 작성중
  1. 엑셀반출 기능 추가중 사용 작업중
  2. 마크편집 폼 수정 중 (마크 반출 test프로젝트 진행완료, 본 프로젝트에 적용중. / 저장기능활성화 작업완료)
   2-1. 기존의 칸채우기에서 예상되지 못한 버그가 발생하여 칸채우기 숨김.
   2-2. 008태크 재배치 => TextBox에 적용완료. 변경사항 메모장으로 넘기는 작업 완료.
   2-3. 저장기능 완료. (04.14 체크해볼것)

* ISBN 체크 프로그램 - ★작업완료★
 a. 현재 마크팀 배포완료. - 추후 수정사항발생시 수정할 것.

-- 작업중 --
ISBN 체크 프로그램 => 본프로그램에 이식중.
ㄴ> 코드는 다 옮겼으나 기존 사용하던 방식과 조금 달라서 버그발생 가능성 있음.
ㄴ> 버그 체크 계속 해볼것. 21-04-15

-- 완료 --
1. 주문관리 팩스연동 완료
2. 전송된 팩스 확인 작업개시, 이메일 전송모듈 수정완료.
3. 주문관리에서 주문처와 목록 검색하는 폼 검색 모듈도 재수정 완료함.
This commit is contained in:
SeungHo Yang
2021-04-15 18:36:39 +09:00
parent 2ff6f4ed89
commit c6b4702a79
32 changed files with 321 additions and 220 deletions

View File

@@ -28,12 +28,12 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label();
this.tb_FilePath = new System.Windows.Forms.TextBox();
this.btn_FileOpen = new System.Windows.Forms.Button();
@@ -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.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column20 = new System.Windows.Forms.DataGridViewButtonColumn();
this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Del_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();
@@ -95,17 +106,6 @@
this.rbtn_all = new System.Windows.Forms.RadioButton();
this.panel2 = new System.Windows.Forms.Panel();
this.label14 = new System.Windows.Forms.Label();
this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column20 = new System.Windows.Forms.DataGridViewButtonColumn();
this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Del_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
@@ -296,14 +296,14 @@
// dataGridView1
//
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
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;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column22,
@@ -359,27 +359,27 @@
//
// Column5
//
dataGridViewCellStyle2.Format = "C0";
dataGridViewCellStyle2.NullValue = null;
this.Column5.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle8.Format = "C0";
dataGridViewCellStyle8.NullValue = null;
this.Column5.DefaultCellStyle = dataGridViewCellStyle8;
this.Column5.HeaderText = "수량";
this.Column5.Name = "Column5";
this.Column5.Width = 35;
//
// Column6
//
dataGridViewCellStyle3.Format = "N0";
dataGridViewCellStyle3.NullValue = null;
this.Column6.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle9.Format = "N0";
dataGridViewCellStyle9.NullValue = null;
this.Column6.DefaultCellStyle = dataGridViewCellStyle9;
this.Column6.HeaderText = "단가";
this.Column6.Name = "Column6";
this.Column6.Width = 70;
//
// Column7
//
dataGridViewCellStyle4.Format = "N0";
dataGridViewCellStyle4.NullValue = null;
this.Column7.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle10.Format = "N0";
dataGridViewCellStyle10.NullValue = null;
this.Column7.DefaultCellStyle = dataGridViewCellStyle10;
this.Column7.HeaderText = "합계";
this.Column7.Name = "Column7";
this.Column7.Width = 80;
@@ -416,7 +416,7 @@
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(14, 17);
this.label7.Location = new System.Drawing.Point(14, 13);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(29, 12);
this.label7.TabIndex = 1;
@@ -449,7 +449,7 @@
//
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(50, 13);
this.comboBox1.Location = new System.Drawing.Point(50, 9);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(83, 20);
this.comboBox1.TabIndex = 2;
@@ -460,14 +460,14 @@
this.dataGridView2.AllowUserToAddRows = false;
this.dataGridView2.AllowUserToDeleteRows = false;
this.dataGridView2.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.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column11,
this.Column12,
@@ -489,10 +489,83 @@
this.dataGridView2.TabIndex = 29;
this.dataGridView2.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView2_CellClick);
//
// Column11
//
this.Column11.HeaderText = "목록일자";
this.Column11.Name = "Column11";
this.Column11.Width = 80;
//
// Column12
//
this.Column12.HeaderText = "거래처명";
this.Column12.Name = "Column12";
this.Column12.Width = 180;
//
// Column13
//
this.Column13.HeaderText = "납품목록";
this.Column13.Name = "Column13";
this.Column13.Width = 180;
//
// Column14
//
this.Column14.HeaderText = "담당자";
this.Column14.Name = "Column14";
//
// Column15
//
this.Column15.HeaderText = "목록번호";
this.Column15.Name = "Column15";
this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// Column16
//
this.Column16.HeaderText = "수량";
this.Column16.Name = "Column16";
this.Column16.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column16.Width = 50;
//
// Column17
//
dataGridViewCellStyle12.Format = "N0";
dataGridViewCellStyle12.NullValue = null;
this.Column17.DefaultCellStyle = dataGridViewCellStyle12;
this.Column17.HeaderText = "합계";
this.Column17.Name = "Column17";
//
// Column18
//
this.Column18.HeaderText = "상태";
this.Column18.Name = "Column18";
this.Column18.Width = 50;
//
// Column20
//
this.Column20.HeaderText = "ISBN조회";
this.Column20.Name = "Column20";
this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column20.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;
//
// Del_Check
//
this.Del_Check.HeaderText = "체크";
this.Del_Check.Name = "Del_Check";
this.Del_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Del_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Del_Check.Width = 40;
//
// btn_morge
//
this.btn_morge.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_morge.Location = new System.Drawing.Point(1039, 12);
this.btn_morge.Location = new System.Drawing.Point(1039, 8);
this.btn_morge.Name = "btn_morge";
this.btn_morge.Size = new System.Drawing.Size(62, 23);
this.btn_morge.TabIndex = 28;
@@ -503,7 +576,7 @@
// btn_Edit
//
this.btn_Edit.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_Edit.Location = new System.Drawing.Point(971, 12);
this.btn_Edit.Location = new System.Drawing.Point(971, 8);
this.btn_Edit.Name = "btn_Edit";
this.btn_Edit.Size = new System.Drawing.Size(62, 23);
this.btn_Edit.TabIndex = 28;
@@ -514,7 +587,7 @@
// btn_Del
//
this.btn_Del.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_Del.Location = new System.Drawing.Point(903, 12);
this.btn_Del.Location = new System.Drawing.Point(903, 8);
this.btn_Del.Name = "btn_Del";
this.btn_Del.Size = new System.Drawing.Size(62, 23);
this.btn_Del.TabIndex = 28;
@@ -525,7 +598,7 @@
// btn_Complet
//
this.btn_Complet.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_Complet.Location = new System.Drawing.Point(835, 12);
this.btn_Complet.Location = new System.Drawing.Point(835, 8);
this.btn_Complet.Name = "btn_Complet";
this.btn_Complet.Size = new System.Drawing.Size(62, 23);
this.btn_Complet.TabIndex = 28;
@@ -536,7 +609,7 @@
// btn_ing
//
this.btn_ing.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_ing.Location = new System.Drawing.Point(767, 12);
this.btn_ing.Location = new System.Drawing.Point(767, 8);
this.btn_ing.Name = "btn_ing";
this.btn_ing.Size = new System.Drawing.Size(62, 23);
this.btn_ing.TabIndex = 28;
@@ -547,7 +620,7 @@
// button7
//
this.button7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button7.Location = new System.Drawing.Point(699, 12);
this.button7.Location = new System.Drawing.Point(699, 8);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(62, 23);
this.button7.TabIndex = 28;
@@ -557,7 +630,7 @@
// btn_lockup
//
this.btn_lockup.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btn_lockup.Location = new System.Drawing.Point(631, 12);
this.btn_lockup.Location = new System.Drawing.Point(631, 8);
this.btn_lockup.Name = "btn_lockup";
this.btn_lockup.Size = new System.Drawing.Size(62, 23);
this.btn_lockup.TabIndex = 28;
@@ -567,7 +640,7 @@
//
// tb_dvy2
//
this.tb_dvy2.Location = new System.Drawing.Point(189, 13);
this.tb_dvy2.Location = new System.Drawing.Point(189, 9);
this.tb_dvy2.Name = "tb_dvy2";
this.tb_dvy2.Size = new System.Drawing.Size(115, 21);
this.tb_dvy2.TabIndex = 8;
@@ -575,7 +648,7 @@
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(146, 17);
this.label8.Location = new System.Drawing.Point(146, 13);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(41, 12);
this.label8.TabIndex = 7;
@@ -584,7 +657,7 @@
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(314, 17);
this.label12.Location = new System.Drawing.Point(314, 13);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(41, 12);
this.label12.TabIndex = 9;
@@ -592,7 +665,7 @@
//
// tb_clt2
//
this.tb_clt2.Location = new System.Drawing.Point(356, 13);
this.tb_clt2.Location = new System.Drawing.Point(356, 9);
this.tb_clt2.Name = "tb_clt2";
this.tb_clt2.Size = new System.Drawing.Size(115, 21);
this.tb_clt2.TabIndex = 10;
@@ -600,7 +673,7 @@
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(484, 17);
this.label13.Location = new System.Drawing.Point(484, 13);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 11;
@@ -608,7 +681,7 @@
//
// tb_user2
//
this.tb_user2.Location = new System.Drawing.Point(527, 13);
this.tb_user2.Location = new System.Drawing.Point(527, 9);
this.tb_user2.Name = "tb_user2";
this.tb_user2.Size = new System.Drawing.Size(98, 21);
this.tb_user2.TabIndex = 12;
@@ -699,79 +772,6 @@
this.label14.TabIndex = 22;
this.label14.Text = "작업\n대상";
//
// Column11
//
this.Column11.HeaderText = "목록일자";
this.Column11.Name = "Column11";
this.Column11.Width = 80;
//
// Column12
//
this.Column12.HeaderText = "거래처명";
this.Column12.Name = "Column12";
this.Column12.Width = 180;
//
// Column13
//
this.Column13.HeaderText = "납품목록";
this.Column13.Name = "Column13";
this.Column13.Width = 180;
//
// Column14
//
this.Column14.HeaderText = "담당자";
this.Column14.Name = "Column14";
//
// Column15
//
this.Column15.HeaderText = "목록번호";
this.Column15.Name = "Column15";
this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
// Column16
//
this.Column16.HeaderText = "수량";
this.Column16.Name = "Column16";
this.Column16.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column16.Width = 50;
//
// Column17
//
dataGridViewCellStyle6.Format = "N0";
dataGridViewCellStyle6.NullValue = null;
this.Column17.DefaultCellStyle = dataGridViewCellStyle6;
this.Column17.HeaderText = "합계";
this.Column17.Name = "Column17";
//
// Column18
//
this.Column18.HeaderText = "상태";
this.Column18.Name = "Column18";
this.Column18.Width = 50;
//
// Column20
//
this.Column20.HeaderText = "ISBN조회";
this.Column20.Name = "Column20";
this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column20.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;
//
// Del_Check
//
this.Del_Check.HeaderText = "체크";
this.Del_Check.Name = "Del_Check";
this.Del_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Del_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Del_Check.Width = 40;
//
// Commodity_registration
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);