瀏覽代碼

SN 있을 때 메세지 표시 / Gps Test Save 시 Msg 표시 /최초 프로그램 실행시 Folder 선택창 표시

Serial Write 하도록 수정
YJ 5 年之前
父節點
當前提交
4b4d2ca3ec
共有 8 個文件被更改,包括 399 次插入309 次删除
  1. 302 286
      Main.Designer.cs
  2. 65 3
      Main.cs
  3. 32 20
      Main.resx
  4. 二進制
      bin/Debug/APL_TestCheck.exe
  5. 二進制
      bin/Debug/APL_TestCheck.pdb
  6. 二進制
      obj/Debug/APL_TestCheck.csproj.GenerateResource.cache
  7. 二進制
      obj/Debug/APL_TestCheck.exe
  8. 二進制
      obj/Debug/APL_TestCheck.pdb

+ 302 - 286
Main.Designer.cs

@@ -60,32 +60,24 @@
60 60
             this.panel_GpsMode = new System.Windows.Forms.Panel();
61 61
             this.label_GPSTest = new System.Windows.Forms.Label();
62 62
             this.panel_SnCheckMain = new System.Windows.Forms.Panel();
63
+            this.button_DiffClear = new System.Windows.Forms.Button();
64
+            this.button_DuplicateClear = new System.Windows.Forms.Button();
65
+            this.button_SNClear = new System.Windows.Forms.Button();
66
+            this.button_ChkStart = new System.Windows.Forms.Button();
67
+            this.label_Diff = new System.Windows.Forms.Label();
68
+            this.label8 = new System.Windows.Forms.Label();
69
+            this.label_Duplicate = new System.Windows.Forms.Label();
70
+            this.listBox_Diff = new System.Windows.Forms.ListBox();
71
+            this.listBox_ProductDuplicate = new System.Windows.Forms.ListBox();
72
+            this.listBox_SNDuplicate = new System.Windows.Forms.ListBox();
63 73
             this.dataGridView_Chk = new System.Windows.Forms.DataGridView();
64 74
             this.button_FileFindLoad = new System.Windows.Forms.Button();
65 75
             this.progressBar2 = new System.Windows.Forms.ProgressBar();
66
-            this.panel_MergeMain = new System.Windows.Forms.Panel();
67
-            this.label7 = new System.Windows.Forms.Label();
68
-            this.label_Cnt = new System.Windows.Forms.Label();
69
-            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
70
-            this.button_Merge = new System.Windows.Forms.Button();
71
-            this.button_PrevFile = new System.Windows.Forms.Button();
72
-            this.button_AfterFile = new System.Windows.Forms.Button();
73
-            this.listBox_AfterFile = new System.Windows.Forms.ListBox();
74
-            this.listBox_PreviousFile = new System.Windows.Forms.ListBox();
75
-            this.progressBar_Merge = new System.Windows.Forms.ProgressBar();
76
-            this.panel_Catm1Test = new System.Windows.Forms.Panel();
77
-            this.richTextBox_catm1 = new System.Windows.Forms.RichTextBox();
78
-            this.dataGridView_Catm1 = new System.Windows.Forms.DataGridView();
79
-            this.Catm1_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
80
-            this.Modem_Ver = new System.Windows.Forms.DataGridViewTextBoxColumn();
81
-            this.RSRP = new System.Windows.Forms.DataGridViewTextBoxColumn();
82 76
             this.panel_GpsTest = new System.Windows.Forms.Panel();
83 77
             this.button_GpsTestSave = new System.Windows.Forms.Button();
84 78
             this.richTextBox_Gps = new System.Windows.Forms.RichTextBox();
85 79
             this.checkBox_GPGSV = new System.Windows.Forms.CheckBox();
86 80
             this.dataGridView_Gps = new System.Windows.Forms.DataGridView();
87
-            this.Gps_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
88
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
89 81
             this.panel_SensorTest = new System.Windows.Forms.Panel();
90 82
             this.pictureBox_Check2 = new System.Windows.Forms.PictureBox();
91 83
             this.pictureBox_Check3 = new System.Windows.Forms.PictureBox();
@@ -113,18 +105,28 @@
113 105
             this.BMA_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
114 106
             this.BMA_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
115 107
             this.BMA_Z = new System.Windows.Forms.DataGridViewTextBoxColumn();
108
+            this.panel_MergeMain = new System.Windows.Forms.Panel();
109
+            this.label7 = new System.Windows.Forms.Label();
110
+            this.label_Cnt = new System.Windows.Forms.Label();
111
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
112
+            this.button_Merge = new System.Windows.Forms.Button();
113
+            this.button_PrevFile = new System.Windows.Forms.Button();
114
+            this.button_AfterFile = new System.Windows.Forms.Button();
115
+            this.listBox_AfterFile = new System.Windows.Forms.ListBox();
116
+            this.listBox_PreviousFile = new System.Windows.Forms.ListBox();
117
+            this.progressBar_Merge = new System.Windows.Forms.ProgressBar();
118
+            this.panel_Catm1Test = new System.Windows.Forms.Panel();
119
+            this.richTextBox_catm1 = new System.Windows.Forms.RichTextBox();
120
+            this.dataGridView_Catm1 = new System.Windows.Forms.DataGridView();
121
+            this.Catm1_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
122
+            this.Modem_Ver = new System.Windows.Forms.DataGridViewTextBoxColumn();
123
+            this.RSRP = new System.Windows.Forms.DataGridViewTextBoxColumn();
116 124
             this.folderBrowserDialog_Mainpath = new System.Windows.Forms.FolderBrowserDialog();
117 125
             this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
118
-            this.listBox_SNDuplicate = new System.Windows.Forms.ListBox();
119
-            this.label_Duplicate = new System.Windows.Forms.Label();
120
-            this.listBox_Diff = new System.Windows.Forms.ListBox();
121
-            this.label_Diff = new System.Windows.Forms.Label();
122
-            this.button_ChkStart = new System.Windows.Forms.Button();
123
-            this.listBox_ProductDuplicate = new System.Windows.Forms.ListBox();
124
-            this.label8 = new System.Windows.Forms.Label();
125
-            this.button_SNClear = new System.Windows.Forms.Button();
126
-            this.button_DuplicateClear = new System.Windows.Forms.Button();
127
-            this.button_DiffClear = new System.Windows.Forms.Button();
126
+            this.Gps_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
127
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
128
+            this.LitmitMinimum = new System.Windows.Forms.DataGridViewTextBoxColumn();
129
+            this.LitmitMaximum = new System.Windows.Forms.DataGridViewTextBoxColumn();
128 130
             this.panel_Main.SuspendLayout();
129 131
             this.panel4.SuspendLayout();
130 132
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
@@ -139,10 +141,6 @@
139 141
             this.panel_GpsMode.SuspendLayout();
140 142
             this.panel_SnCheckMain.SuspendLayout();
141 143
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Chk)).BeginInit();
142
-            this.panel_MergeMain.SuspendLayout();
143
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
144
-            this.panel_Catm1Test.SuspendLayout();
145
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).BeginInit();
146 144
             this.panel_GpsTest.SuspendLayout();
147 145
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Gps)).BeginInit();
148 146
             this.panel_SensorTest.SuspendLayout();
@@ -155,6 +153,10 @@
155 153
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck4)).BeginInit();
156 154
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck1)).BeginInit();
157 155
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Sensor)).BeginInit();
156
+            this.panel_MergeMain.SuspendLayout();
157
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
158
+            this.panel_Catm1Test.SuspendLayout();
159
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).BeginInit();
158 160
             this.SuspendLayout();
159 161
             // 
160 162
             // serialPort
@@ -171,11 +173,11 @@
171 173
             this.panel_Main.Controls.Add(this.panel4);
172 174
             this.panel_Main.Controls.Add(this.label6);
173 175
             this.panel_Main.Controls.Add(this.panel1);
174
-            this.panel_Main.Controls.Add(this.panel_SnCheckMain);
175
-            this.panel_Main.Controls.Add(this.panel_GpsTest);
176 176
             this.panel_Main.Controls.Add(this.panel_SensorTest);
177 177
             this.panel_Main.Controls.Add(this.panel_MergeMain);
178 178
             this.panel_Main.Controls.Add(this.panel_Catm1Test);
179
+            this.panel_Main.Controls.Add(this.panel_SnCheckMain);
180
+            this.panel_Main.Controls.Add(this.panel_GpsTest);
179 181
             this.panel_Main.Location = new System.Drawing.Point(0, 0);
180 182
             this.panel_Main.Name = "panel_Main";
181 183
             this.panel_Main.Size = new System.Drawing.Size(1356, 710);
@@ -537,185 +539,131 @@
537 539
             this.panel_SnCheckMain.Size = new System.Drawing.Size(1202, 599);
538 540
             this.panel_SnCheckMain.TabIndex = 90;
539 541
             // 
540
-            // dataGridView_Chk
541
-            // 
542
-            this.dataGridView_Chk.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
543
-            this.dataGridView_Chk.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
544
-            this.dataGridView_Chk.Location = new System.Drawing.Point(102, 65);
545
-            this.dataGridView_Chk.Name = "dataGridView_Chk";
546
-            this.dataGridView_Chk.RowTemplate.Height = 23;
547
-            this.dataGridView_Chk.Size = new System.Drawing.Size(372, 524);
548
-            this.dataGridView_Chk.TabIndex = 4;
549
-            // 
550
-            // button_FileFindLoad
551
-            // 
552
-            this.button_FileFindLoad.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
553
-            this.button_FileFindLoad.Location = new System.Drawing.Point(21, 65);
554
-            this.button_FileFindLoad.Name = "button_FileFindLoad";
555
-            this.button_FileFindLoad.Size = new System.Drawing.Size(75, 519);
556
-            this.button_FileFindLoad.TabIndex = 3;
557
-            this.button_FileFindLoad.Text = "Load";
558
-            this.button_FileFindLoad.UseVisualStyleBackColor = false;
559
-            this.button_FileFindLoad.Click += new System.EventHandler(this.button_FileFindLoad_Click);
560
-            // 
561
-            // progressBar2
562
-            // 
563
-            this.progressBar2.Location = new System.Drawing.Point(21, 21);
564
-            this.progressBar2.Name = "progressBar2";
565
-            this.progressBar2.Size = new System.Drawing.Size(1159, 40);
566
-            this.progressBar2.TabIndex = 0;
567
-            // 
568
-            // panel_MergeMain
569
-            // 
570
-            this.panel_MergeMain.Controls.Add(this.label7);
571
-            this.panel_MergeMain.Controls.Add(this.label_Cnt);
572
-            this.panel_MergeMain.Controls.Add(this.numericUpDown1);
573
-            this.panel_MergeMain.Controls.Add(this.button_Merge);
574
-            this.panel_MergeMain.Controls.Add(this.button_PrevFile);
575
-            this.panel_MergeMain.Controls.Add(this.button_AfterFile);
576
-            this.panel_MergeMain.Controls.Add(this.listBox_AfterFile);
577
-            this.panel_MergeMain.Controls.Add(this.listBox_PreviousFile);
578
-            this.panel_MergeMain.Controls.Add(this.progressBar_Merge);
579
-            this.panel_MergeMain.Location = new System.Drawing.Point(160, 44);
580
-            this.panel_MergeMain.Name = "panel_MergeMain";
581
-            this.panel_MergeMain.Size = new System.Drawing.Size(1202, 599);
582
-            this.panel_MergeMain.TabIndex = 88;
583
-            // 
584
-            // label7
585
-            // 
586
-            this.label7.AutoSize = true;
587
-            this.label7.Location = new System.Drawing.Point(119, 31);
588
-            this.label7.Name = "label7";
589
-            this.label7.Size = new System.Drawing.Size(29, 12);
590
-            this.label7.TabIndex = 7;
591
-            this.label7.Text = "Line";
592
-            // 
593
-            // label_Cnt
594
-            // 
595
-            this.label_Cnt.AutoSize = true;
596
-            this.label_Cnt.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold);
597
-            this.label_Cnt.Location = new System.Drawing.Point(357, 25);
598
-            this.label_Cnt.Name = "label_Cnt";
599
-            this.label_Cnt.Size = new System.Drawing.Size(94, 19);
600
-            this.label_Cnt.TabIndex = 6;
601
-            this.label_Cnt.Text = "Count : 0";
602
-            // 
603
-            // numericUpDown1
542
+            // button_DiffClear
604 543
             // 
605
-            this.numericUpDown1.Location = new System.Drawing.Point(160, 26);
606
-            this.numericUpDown1.Name = "numericUpDown1";
607
-            this.numericUpDown1.Size = new System.Drawing.Size(102, 21);
608
-            this.numericUpDown1.TabIndex = 5;
544
+            this.button_DiffClear.Location = new System.Drawing.Point(826, 549);
545
+            this.button_DiffClear.Name = "button_DiffClear";
546
+            this.button_DiffClear.Size = new System.Drawing.Size(167, 40);
547
+            this.button_DiffClear.TabIndex = 8;
548
+            this.button_DiffClear.Text = "Clear";
549
+            this.button_DiffClear.UseVisualStyleBackColor = true;
550
+            this.button_DiffClear.Click += new System.EventHandler(this.button_DiffClear_Click);
609 551
             // 
610
-            // button_Merge
552
+            // button_DuplicateClear
611 553
             // 
612
-            this.button_Merge.AccessibleRole = System.Windows.Forms.AccessibleRole.None;
613
-            this.button_Merge.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
614
-            this.button_Merge.Location = new System.Drawing.Point(23, 21);
615
-            this.button_Merge.Name = "button_Merge";
616
-            this.button_Merge.Size = new System.Drawing.Size(75, 38);
617
-            this.button_Merge.TabIndex = 4;
618
-            this.button_Merge.Text = "Merge";
619
-            this.button_Merge.UseVisualStyleBackColor = false;
620
-            this.button_Merge.Click += new System.EventHandler(this.button_Merge_Click);
554
+            this.button_DuplicateClear.Location = new System.Drawing.Point(653, 549);
555
+            this.button_DuplicateClear.Name = "button_DuplicateClear";
556
+            this.button_DuplicateClear.Size = new System.Drawing.Size(167, 40);
557
+            this.button_DuplicateClear.TabIndex = 8;
558
+            this.button_DuplicateClear.Text = "Clear";
559
+            this.button_DuplicateClear.UseVisualStyleBackColor = true;
560
+            this.button_DuplicateClear.Click += new System.EventHandler(this.button_DuplicateClear_Click);
621 561
             // 
622
-            // button_PrevFile
562
+            // button_SNClear
623 563
             // 
624
-            this.button_PrevFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
625
-            this.button_PrevFile.Location = new System.Drawing.Point(21, 65);
626
-            this.button_PrevFile.Name = "button_PrevFile";
627
-            this.button_PrevFile.Size = new System.Drawing.Size(75, 522);
628
-            this.button_PrevFile.TabIndex = 3;
629
-            this.button_PrevFile.Text = "PrevFind";
630
-            this.button_PrevFile.UseVisualStyleBackColor = false;
631
-            this.button_PrevFile.Click += new System.EventHandler(this.button_PrevFile_Click);
564
+            this.button_SNClear.Location = new System.Drawing.Point(481, 549);
565
+            this.button_SNClear.Name = "button_SNClear";
566
+            this.button_SNClear.Size = new System.Drawing.Size(167, 40);
567
+            this.button_SNClear.TabIndex = 8;
568
+            this.button_SNClear.Text = "Clear";
569
+            this.button_SNClear.UseVisualStyleBackColor = true;
570
+            this.button_SNClear.Click += new System.EventHandler(this.button_SNClear_Click);
632 571
             // 
633
-            // button_AfterFile
572
+            // button_ChkStart
634 573
             // 
635
-            this.button_AfterFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
636
-            this.button_AfterFile.Location = new System.Drawing.Point(621, 63);
637
-            this.button_AfterFile.Name = "button_AfterFile";
638
-            this.button_AfterFile.Size = new System.Drawing.Size(75, 524);
639
-            this.button_AfterFile.TabIndex = 3;
640
-            this.button_AfterFile.Text = "AfterFile";
641
-            this.button_AfterFile.UseVisualStyleBackColor = false;
642
-            this.button_AfterFile.Click += new System.EventHandler(this.button_AfterFile_Click);
574
+            this.button_ChkStart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
575
+            this.button_ChkStart.Location = new System.Drawing.Point(1007, 68);
576
+            this.button_ChkStart.Name = "button_ChkStart";
577
+            this.button_ChkStart.Size = new System.Drawing.Size(75, 519);
578
+            this.button_ChkStart.TabIndex = 7;
579
+            this.button_ChkStart.Text = "Start";
580
+            this.button_ChkStart.UseVisualStyleBackColor = false;
581
+            this.button_ChkStart.Click += new System.EventHandler(this.button_ChkStart_Click);
643 582
             // 
644
-            // listBox_AfterFile
583
+            // label_Diff
645 584
             // 
646
-            this.listBox_AfterFile.FormattingEnabled = true;
647
-            this.listBox_AfterFile.ItemHeight = 12;
648
-            this.listBox_AfterFile.Location = new System.Drawing.Point(702, 67);
649
-            this.listBox_AfterFile.Name = "listBox_AfterFile";
650
-            this.listBox_AfterFile.Size = new System.Drawing.Size(486, 520);
651
-            this.listBox_AfterFile.TabIndex = 2;
585
+            this.label_Diff.AutoSize = true;
586
+            this.label_Diff.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
587
+            this.label_Diff.Location = new System.Drawing.Point(843, 78);
588
+            this.label_Diff.Name = "label_Diff";
589
+            this.label_Diff.Size = new System.Drawing.Size(143, 19);
590
+            this.label_Diff.TabIndex = 6;
591
+            this.label_Diff.Text = "짝이 틀린 항목";
652 592
             // 
653
-            // listBox_PreviousFile
593
+            // label8
654 594
             // 
655
-            this.listBox_PreviousFile.FormattingEnabled = true;
656
-            this.listBox_PreviousFile.ItemHeight = 12;
657
-            this.listBox_PreviousFile.Location = new System.Drawing.Point(104, 67);
658
-            this.listBox_PreviousFile.Name = "listBox_PreviousFile";
659
-            this.listBox_PreviousFile.Size = new System.Drawing.Size(511, 520);
660
-            this.listBox_PreviousFile.TabIndex = 2;
595
+            this.label8.AutoSize = true;
596
+            this.label8.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
597
+            this.label8.Location = new System.Drawing.Point(649, 76);
598
+            this.label8.Name = "label8";
599
+            this.label8.Size = new System.Drawing.Size(190, 19);
600
+            this.label8.TabIndex = 6;
601
+            this.label8.Text = "생산 번호 중복 항목";
661 602
             // 
662
-            // progressBar_Merge
603
+            // label_Duplicate
663 604
             // 
664
-            this.progressBar_Merge.Location = new System.Drawing.Point(621, 21);
665
-            this.progressBar_Merge.Name = "progressBar_Merge";
666
-            this.progressBar_Merge.Size = new System.Drawing.Size(567, 40);
667
-            this.progressBar_Merge.TabIndex = 0;
605
+            this.label_Duplicate.AutoSize = true;
606
+            this.label_Duplicate.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
607
+            this.label_Duplicate.Location = new System.Drawing.Point(499, 78);
608
+            this.label_Duplicate.Name = "label_Duplicate";
609
+            this.label_Duplicate.Size = new System.Drawing.Size(137, 19);
610
+            this.label_Duplicate.TabIndex = 6;
611
+            this.label_Duplicate.Text = "S/N 중복 항목";
668 612
             // 
669
-            // panel_Catm1Test
613
+            // listBox_Diff
670 614
             // 
671
-            this.panel_Catm1Test.Controls.Add(this.richTextBox_catm1);
672
-            this.panel_Catm1Test.Controls.Add(this.dataGridView_Catm1);
673
-            this.panel_Catm1Test.Location = new System.Drawing.Point(149, 44);
674
-            this.panel_Catm1Test.Name = "panel_Catm1Test";
675
-            this.panel_Catm1Test.Size = new System.Drawing.Size(1202, 599);
676
-            this.panel_Catm1Test.TabIndex = 87;
615
+            this.listBox_Diff.FormattingEnabled = true;
616
+            this.listBox_Diff.ItemHeight = 12;
617
+            this.listBox_Diff.Location = new System.Drawing.Point(828, 110);
618
+            this.listBox_Diff.Name = "listBox_Diff";
619
+            this.listBox_Diff.Size = new System.Drawing.Size(168, 436);
620
+            this.listBox_Diff.TabIndex = 5;
677 621
             // 
678
-            // richTextBox_catm1
622
+            // listBox_ProductDuplicate
679 623
             // 
680
-            this.richTextBox_catm1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
681
-            this.richTextBox_catm1.Font = new System.Drawing.Font("나눔고딕", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
682
-            this.richTextBox_catm1.ForeColor = System.Drawing.Color.Yellow;
683
-            this.richTextBox_catm1.Location = new System.Drawing.Point(17, 65);
684
-            this.richTextBox_catm1.Name = "richTextBox_catm1";
685
-            this.richTextBox_catm1.Size = new System.Drawing.Size(1176, 502);
686
-            this.richTextBox_catm1.TabIndex = 26;
687
-            this.richTextBox_catm1.Text = "";
624
+            this.listBox_ProductDuplicate.FormattingEnabled = true;
625
+            this.listBox_ProductDuplicate.ItemHeight = 12;
626
+            this.listBox_ProductDuplicate.Location = new System.Drawing.Point(654, 110);
627
+            this.listBox_ProductDuplicate.Name = "listBox_ProductDuplicate";
628
+            this.listBox_ProductDuplicate.Size = new System.Drawing.Size(168, 436);
629
+            this.listBox_ProductDuplicate.TabIndex = 5;
688 630
             // 
689
-            // dataGridView_Catm1
631
+            // listBox_SNDuplicate
690 632
             // 
691
-            this.dataGridView_Catm1.AllowUserToAddRows = false;
692
-            this.dataGridView_Catm1.BackgroundColor = System.Drawing.Color.Gray;
693
-            this.dataGridView_Catm1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
694
-            this.dataGridView_Catm1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
695
-            this.Catm1_SerialNumber,
696
-            this.Modem_Ver,
697
-            this.RSRP});
698
-            this.dataGridView_Catm1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
699
-            this.dataGridView_Catm1.Location = new System.Drawing.Point(17, 3);
700
-            this.dataGridView_Catm1.Name = "dataGridView_Catm1";
701
-            this.dataGridView_Catm1.RowTemplate.Height = 23;
702
-            this.dataGridView_Catm1.Size = new System.Drawing.Size(1176, 56);
703
-            this.dataGridView_Catm1.TabIndex = 15;
633
+            this.listBox_SNDuplicate.FormattingEnabled = true;
634
+            this.listBox_SNDuplicate.ItemHeight = 12;
635
+            this.listBox_SNDuplicate.Location = new System.Drawing.Point(480, 110);
636
+            this.listBox_SNDuplicate.Name = "listBox_SNDuplicate";
637
+            this.listBox_SNDuplicate.Size = new System.Drawing.Size(168, 436);
638
+            this.listBox_SNDuplicate.TabIndex = 5;
704 639
             // 
705
-            // Catm1_SerialNumber
640
+            // dataGridView_Chk
706 641
             // 
707
-            this.Catm1_SerialNumber.HeaderText = "생산번호";
708
-            this.Catm1_SerialNumber.Name = "Catm1_SerialNumber";
642
+            this.dataGridView_Chk.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
643
+            this.dataGridView_Chk.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
644
+            this.dataGridView_Chk.Location = new System.Drawing.Point(102, 65);
645
+            this.dataGridView_Chk.Name = "dataGridView_Chk";
646
+            this.dataGridView_Chk.RowTemplate.Height = 23;
647
+            this.dataGridView_Chk.Size = new System.Drawing.Size(372, 524);
648
+            this.dataGridView_Chk.TabIndex = 4;
709 649
             // 
710
-            // Modem_Ver
650
+            // button_FileFindLoad
711 651
             // 
712
-            this.Modem_Ver.HeaderText = "Modem Ver";
713
-            this.Modem_Ver.Name = "Modem_Ver";
652
+            this.button_FileFindLoad.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
653
+            this.button_FileFindLoad.Location = new System.Drawing.Point(21, 65);
654
+            this.button_FileFindLoad.Name = "button_FileFindLoad";
655
+            this.button_FileFindLoad.Size = new System.Drawing.Size(75, 519);
656
+            this.button_FileFindLoad.TabIndex = 3;
657
+            this.button_FileFindLoad.Text = "Load";
658
+            this.button_FileFindLoad.UseVisualStyleBackColor = false;
659
+            this.button_FileFindLoad.Click += new System.EventHandler(this.button_FileFindLoad_Click);
714 660
             // 
715
-            // RSRP
661
+            // progressBar2
716 662
             // 
717
-            this.RSRP.HeaderText = "RSRP";
718
-            this.RSRP.Name = "RSRP";
663
+            this.progressBar2.Location = new System.Drawing.Point(21, 21);
664
+            this.progressBar2.Name = "progressBar2";
665
+            this.progressBar2.Size = new System.Drawing.Size(1159, 40);
666
+            this.progressBar2.TabIndex = 0;
719 667
             // 
720 668
             // panel_GpsTest
721 669
             // 
@@ -768,7 +716,9 @@
768 716
             this.dataGridView_Gps.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
769 717
             this.dataGridView_Gps.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
770 718
             this.Gps_SerialNumber,
771
-            this.dataGridViewTextBoxColumn8});
719
+            this.dataGridViewTextBoxColumn8,
720
+            this.LitmitMinimum,
721
+            this.LitmitMaximum});
772 722
             this.dataGridView_Gps.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
773 723
             this.dataGridView_Gps.Location = new System.Drawing.Point(26, 3);
774 724
             this.dataGridView_Gps.Name = "dataGridView_Gps";
@@ -777,16 +727,6 @@
777 727
             this.dataGridView_Gps.TabIndex = 15;
778 728
             this.dataGridView_Gps.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView_Gps_KeyDown);
779 729
             // 
780
-            // Gps_SerialNumber
781
-            // 
782
-            this.Gps_SerialNumber.HeaderText = "생산번호";
783
-            this.Gps_SerialNumber.Name = "Gps_SerialNumber";
784
-            // 
785
-            // dataGridViewTextBoxColumn8
786
-            // 
787
-            this.dataGridViewTextBoxColumn8.HeaderText = "GPS SNR";
788
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
789
-            // 
790 730
             // panel_SensorTest
791 731
             // 
792 732
             this.panel_SensorTest.Controls.Add(this.pictureBox_Check2);
@@ -1040,107 +980,181 @@
1040 980
             this.BMA_Z.HeaderText = "가속도 Z";
1041 981
             this.BMA_Z.Name = "BMA_Z";
1042 982
             // 
1043
-            // openFileDialog
983
+            // panel_MergeMain
1044 984
             // 
1045
-            this.openFileDialog.Multiselect = true;
985
+            this.panel_MergeMain.Controls.Add(this.label7);
986
+            this.panel_MergeMain.Controls.Add(this.label_Cnt);
987
+            this.panel_MergeMain.Controls.Add(this.numericUpDown1);
988
+            this.panel_MergeMain.Controls.Add(this.button_Merge);
989
+            this.panel_MergeMain.Controls.Add(this.button_PrevFile);
990
+            this.panel_MergeMain.Controls.Add(this.button_AfterFile);
991
+            this.panel_MergeMain.Controls.Add(this.listBox_AfterFile);
992
+            this.panel_MergeMain.Controls.Add(this.listBox_PreviousFile);
993
+            this.panel_MergeMain.Controls.Add(this.progressBar_Merge);
994
+            this.panel_MergeMain.Location = new System.Drawing.Point(160, 44);
995
+            this.panel_MergeMain.Name = "panel_MergeMain";
996
+            this.panel_MergeMain.Size = new System.Drawing.Size(1202, 599);
997
+            this.panel_MergeMain.TabIndex = 88;
1046 998
             // 
1047
-            // listBox_SNDuplicate
999
+            // label7
1048 1000
             // 
1049
-            this.listBox_SNDuplicate.FormattingEnabled = true;
1050
-            this.listBox_SNDuplicate.ItemHeight = 12;
1051
-            this.listBox_SNDuplicate.Location = new System.Drawing.Point(480, 110);
1052
-            this.listBox_SNDuplicate.Name = "listBox_SNDuplicate";
1053
-            this.listBox_SNDuplicate.Size = new System.Drawing.Size(168, 436);
1054
-            this.listBox_SNDuplicate.TabIndex = 5;
1001
+            this.label7.AutoSize = true;
1002
+            this.label7.Location = new System.Drawing.Point(119, 31);
1003
+            this.label7.Name = "label7";
1004
+            this.label7.Size = new System.Drawing.Size(29, 12);
1005
+            this.label7.TabIndex = 7;
1006
+            this.label7.Text = "Line";
1055 1007
             // 
1056
-            // label_Duplicate
1008
+            // label_Cnt
1057 1009
             // 
1058
-            this.label_Duplicate.AutoSize = true;
1059
-            this.label_Duplicate.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1060
-            this.label_Duplicate.Location = new System.Drawing.Point(499, 78);
1061
-            this.label_Duplicate.Name = "label_Duplicate";
1062
-            this.label_Duplicate.Size = new System.Drawing.Size(137, 19);
1063
-            this.label_Duplicate.TabIndex = 6;
1064
-            this.label_Duplicate.Text = "S/N 중복 항목";
1010
+            this.label_Cnt.AutoSize = true;
1011
+            this.label_Cnt.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold);
1012
+            this.label_Cnt.Location = new System.Drawing.Point(357, 25);
1013
+            this.label_Cnt.Name = "label_Cnt";
1014
+            this.label_Cnt.Size = new System.Drawing.Size(94, 19);
1015
+            this.label_Cnt.TabIndex = 6;
1016
+            this.label_Cnt.Text = "Count : 0";
1065 1017
             // 
1066
-            // listBox_Diff
1018
+            // numericUpDown1
1067 1019
             // 
1068
-            this.listBox_Diff.FormattingEnabled = true;
1069
-            this.listBox_Diff.ItemHeight = 12;
1070
-            this.listBox_Diff.Location = new System.Drawing.Point(828, 110);
1071
-            this.listBox_Diff.Name = "listBox_Diff";
1072
-            this.listBox_Diff.Size = new System.Drawing.Size(168, 436);
1073
-            this.listBox_Diff.TabIndex = 5;
1020
+            this.numericUpDown1.Location = new System.Drawing.Point(160, 26);
1021
+            this.numericUpDown1.Name = "numericUpDown1";
1022
+            this.numericUpDown1.Size = new System.Drawing.Size(102, 21);
1023
+            this.numericUpDown1.TabIndex = 5;
1074 1024
             // 
1075
-            // label_Diff
1025
+            // button_Merge
1076 1026
             // 
1077
-            this.label_Diff.AutoSize = true;
1078
-            this.label_Diff.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1079
-            this.label_Diff.Location = new System.Drawing.Point(843, 78);
1080
-            this.label_Diff.Name = "label_Diff";
1081
-            this.label_Diff.Size = new System.Drawing.Size(143, 19);
1082
-            this.label_Diff.TabIndex = 6;
1083
-            this.label_Diff.Text = "짝이 틀린 항목";
1027
+            this.button_Merge.AccessibleRole = System.Windows.Forms.AccessibleRole.None;
1028
+            this.button_Merge.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
1029
+            this.button_Merge.Location = new System.Drawing.Point(23, 21);
1030
+            this.button_Merge.Name = "button_Merge";
1031
+            this.button_Merge.Size = new System.Drawing.Size(75, 38);
1032
+            this.button_Merge.TabIndex = 4;
1033
+            this.button_Merge.Text = "Merge";
1034
+            this.button_Merge.UseVisualStyleBackColor = false;
1035
+            this.button_Merge.Click += new System.EventHandler(this.button_Merge_Click);
1084 1036
             // 
1085
-            // button_ChkStart
1037
+            // button_PrevFile
1086 1038
             // 
1087
-            this.button_ChkStart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
1088
-            this.button_ChkStart.Location = new System.Drawing.Point(1007, 68);
1089
-            this.button_ChkStart.Name = "button_ChkStart";
1090
-            this.button_ChkStart.Size = new System.Drawing.Size(75, 519);
1091
-            this.button_ChkStart.TabIndex = 7;
1092
-            this.button_ChkStart.Text = "Start";
1093
-            this.button_ChkStart.UseVisualStyleBackColor = false;
1094
-            this.button_ChkStart.Click += new System.EventHandler(this.button_ChkStart_Click);
1039
+            this.button_PrevFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
1040
+            this.button_PrevFile.Location = new System.Drawing.Point(21, 65);
1041
+            this.button_PrevFile.Name = "button_PrevFile";
1042
+            this.button_PrevFile.Size = new System.Drawing.Size(75, 522);
1043
+            this.button_PrevFile.TabIndex = 3;
1044
+            this.button_PrevFile.Text = "PrevFind";
1045
+            this.button_PrevFile.UseVisualStyleBackColor = false;
1046
+            this.button_PrevFile.Click += new System.EventHandler(this.button_PrevFile_Click);
1095 1047
             // 
1096
-            // listBox_ProductDuplicate
1048
+            // button_AfterFile
1097 1049
             // 
1098
-            this.listBox_ProductDuplicate.FormattingEnabled = true;
1099
-            this.listBox_ProductDuplicate.ItemHeight = 12;
1100
-            this.listBox_ProductDuplicate.Location = new System.Drawing.Point(654, 110);
1101
-            this.listBox_ProductDuplicate.Name = "listBox_ProductDuplicate";
1102
-            this.listBox_ProductDuplicate.Size = new System.Drawing.Size(168, 436);
1103
-            this.listBox_ProductDuplicate.TabIndex = 5;
1050
+            this.button_AfterFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
1051
+            this.button_AfterFile.Location = new System.Drawing.Point(621, 63);
1052
+            this.button_AfterFile.Name = "button_AfterFile";
1053
+            this.button_AfterFile.Size = new System.Drawing.Size(75, 524);
1054
+            this.button_AfterFile.TabIndex = 3;
1055
+            this.button_AfterFile.Text = "AfterFile";
1056
+            this.button_AfterFile.UseVisualStyleBackColor = false;
1057
+            this.button_AfterFile.Click += new System.EventHandler(this.button_AfterFile_Click);
1104 1058
             // 
1105
-            // label8
1059
+            // listBox_AfterFile
1106 1060
             // 
1107
-            this.label8.AutoSize = true;
1108
-            this.label8.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1109
-            this.label8.Location = new System.Drawing.Point(649, 76);
1110
-            this.label8.Name = "label8";
1111
-            this.label8.Size = new System.Drawing.Size(190, 19);
1112
-            this.label8.TabIndex = 6;
1113
-            this.label8.Text = "생산 번호 중복 항목";
1061
+            this.listBox_AfterFile.FormattingEnabled = true;
1062
+            this.listBox_AfterFile.ItemHeight = 12;
1063
+            this.listBox_AfterFile.Location = new System.Drawing.Point(702, 67);
1064
+            this.listBox_AfterFile.Name = "listBox_AfterFile";
1065
+            this.listBox_AfterFile.Size = new System.Drawing.Size(486, 520);
1066
+            this.listBox_AfterFile.TabIndex = 2;
1114 1067
             // 
1115
-            // button_SNClear
1068
+            // listBox_PreviousFile
1116 1069
             // 
1117
-            this.button_SNClear.Location = new System.Drawing.Point(481, 549);
1118
-            this.button_SNClear.Name = "button_SNClear";
1119
-            this.button_SNClear.Size = new System.Drawing.Size(167, 40);
1120
-            this.button_SNClear.TabIndex = 8;
1121
-            this.button_SNClear.Text = "Clear";
1122
-            this.button_SNClear.UseVisualStyleBackColor = true;
1123
-            this.button_SNClear.Click += new System.EventHandler(this.button_SNClear_Click);
1070
+            this.listBox_PreviousFile.FormattingEnabled = true;
1071
+            this.listBox_PreviousFile.ItemHeight = 12;
1072
+            this.listBox_PreviousFile.Location = new System.Drawing.Point(104, 67);
1073
+            this.listBox_PreviousFile.Name = "listBox_PreviousFile";
1074
+            this.listBox_PreviousFile.Size = new System.Drawing.Size(511, 520);
1075
+            this.listBox_PreviousFile.TabIndex = 2;
1124 1076
             // 
1125
-            // button_DuplicateClear
1077
+            // progressBar_Merge
1126 1078
             // 
1127
-            this.button_DuplicateClear.Location = new System.Drawing.Point(653, 549);
1128
-            this.button_DuplicateClear.Name = "button_DuplicateClear";
1129
-            this.button_DuplicateClear.Size = new System.Drawing.Size(167, 40);
1130
-            this.button_DuplicateClear.TabIndex = 8;
1131
-            this.button_DuplicateClear.Text = "Clear";
1132
-            this.button_DuplicateClear.UseVisualStyleBackColor = true;
1133
-            this.button_DuplicateClear.Click += new System.EventHandler(this.button_DuplicateClear_Click);
1079
+            this.progressBar_Merge.Location = new System.Drawing.Point(621, 21);
1080
+            this.progressBar_Merge.Name = "progressBar_Merge";
1081
+            this.progressBar_Merge.Size = new System.Drawing.Size(567, 40);
1082
+            this.progressBar_Merge.TabIndex = 0;
1134 1083
             // 
1135
-            // button_DiffClear
1084
+            // panel_Catm1Test
1136 1085
             // 
1137
-            this.button_DiffClear.Location = new System.Drawing.Point(826, 549);
1138
-            this.button_DiffClear.Name = "button_DiffClear";
1139
-            this.button_DiffClear.Size = new System.Drawing.Size(167, 40);
1140
-            this.button_DiffClear.TabIndex = 8;
1141
-            this.button_DiffClear.Text = "Clear";
1142
-            this.button_DiffClear.UseVisualStyleBackColor = true;
1143
-            this.button_DiffClear.Click += new System.EventHandler(this.button_DiffClear_Click);
1086
+            this.panel_Catm1Test.Controls.Add(this.richTextBox_catm1);
1087
+            this.panel_Catm1Test.Controls.Add(this.dataGridView_Catm1);
1088
+            this.panel_Catm1Test.Location = new System.Drawing.Point(149, 44);
1089
+            this.panel_Catm1Test.Name = "panel_Catm1Test";
1090
+            this.panel_Catm1Test.Size = new System.Drawing.Size(1202, 599);
1091
+            this.panel_Catm1Test.TabIndex = 87;
1092
+            // 
1093
+            // richTextBox_catm1
1094
+            // 
1095
+            this.richTextBox_catm1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
1096
+            this.richTextBox_catm1.Font = new System.Drawing.Font("나눔고딕", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1097
+            this.richTextBox_catm1.ForeColor = System.Drawing.Color.Yellow;
1098
+            this.richTextBox_catm1.Location = new System.Drawing.Point(17, 65);
1099
+            this.richTextBox_catm1.Name = "richTextBox_catm1";
1100
+            this.richTextBox_catm1.Size = new System.Drawing.Size(1176, 502);
1101
+            this.richTextBox_catm1.TabIndex = 26;
1102
+            this.richTextBox_catm1.Text = "";
1103
+            // 
1104
+            // dataGridView_Catm1
1105
+            // 
1106
+            this.dataGridView_Catm1.AllowUserToAddRows = false;
1107
+            this.dataGridView_Catm1.BackgroundColor = System.Drawing.Color.Gray;
1108
+            this.dataGridView_Catm1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
1109
+            this.dataGridView_Catm1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
1110
+            this.Catm1_SerialNumber,
1111
+            this.Modem_Ver,
1112
+            this.RSRP});
1113
+            this.dataGridView_Catm1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
1114
+            this.dataGridView_Catm1.Location = new System.Drawing.Point(17, 3);
1115
+            this.dataGridView_Catm1.Name = "dataGridView_Catm1";
1116
+            this.dataGridView_Catm1.RowTemplate.Height = 23;
1117
+            this.dataGridView_Catm1.Size = new System.Drawing.Size(1176, 56);
1118
+            this.dataGridView_Catm1.TabIndex = 15;
1119
+            // 
1120
+            // Catm1_SerialNumber
1121
+            // 
1122
+            this.Catm1_SerialNumber.HeaderText = "생산번호";
1123
+            this.Catm1_SerialNumber.Name = "Catm1_SerialNumber";
1124
+            // 
1125
+            // Modem_Ver
1126
+            // 
1127
+            this.Modem_Ver.HeaderText = "Modem Ver";
1128
+            this.Modem_Ver.Name = "Modem_Ver";
1129
+            // 
1130
+            // RSRP
1131
+            // 
1132
+            this.RSRP.HeaderText = "RSRP";
1133
+            this.RSRP.Name = "RSRP";
1134
+            // 
1135
+            // openFileDialog
1136
+            // 
1137
+            this.openFileDialog.Multiselect = true;
1138
+            // 
1139
+            // Gps_SerialNumber
1140
+            // 
1141
+            this.Gps_SerialNumber.HeaderText = "생산번호";
1142
+            this.Gps_SerialNumber.Name = "Gps_SerialNumber";
1143
+            // 
1144
+            // dataGridViewTextBoxColumn8
1145
+            // 
1146
+            this.dataGridViewTextBoxColumn8.HeaderText = "GPS SNR";
1147
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
1148
+            // 
1149
+            // LitmitMinimum
1150
+            // 
1151
+            this.LitmitMinimum.HeaderText = "LitmitMinimum";
1152
+            this.LitmitMinimum.Name = "LitmitMinimum";
1153
+            // 
1154
+            // LitmitMaximum
1155
+            // 
1156
+            this.LitmitMaximum.HeaderText = "LitmitMaximum";
1157
+            this.LitmitMaximum.Name = "LitmitMaximum";
1144 1158
             // 
1145 1159
             // Main
1146 1160
             // 
@@ -1177,11 +1191,6 @@
1177 1191
             this.panel_SnCheckMain.ResumeLayout(false);
1178 1192
             this.panel_SnCheckMain.PerformLayout();
1179 1193
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Chk)).EndInit();
1180
-            this.panel_MergeMain.ResumeLayout(false);
1181
-            this.panel_MergeMain.PerformLayout();
1182
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
1183
-            this.panel_Catm1Test.ResumeLayout(false);
1184
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).EndInit();
1185 1194
             this.panel_GpsTest.ResumeLayout(false);
1186 1195
             this.panel_GpsTest.PerformLayout();
1187 1196
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Gps)).EndInit();
@@ -1196,6 +1205,11 @@
1196 1205
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck4)).EndInit();
1197 1206
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_UnCheck1)).EndInit();
1198 1207
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Sensor)).EndInit();
1208
+            this.panel_MergeMain.ResumeLayout(false);
1209
+            this.panel_MergeMain.PerformLayout();
1210
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
1211
+            this.panel_Catm1Test.ResumeLayout(false);
1212
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).EndInit();
1199 1213
             this.ResumeLayout(false);
1200 1214
 
1201 1215
         }
@@ -1245,8 +1259,6 @@
1245 1259
         private System.Windows.Forms.PictureBox pictureBox_Check3;
1246 1260
         private System.Windows.Forms.PictureBox pictureBox_Check4;
1247 1261
         private System.Windows.Forms.PictureBox pictureBox_Check1;
1248
-        private System.Windows.Forms.DataGridViewTextBoxColumn Gps_SerialNumber;
1249
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
1250 1262
         private System.Windows.Forms.DataGridViewTextBoxColumn Catm1_SerialNumber;
1251 1263
         private System.Windows.Forms.DataGridViewTextBoxColumn Modem_Ver;
1252 1264
         private System.Windows.Forms.DataGridViewTextBoxColumn RSRP;
@@ -1296,6 +1308,10 @@
1296 1308
         private System.Windows.Forms.Button button_DiffClear;
1297 1309
         private System.Windows.Forms.Button button_DuplicateClear;
1298 1310
         private System.Windows.Forms.Button button_SNClear;
1311
+        private System.Windows.Forms.DataGridViewTextBoxColumn Gps_SerialNumber;
1312
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
1313
+        private System.Windows.Forms.DataGridViewTextBoxColumn LitmitMinimum;
1314
+        private System.Windows.Forms.DataGridViewTextBoxColumn LitmitMaximum;
1299 1315
     }
1300 1316
 }
1301 1317
 

+ 65 - 3
Main.cs

@@ -368,15 +368,18 @@ namespace APL_TestCheck
368 368
             dataGridView_Gps.RowCount = 1;
369 369
             dataGridView_Catm1.RowCount = 1;
370 370
             dataGridView_Sensor.RowCount = 1;
371
+
371 372
             panel_GpsTest.Visible = true;
372 373
             panel_SensorTest.Visible = false;
373 374
             panel_Catm1Test.Visible = false;
374 375
             panel_MergeMain.Visible = false;
376
+            panel_SnCheckMain.Visible = false;
377
+
375 378
             pictureBox_Check1.Visible = false;
376 379
             pictureBox_Check2.Visible = false;
377 380
             pictureBox_Check3.Visible = false;
378 381
             pictureBox_Check4.Visible = false;
379
-
382
+            button_Path_Click(null,null);
380 383
         }
381 384
         public void Serial_Initialize(ref ComboBox cb_port)
382 385
         {
@@ -423,6 +426,7 @@ namespace APL_TestCheck
423 426
             // string data = serialPort.ReadExisting();
424 427
             if (panel_SensorTest.Visible == true)
425 428
             {
429
+
426 430
                 if (data.Contains(startStr))
427 431
                 {
428 432
                     data = data.Substring(data.IndexOf(startStr));
@@ -431,6 +435,17 @@ namespace APL_TestCheck
431 435
                         this.Invoke(new StringSend(Data_Recv_Str), data);
432 436
                     }
433 437
                 }
438
+                else
439
+                {
440
+                    if (data.Contains("No need write SN"))
441
+                    {
442
+                        MessageBox.Show("이미 시리얼 넘버가 등록되어 있습니다.");
443
+                    }
444
+                    else
445
+                    {
446
+                        this.Invoke(new StringSend(Data_Recv_Str), data);
447
+                    }
448
+                }
434 449
                 
435 450
             }
436 451
             else
@@ -540,6 +555,7 @@ namespace APL_TestCheck
540 555
                 }
541 556
                 else if(panel_SensorTest.Visible == true)
542 557
                 {
558
+                    
543 559
                     Sensor_TestFunc(text);
544 560
                     tbReceived.AppendText(text);
545 561
                 }
@@ -707,6 +723,12 @@ namespace APL_TestCheck
707 723
                     str = null;
708 724
                     for (int a = 0; a < SentenceCount; a++)
709 725
                         str += tmpstr[a];
726
+
727
+                    if (dataGridView_Sensor.Rows[0].Cells[0].Value != null)
728
+                    {
729
+                        button_GpsTestSave_Click(null, null);
730
+                    }
731
+
710 732
                     return str;
711 733
                 }
712 734
                 return "";
@@ -765,7 +787,7 @@ namespace APL_TestCheck
765 787
                         {
766 788
                             // SN
767 789
                             dataGridView_Sensor.Rows[0].Cells[1].Value  = Name = value;
768
-                            serialPort.Write(value);
790
+                            serialPort.Write("APLSN Write:" + value + "\r\n");
769 791
                             button_SensorTestSave();
770 792
                             for (int i = 0; i < 12; i++)
771 793
                                 dataGridView_Sensor.Rows[0].Cells[i].Value = null;
@@ -889,6 +911,7 @@ namespace APL_TestCheck
889 911
         string FileSaveSet = null;
890 912
         private void button_GpsTestSave_Click(object sender, EventArgs e)
891 913
         {
914
+            AutoClosingMessageBox.Show("저장 중.....", "알림", 1000);
892 915
             string CheckProductionNum = null;
893 916
             try
894 917
             {
@@ -987,6 +1010,9 @@ namespace APL_TestCheck
987 1010
                 }
988 1011
             }
989 1012
 #endif
1013
+            AutoClosingMessageBox.Show("완료 되었습니다.", "알림", 1000);
1014
+            //this.Close();
1015
+            //MessageBox.
990 1016
         }
991 1017
         private void button_SensorTestSave()
992 1018
         {
@@ -1399,7 +1425,7 @@ namespace APL_TestCheck
1399 1425
                     con.Close();
1400 1426
                 }
1401 1427
             }
1402
-            Console.WriteLine("sheetName = " + sheetName);
1428
+            //Console.WriteLine("sheetName = " + sheetName);
1403 1429
 
1404 1430
             // 첫 번째 쉬트의 데이타를 읽어서 datagridview 에 보이게 함.
1405 1431
             using (OleDbConnection con = new OleDbConnection(connectionString))
@@ -1723,4 +1749,40 @@ namespace APL_TestCheck
1723 1749
             listBox_Diff.Items.Clear();
1724 1750
         }
1725 1751
     }
1752
+    class AutoClosingMessageBox
1753
+    {
1754
+        [System.Runtime.InteropServices.DllImport("user32.dll", SetLastError = true)]
1755
+        static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
1756
+        [System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
1757
+        static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, IntPtr lParam);
1758
+
1759
+        System.Threading.Timer _timeoutTimer; //쓰레드 타이머
1760
+        string _caption;
1761
+
1762
+        const int WM_CLOSE = 0x0010; //close 명령 
1763
+
1764
+        AutoClosingMessageBox(string text, string caption, int timeout)
1765
+        {
1766
+            _caption = caption;
1767
+            _timeoutTimer = new System.Threading.Timer(OnTimerElapsed,
1768
+                null, timeout, System.Threading.Timeout.Infinite);
1769
+            MessageBox.Show(text, caption);
1770
+        }
1771
+
1772
+        //생성자 함수
1773
+        public static void Show(string text, string caption, int timeout)
1774
+        {
1775
+            new AutoClosingMessageBox(text, caption, timeout);
1776
+        }
1777
+
1778
+        //시간이 다되면 close 메세지를 보냄
1779
+
1780
+        void OnTimerElapsed(object state)
1781
+        {
1782
+            IntPtr mbWnd = FindWindow(null, _caption);
1783
+            if (mbWnd != IntPtr.Zero)
1784
+                SendMessage(mbWnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
1785
+            _timeoutTimer.Dispose();
1786
+        }
1787
+    }
1726 1788
 }

+ 32 - 20
Main.resx

@@ -120,34 +120,16 @@
120 120
   <metadata name="serialPort.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121 121
     <value>17, 17</value>
122 122
   </metadata>
123
-  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124
-    <value>True</value>
125
-  </metadata>
126
-  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127
-    <value>True</value>
128
-  </metadata>
129
-  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130
-    <value>True</value>
131
-  </metadata>
132
-  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133
-    <value>True</value>
134
-  </metadata>
135
-  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
136
-    <value>True</value>
137
-  </metadata>
138
-  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139
-    <value>True</value>
140
-  </metadata>
141 123
   <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142 124
     <value>True</value>
143 125
   </metadata>
144 126
   <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
145 127
     <value>True</value>
146 128
   </metadata>
147
-  <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
129
+  <metadata name="LitmitMinimum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
148 130
     <value>True</value>
149 131
   </metadata>
150
-  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
132
+  <metadata name="LitmitMaximum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
151 133
     <value>True</value>
152 134
   </metadata>
153 135
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -323,12 +305,42 @@
323 305
   <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
324 306
     <value>True</value>
325 307
   </metadata>
308
+  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
309
+    <value>True</value>
310
+  </metadata>
311
+  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
312
+    <value>True</value>
313
+  </metadata>
314
+  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
315
+    <value>True</value>
316
+  </metadata>
317
+  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
318
+    <value>True</value>
319
+  </metadata>
320
+  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
321
+    <value>True</value>
322
+  </metadata>
323
+  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
324
+    <value>True</value>
325
+  </metadata>
326 326
   <metadata name="folderBrowserDialog_Mainpath.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
327 327
     <value>106, 17</value>
328 328
   </metadata>
329 329
   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
330 330
     <value>329, 17</value>
331 331
   </metadata>
332
+  <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
333
+    <value>True</value>
334
+  </metadata>
335
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
336
+    <value>True</value>
337
+  </metadata>
338
+  <metadata name="LitmitMinimum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
339
+    <value>True</value>
340
+  </metadata>
341
+  <metadata name="LitmitMaximum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
342
+    <value>True</value>
343
+  </metadata>
332 344
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
333 345
     <value>
334 346
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAMMOAADDDgAAAAAAAAAA

二進制
bin/Debug/APL_TestCheck.exe


二進制
bin/Debug/APL_TestCheck.pdb


二進制
obj/Debug/APL_TestCheck.csproj.GenerateResource.cache


二進制
obj/Debug/APL_TestCheck.exe


二進制
obj/Debug/APL_TestCheck.pdb