=====* unimarc *=====

------------------------

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

------------------------

===== 작업중 =====
주문관리 폼 재 수정작업중 - 팩스 및 이메일 기록 폼 제작해야함.
ㄴ> 작업 완료후 검토하고, 회계로 넘어갈 것.

===== 보류 =====
 b. 마크목록 폼 작성중
  1. 엑셀반출 기능 추가중 사용 작업대기중

 c. 마크 반입 폼 수정중
  1. 불러오기는 되나 저장 기능이 필요함.

===== 완료 =====
1. 주문관리 팩스연동 완료
2. 전송된 팩스 확인 작업개시, 이메일 전송모듈 수정완료.
3. 주문관리에서 주문처와 목록 검색하는 폼 검색 모듈도 재수정 완료함.
4. 데이터베이스 내 이미지URL을 가져오는작업 완료
목록집계 폼 재 수정작업 완료 - 확인 및 수정 필요.

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

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

주문관리 작업중 (DataGridView 주문처 엔터키 입력시 검색되게끔 하는 코드작성중) - 21.04.27 완료

unimarc/WindowsFormsApp1/Login.Designer.cs

@@ -43,6 +43,7 @@
             this.ID_text.Name = "ID_text";
             this.ID_text.Size = new System.Drawing.Size(100, 21);
             this.ID_text.TabIndex = 1;
+            this.ID_text.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ID_text_KeyDown);
             // 
             // PW_text
             // 

unimarc/WindowsFormsApp1/Login.cs

@@ -66,5 +66,12 @@ namespace WindowsFormsApp1
             PW_text.Text = "admin";
             button1_Click(null, null);
         }
+        private void ID_text_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                PW_text.Focus();
+            }
+        }
     }
 }

unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.Designer.cs

@@ -46,11 +46,6 @@
             this.tb_count = new System.Windows.Forms.TextBox();
             this.btn_Lookup = new System.Windows.Forms.Button();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.btn_Save = new System.Windows.Forms.Button();
-            this.btn_Close = new System.Windows.Forms.Button();
-            this.btn_Add = new System.Windows.Forms.Button();
-            this.btn_Edit = new System.Windows.Forms.Button();
-            this.btn_list_in_stock = new System.Windows.Forms.Button();
             this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.author = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -59,6 +54,11 @@
             this.count = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.order = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Order_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.btn_Save = new System.Windows.Forms.Button();
+            this.btn_Close = new System.Windows.Forms.Button();
+            this.btn_Add = new System.Windows.Forms.Button();
+            this.btn_Edit = new System.Windows.Forms.Button();
+            this.btn_list_in_stock = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -159,6 +159,8 @@
             this.tb_pay.Name = "tb_pay";
             this.tb_pay.Size = new System.Drawing.Size(201, 21);
             this.tb_pay.TabIndex = 4;
+            this.tb_pay.TextChanged += new System.EventHandler(this.tb_pay_TextChanged);
+            this.tb_pay.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_pay_KeyPress);
             // 
             // tb_order
             // 
@@ -221,6 +223,56 @@
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
             this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
             // 
+            // ISBN
+            // 
+            this.ISBN.HeaderText = "ISBN";
+            this.ISBN.Name = "ISBN";
+            this.ISBN.ReadOnly = true;
+            // 
+            // book_name
+            // 
+            this.book_name.HeaderText = "도서명";
+            this.book_name.Name = "book_name";
+            this.book_name.ReadOnly = true;
+            this.book_name.Width = 250;
+            // 
+            // author
+            // 
+            this.author.HeaderText = "저자";
+            this.author.Name = "author";
+            this.author.ReadOnly = true;
+            // 
+            // book_comp
+            // 
+            this.book_comp.HeaderText = "출판사";
+            this.book_comp.Name = "book_comp";
+            this.book_comp.ReadOnly = true;
+            // 
+            // pay
+            // 
+            this.pay.HeaderText = "정가";
+            this.pay.Name = "pay";
+            this.pay.ReadOnly = true;
+            // 
+            // count
+            // 
+            this.count.HeaderText = "수량";
+            this.count.Name = "count";
+            this.count.ReadOnly = true;
+            this.count.Width = 60;
+            // 
+            // order
+            // 
+            this.order.HeaderText = "매입처명";
+            this.order.Name = "order";
+            this.order.ReadOnly = true;
+            // 
+            // Order_date
+            // 
+            this.Order_date.HeaderText = "주문일자";
+            this.Order_date.Name = "Order_date";
+            this.Order_date.ReadOnly = true;
+            // 
             // btn_Save
             // 
             this.btn_Save.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
@@ -276,61 +328,11 @@
             this.btn_list_in_stock.UseVisualStyleBackColor = true;
             this.btn_list_in_stock.Click += new System.EventHandler(this.btn_list_in_stock_Click);
             // 
-            // ISBN
-            // 
-            this.ISBN.HeaderText = "ISBN";
-            this.ISBN.Name = "ISBN";
-            this.ISBN.ReadOnly = true;
-            // 
-            // book_name
-            // 
-            this.book_name.HeaderText = "도서명";
-            this.book_name.Name = "book_name";
-            this.book_name.ReadOnly = true;
-            this.book_name.Width = 250;
-            // 
-            // author
-            // 
-            this.author.HeaderText = "저자";
-            this.author.Name = "author";
-            this.author.ReadOnly = true;
-            // 
-            // book_comp
-            // 
-            this.book_comp.HeaderText = "출판사";
-            this.book_comp.Name = "book_comp";
-            this.book_comp.ReadOnly = true;
-            // 
-            // pay
-            // 
-            this.pay.HeaderText = "정가";
-            this.pay.Name = "pay";
-            this.pay.ReadOnly = true;
-            // 
-            // count
-            // 
-            this.count.HeaderText = "수량";
-            this.count.Name = "count";
-            this.count.ReadOnly = true;
-            this.count.Width = 60;
-            // 
-            // order
-            // 
-            this.order.HeaderText = "매입처명";
-            this.order.Name = "order";
-            this.order.ReadOnly = true;
-            // 
-            // Order_date
-            // 
-            this.Order_date.HeaderText = "주문일자";
-            this.Order_date.Name = "Order_date";
-            this.Order_date.ReadOnly = true;
-            // 
             // Input_Lookup_Stock
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1040, 433);
+            this.ClientSize = new System.Drawing.Size(979, 433);
             this.Controls.Add(this.btn_list_in_stock);
             this.Controls.Add(this.btn_Edit);
             this.Controls.Add(this.dataGridView1);

unimarc/WindowsFormsApp1/납품관리/Input_Lookup_Stock.cs

@@ -216,7 +216,16 @@ namespace WindowsFormsApp1.Delivery
         {
             if (e.KeyCode == Keys.Up) { rowidx--; }
             if (e.KeyCode == Keys.Down) { rowidx++; }
-
+        }
+        private void tb_pay_TextChanged(object sender, EventArgs e)
+        {
+            String_Text st = new String_Text();
+            st.Int_Comma(sender, e);
+        }
+        private void tb_pay_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            String_Text st = new String_Text();
+            st.Only_Int(sender, e);
         }
     }
 }

unimarc/WindowsFormsApp1/납품관리/Order_input.Designer.cs

@@ -28,9 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.tb_search_order = new System.Windows.Forms.TextBox();
             this.cb_user = new System.Windows.Forms.ComboBox();
@@ -417,14 +417,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.chk,
             this.order,
@@ -442,24 +442,24 @@
             this.order_date,
             this.send_date,
             this.num});
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle11;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridView1.Location = new System.Drawing.Point(9, 142);
             this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridView1.RowHeadersWidth = 10;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
@@ -597,7 +597,7 @@
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(184, 9);
+            this.label13.Location = new System.Drawing.Point(185, 9);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(41, 12);
             this.label13.TabIndex = 0;

unimarc/WindowsFormsApp1/납품관리/Order_input.cs

@@ -64,7 +64,7 @@ namespace WindowsFormsApp1.Delivery
             // 보기 구분
             string[] order = { "주문중", "미주문", "전체" };
             cb_order.Items.AddRange(order);
-            cb_order.SelectedIndex = 0;
+            cb_order.SelectedIndex = 1;
 
             // 주문서 구분
             string[] order_send = { "팩스", "메일" };
@@ -149,6 +149,8 @@ namespace WindowsFormsApp1.Delivery
                     }
                 }
             }
+            // 색입히는 함수 기입
+            PrintColor_Grid();
         }
         /// <summary>
         /// 작업명단 검색중 상위 텍스트박스 및 콤보박스의 값에 따라 출력할지 안할지 분류.
@@ -175,13 +177,27 @@ namespace WindowsFormsApp1.Delivery
             if (cb_state.SelectedIndex == 0) {
                 // TODO: 입고 상태 체크해야함. (방법 찾아볼것)
             }
-            if (cb_order.SelectedIndex == 2) {
+            if (cb_order.SelectedIndex == 0) {
-                if(strValues[12] == "") {
+                if(strValues[13] == "") {
+                    return false;
+                }
+            }
+            else if(cb_order.SelectedIndex == 1) {
+                if (strValues[13] != "") {
                     return false;
                 }
             }
             return true;
         }
+        private void PrintColor_Grid()
+        {
+            for (int a = 0; a < dataGridView1.Rows.Count; a++)
+            {
+                if (dataGridView1.Rows[a].Cells["order_date"].Value.ToString() != "") {
+                    dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.FromArgb(223, 223, 240);
+                }
+            }
+        }
         private void tb_search_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter) {

unimarc/WindowsFormsApp1/회계/Purchase_Book.cs

@@ -83,9 +83,9 @@ namespace WindowsFormsApp1.Account
 
             if (DateTime.Parse(str_start) <= DateTime.Parse(grid[0]) &&
                 DateTime.Parse(str_end) >= DateTime.Parse(grid[0])) {
-                string[] account = {"이월미수금", "", "", "", "",
+                string[] account = { "이월미수금", "", "", "", "",
-                                    "", grid[6], ""};
+                                     "", grid[6], "" };
-                if (dataGridView1.Rows.Count==0) {
+                if (dataGridView1.Rows.Count == 0) {
                     account[6] = String.Format("{0:#,###}", Convert.ToInt32(account[6]));
                     dataGridView1.Rows.Add(account);
                     chk_ac = true;