Переглянути джерело

CatM1 기능 추가 / Sensor 양식 변경 / 프로그램 최적화

YJ 5 роки тому
батько
коміт
d4402a0523

+ 248 - 231
Main.Designer.cs

@@ -59,6 +59,27 @@
59 59
             this.label_Catm1Test = new System.Windows.Forms.Label();
60 60
             this.panel_GpsMode = new System.Windows.Forms.Panel();
61 61
             this.label_GPSTest = new System.Windows.Forms.Label();
62
+            this.panel_Catm1Test = new System.Windows.Forms.Panel();
63
+            this.richTextBox_catm1 = new System.Windows.Forms.RichTextBox();
64
+            this.dataGridView_Catm1 = new System.Windows.Forms.DataGridView();
65
+            this.Catm1_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
66
+            this.Modem_Ver = new System.Windows.Forms.DataGridViewTextBoxColumn();
67
+            this.RSRP = new System.Windows.Forms.DataGridViewTextBoxColumn();
68
+            this.RSRQ = new System.Windows.Forms.DataGridViewTextBoxColumn();
69
+            this.panel_SnCheckMain = new System.Windows.Forms.Panel();
70
+            this.button_DiffClear = new System.Windows.Forms.Button();
71
+            this.button_DuplicateClear = new System.Windows.Forms.Button();
72
+            this.button_SNClear = new System.Windows.Forms.Button();
73
+            this.button_ChkStart = new System.Windows.Forms.Button();
74
+            this.label_Diff = new System.Windows.Forms.Label();
75
+            this.label8 = new System.Windows.Forms.Label();
76
+            this.label_Duplicate = new System.Windows.Forms.Label();
77
+            this.listBox_Diff = new System.Windows.Forms.ListBox();
78
+            this.listBox_ProductDuplicate = new System.Windows.Forms.ListBox();
79
+            this.listBox_SNDuplicate = new System.Windows.Forms.ListBox();
80
+            this.dataGridView_Chk = new System.Windows.Forms.DataGridView();
81
+            this.button_FileFindLoad = new System.Windows.Forms.Button();
82
+            this.progressBar2 = new System.Windows.Forms.ProgressBar();
62 83
             this.panel_GpsTest = new System.Windows.Forms.Panel();
63 84
             this.button_GpsTestSave = new System.Windows.Forms.Button();
64 85
             this.richTextBox_Gps = new System.Windows.Forms.RichTextBox();
@@ -105,26 +126,6 @@
105 126
             this.listBox_AfterFile = new System.Windows.Forms.ListBox();
106 127
             this.listBox_PreviousFile = new System.Windows.Forms.ListBox();
107 128
             this.progressBar_Merge = new System.Windows.Forms.ProgressBar();
108
-            this.panel_Catm1Test = new System.Windows.Forms.Panel();
109
-            this.richTextBox_catm1 = new System.Windows.Forms.RichTextBox();
110
-            this.dataGridView_Catm1 = new System.Windows.Forms.DataGridView();
111
-            this.Catm1_SerialNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
112
-            this.Modem_Ver = new System.Windows.Forms.DataGridViewTextBoxColumn();
113
-            this.RSRP = new System.Windows.Forms.DataGridViewTextBoxColumn();
114
-            this.panel_SnCheckMain = new System.Windows.Forms.Panel();
115
-            this.button_DiffClear = new System.Windows.Forms.Button();
116
-            this.button_DuplicateClear = new System.Windows.Forms.Button();
117
-            this.button_SNClear = new System.Windows.Forms.Button();
118
-            this.button_ChkStart = new System.Windows.Forms.Button();
119
-            this.label_Diff = new System.Windows.Forms.Label();
120
-            this.label8 = new System.Windows.Forms.Label();
121
-            this.label_Duplicate = new System.Windows.Forms.Label();
122
-            this.listBox_Diff = new System.Windows.Forms.ListBox();
123
-            this.listBox_ProductDuplicate = new System.Windows.Forms.ListBox();
124
-            this.listBox_SNDuplicate = new System.Windows.Forms.ListBox();
125
-            this.dataGridView_Chk = new System.Windows.Forms.DataGridView();
126
-            this.button_FileFindLoad = new System.Windows.Forms.Button();
127
-            this.progressBar2 = new System.Windows.Forms.ProgressBar();
128 129
             this.folderBrowserDialog_Mainpath = new System.Windows.Forms.FolderBrowserDialog();
129 130
             this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
130 131
             this.panel_Main.SuspendLayout();
@@ -139,6 +140,10 @@
139 140
             this.panel_SensorMode.SuspendLayout();
140 141
             this.panel_Catm1Mode.SuspendLayout();
141 142
             this.panel_GpsMode.SuspendLayout();
143
+            this.panel_Catm1Test.SuspendLayout();
144
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).BeginInit();
145
+            this.panel_SnCheckMain.SuspendLayout();
146
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Chk)).BeginInit();
142 147
             this.panel_GpsTest.SuspendLayout();
143 148
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Gps)).BeginInit();
144 149
             this.panel_SensorTest.SuspendLayout();
@@ -153,10 +158,6 @@
153 158
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Sensor)).BeginInit();
154 159
             this.panel_MergeMain.SuspendLayout();
155 160
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
156
-            this.panel_Catm1Test.SuspendLayout();
157
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).BeginInit();
158
-            this.panel_SnCheckMain.SuspendLayout();
159
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Chk)).BeginInit();
160 161
             this.SuspendLayout();
161 162
             // 
162 163
             // serialPort
@@ -173,11 +174,11 @@
173 174
             this.panel_Main.Controls.Add(this.panel4);
174 175
             this.panel_Main.Controls.Add(this.label6);
175 176
             this.panel_Main.Controls.Add(this.panel1);
177
+            this.panel_Main.Controls.Add(this.panel_Catm1Test);
178
+            this.panel_Main.Controls.Add(this.panel_SnCheckMain);
176 179
             this.panel_Main.Controls.Add(this.panel_GpsTest);
177 180
             this.panel_Main.Controls.Add(this.panel_SensorTest);
178 181
             this.panel_Main.Controls.Add(this.panel_MergeMain);
179
-            this.panel_Main.Controls.Add(this.panel_Catm1Test);
180
-            this.panel_Main.Controls.Add(this.panel_SnCheckMain);
181 182
             this.panel_Main.Location = new System.Drawing.Point(0, 0);
182 183
             this.panel_Main.Name = "panel_Main";
183 184
             this.panel_Main.Size = new System.Drawing.Size(1356, 710);
@@ -519,6 +520,218 @@
519 520
             this.label_GPSTest.MouseLeave += new System.EventHandler(this.label_GPSTest_MouseLeave);
520 521
             this.label_GPSTest.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label_GPSTest_MouseMove);
521 522
             // 
523
+            // panel_Catm1Test
524
+            // 
525
+            this.panel_Catm1Test.Controls.Add(this.richTextBox_catm1);
526
+            this.panel_Catm1Test.Controls.Add(this.dataGridView_Catm1);
527
+            this.panel_Catm1Test.Location = new System.Drawing.Point(149, 44);
528
+            this.panel_Catm1Test.Name = "panel_Catm1Test";
529
+            this.panel_Catm1Test.Size = new System.Drawing.Size(1202, 599);
530
+            this.panel_Catm1Test.TabIndex = 87;
531
+            // 
532
+            // richTextBox_catm1
533
+            // 
534
+            this.richTextBox_catm1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
535
+            this.richTextBox_catm1.Font = new System.Drawing.Font("나눔고딕", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
536
+            this.richTextBox_catm1.ForeColor = System.Drawing.Color.Yellow;
537
+            this.richTextBox_catm1.Location = new System.Drawing.Point(17, 65);
538
+            this.richTextBox_catm1.Name = "richTextBox_catm1";
539
+            this.richTextBox_catm1.Size = new System.Drawing.Size(1176, 502);
540
+            this.richTextBox_catm1.TabIndex = 26;
541
+            this.richTextBox_catm1.Text = "";
542
+            // 
543
+            // dataGridView_Catm1
544
+            // 
545
+            this.dataGridView_Catm1.AllowUserToAddRows = false;
546
+            this.dataGridView_Catm1.BackgroundColor = System.Drawing.Color.Gray;
547
+            this.dataGridView_Catm1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
548
+            this.dataGridView_Catm1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
549
+            this.Catm1_SerialNumber,
550
+            this.Modem_Ver,
551
+            this.RSRP,
552
+            this.RSRQ});
553
+            this.dataGridView_Catm1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
554
+            this.dataGridView_Catm1.Location = new System.Drawing.Point(17, 3);
555
+            this.dataGridView_Catm1.Name = "dataGridView_Catm1";
556
+            this.dataGridView_Catm1.RowTemplate.Height = 23;
557
+            this.dataGridView_Catm1.Size = new System.Drawing.Size(1176, 56);
558
+            this.dataGridView_Catm1.TabIndex = 15;
559
+            this.dataGridView_Catm1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_Catm1_CellClick);
560
+            // 
561
+            // Catm1_SerialNumber
562
+            // 
563
+            this.Catm1_SerialNumber.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
564
+            this.Catm1_SerialNumber.HeaderText = "생산번호";
565
+            this.Catm1_SerialNumber.Name = "Catm1_SerialNumber";
566
+            this.Catm1_SerialNumber.Width = 78;
567
+            // 
568
+            // Modem_Ver
569
+            // 
570
+            this.Modem_Ver.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
571
+            this.Modem_Ver.HeaderText = "Modem Ver";
572
+            this.Modem_Ver.Name = "Modem_Ver";
573
+            this.Modem_Ver.Width = 96;
574
+            // 
575
+            // RSRP
576
+            // 
577
+            this.RSRP.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
578
+            this.RSRP.HeaderText = "RSRP";
579
+            this.RSRP.Name = "RSRP";
580
+            this.RSRP.Width = 62;
581
+            // 
582
+            // RSRQ
583
+            // 
584
+            this.RSRQ.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
585
+            this.RSRQ.HeaderText = "RSRQ";
586
+            this.RSRQ.Name = "RSRQ";
587
+            this.RSRQ.Width = 63;
588
+            // 
589
+            // panel_SnCheckMain
590
+            // 
591
+            this.panel_SnCheckMain.Controls.Add(this.button_DiffClear);
592
+            this.panel_SnCheckMain.Controls.Add(this.button_DuplicateClear);
593
+            this.panel_SnCheckMain.Controls.Add(this.button_SNClear);
594
+            this.panel_SnCheckMain.Controls.Add(this.button_ChkStart);
595
+            this.panel_SnCheckMain.Controls.Add(this.label_Diff);
596
+            this.panel_SnCheckMain.Controls.Add(this.label8);
597
+            this.panel_SnCheckMain.Controls.Add(this.label_Duplicate);
598
+            this.panel_SnCheckMain.Controls.Add(this.listBox_Diff);
599
+            this.panel_SnCheckMain.Controls.Add(this.listBox_ProductDuplicate);
600
+            this.panel_SnCheckMain.Controls.Add(this.listBox_SNDuplicate);
601
+            this.panel_SnCheckMain.Controls.Add(this.dataGridView_Chk);
602
+            this.panel_SnCheckMain.Controls.Add(this.button_FileFindLoad);
603
+            this.panel_SnCheckMain.Controls.Add(this.progressBar2);
604
+            this.panel_SnCheckMain.Location = new System.Drawing.Point(163, 44);
605
+            this.panel_SnCheckMain.Name = "panel_SnCheckMain";
606
+            this.panel_SnCheckMain.Size = new System.Drawing.Size(1202, 599);
607
+            this.panel_SnCheckMain.TabIndex = 90;
608
+            // 
609
+            // button_DiffClear
610
+            // 
611
+            this.button_DiffClear.Location = new System.Drawing.Point(826, 549);
612
+            this.button_DiffClear.Name = "button_DiffClear";
613
+            this.button_DiffClear.Size = new System.Drawing.Size(167, 40);
614
+            this.button_DiffClear.TabIndex = 8;
615
+            this.button_DiffClear.Text = "Clear";
616
+            this.button_DiffClear.UseVisualStyleBackColor = true;
617
+            this.button_DiffClear.Click += new System.EventHandler(this.button_DiffClear_Click);
618
+            // 
619
+            // button_DuplicateClear
620
+            // 
621
+            this.button_DuplicateClear.Location = new System.Drawing.Point(653, 549);
622
+            this.button_DuplicateClear.Name = "button_DuplicateClear";
623
+            this.button_DuplicateClear.Size = new System.Drawing.Size(167, 40);
624
+            this.button_DuplicateClear.TabIndex = 8;
625
+            this.button_DuplicateClear.Text = "Clear";
626
+            this.button_DuplicateClear.UseVisualStyleBackColor = true;
627
+            this.button_DuplicateClear.Click += new System.EventHandler(this.button_DuplicateClear_Click);
628
+            // 
629
+            // button_SNClear
630
+            // 
631
+            this.button_SNClear.Location = new System.Drawing.Point(481, 549);
632
+            this.button_SNClear.Name = "button_SNClear";
633
+            this.button_SNClear.Size = new System.Drawing.Size(167, 40);
634
+            this.button_SNClear.TabIndex = 8;
635
+            this.button_SNClear.Text = "Clear";
636
+            this.button_SNClear.UseVisualStyleBackColor = true;
637
+            this.button_SNClear.Click += new System.EventHandler(this.button_SNClear_Click);
638
+            // 
639
+            // button_ChkStart
640
+            // 
641
+            this.button_ChkStart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
642
+            this.button_ChkStart.Location = new System.Drawing.Point(1007, 68);
643
+            this.button_ChkStart.Name = "button_ChkStart";
644
+            this.button_ChkStart.Size = new System.Drawing.Size(75, 519);
645
+            this.button_ChkStart.TabIndex = 7;
646
+            this.button_ChkStart.Text = "Start";
647
+            this.button_ChkStart.UseVisualStyleBackColor = false;
648
+            this.button_ChkStart.Click += new System.EventHandler(this.button_ChkStart_Click);
649
+            // 
650
+            // label_Diff
651
+            // 
652
+            this.label_Diff.AutoSize = true;
653
+            this.label_Diff.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
654
+            this.label_Diff.Location = new System.Drawing.Point(843, 78);
655
+            this.label_Diff.Name = "label_Diff";
656
+            this.label_Diff.Size = new System.Drawing.Size(143, 19);
657
+            this.label_Diff.TabIndex = 6;
658
+            this.label_Diff.Text = "짝이 틀린 항목";
659
+            // 
660
+            // label8
661
+            // 
662
+            this.label8.AutoSize = true;
663
+            this.label8.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
664
+            this.label8.Location = new System.Drawing.Point(649, 76);
665
+            this.label8.Name = "label8";
666
+            this.label8.Size = new System.Drawing.Size(190, 19);
667
+            this.label8.TabIndex = 6;
668
+            this.label8.Text = "생산 번호 중복 항목";
669
+            // 
670
+            // label_Duplicate
671
+            // 
672
+            this.label_Duplicate.AutoSize = true;
673
+            this.label_Duplicate.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
674
+            this.label_Duplicate.Location = new System.Drawing.Point(499, 78);
675
+            this.label_Duplicate.Name = "label_Duplicate";
676
+            this.label_Duplicate.Size = new System.Drawing.Size(137, 19);
677
+            this.label_Duplicate.TabIndex = 6;
678
+            this.label_Duplicate.Text = "S/N 중복 항목";
679
+            // 
680
+            // listBox_Diff
681
+            // 
682
+            this.listBox_Diff.FormattingEnabled = true;
683
+            this.listBox_Diff.ItemHeight = 12;
684
+            this.listBox_Diff.Location = new System.Drawing.Point(828, 110);
685
+            this.listBox_Diff.Name = "listBox_Diff";
686
+            this.listBox_Diff.Size = new System.Drawing.Size(168, 436);
687
+            this.listBox_Diff.TabIndex = 5;
688
+            // 
689
+            // listBox_ProductDuplicate
690
+            // 
691
+            this.listBox_ProductDuplicate.FormattingEnabled = true;
692
+            this.listBox_ProductDuplicate.ItemHeight = 12;
693
+            this.listBox_ProductDuplicate.Location = new System.Drawing.Point(654, 110);
694
+            this.listBox_ProductDuplicate.Name = "listBox_ProductDuplicate";
695
+            this.listBox_ProductDuplicate.Size = new System.Drawing.Size(168, 436);
696
+            this.listBox_ProductDuplicate.TabIndex = 5;
697
+            // 
698
+            // listBox_SNDuplicate
699
+            // 
700
+            this.listBox_SNDuplicate.FormattingEnabled = true;
701
+            this.listBox_SNDuplicate.ItemHeight = 12;
702
+            this.listBox_SNDuplicate.Location = new System.Drawing.Point(480, 110);
703
+            this.listBox_SNDuplicate.Name = "listBox_SNDuplicate";
704
+            this.listBox_SNDuplicate.Size = new System.Drawing.Size(168, 436);
705
+            this.listBox_SNDuplicate.TabIndex = 5;
706
+            // 
707
+            // dataGridView_Chk
708
+            // 
709
+            this.dataGridView_Chk.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
710
+            this.dataGridView_Chk.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
711
+            this.dataGridView_Chk.Location = new System.Drawing.Point(102, 65);
712
+            this.dataGridView_Chk.Name = "dataGridView_Chk";
713
+            this.dataGridView_Chk.RowTemplate.Height = 23;
714
+            this.dataGridView_Chk.Size = new System.Drawing.Size(372, 524);
715
+            this.dataGridView_Chk.TabIndex = 4;
716
+            // 
717
+            // button_FileFindLoad
718
+            // 
719
+            this.button_FileFindLoad.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
720
+            this.button_FileFindLoad.Location = new System.Drawing.Point(21, 65);
721
+            this.button_FileFindLoad.Name = "button_FileFindLoad";
722
+            this.button_FileFindLoad.Size = new System.Drawing.Size(75, 519);
723
+            this.button_FileFindLoad.TabIndex = 3;
724
+            this.button_FileFindLoad.Text = "Load";
725
+            this.button_FileFindLoad.UseVisualStyleBackColor = false;
726
+            this.button_FileFindLoad.Click += new System.EventHandler(this.button_FileFindLoad_Click);
727
+            // 
728
+            // progressBar2
729
+            // 
730
+            this.progressBar2.Location = new System.Drawing.Point(21, 21);
731
+            this.progressBar2.Name = "progressBar2";
732
+            this.progressBar2.Size = new System.Drawing.Size(1159, 40);
733
+            this.progressBar2.TabIndex = 0;
734
+            // 
522 735
             // panel_GpsTest
523 736
             // 
524 737
             this.panel_GpsTest.Controls.Add(this.button_GpsTestSave);
@@ -956,203 +1169,6 @@
956 1169
             this.progressBar_Merge.Size = new System.Drawing.Size(567, 40);
957 1170
             this.progressBar_Merge.TabIndex = 0;
958 1171
             // 
959
-            // panel_Catm1Test
960
-            // 
961
-            this.panel_Catm1Test.Controls.Add(this.richTextBox_catm1);
962
-            this.panel_Catm1Test.Controls.Add(this.dataGridView_Catm1);
963
-            this.panel_Catm1Test.Location = new System.Drawing.Point(149, 44);
964
-            this.panel_Catm1Test.Name = "panel_Catm1Test";
965
-            this.panel_Catm1Test.Size = new System.Drawing.Size(1202, 599);
966
-            this.panel_Catm1Test.TabIndex = 87;
967
-            // 
968
-            // richTextBox_catm1
969
-            // 
970
-            this.richTextBox_catm1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
971
-            this.richTextBox_catm1.Font = new System.Drawing.Font("나눔고딕", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
972
-            this.richTextBox_catm1.ForeColor = System.Drawing.Color.Yellow;
973
-            this.richTextBox_catm1.Location = new System.Drawing.Point(17, 65);
974
-            this.richTextBox_catm1.Name = "richTextBox_catm1";
975
-            this.richTextBox_catm1.Size = new System.Drawing.Size(1176, 502);
976
-            this.richTextBox_catm1.TabIndex = 26;
977
-            this.richTextBox_catm1.Text = "";
978
-            // 
979
-            // dataGridView_Catm1
980
-            // 
981
-            this.dataGridView_Catm1.AllowUserToAddRows = false;
982
-            this.dataGridView_Catm1.BackgroundColor = System.Drawing.Color.Gray;
983
-            this.dataGridView_Catm1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
984
-            this.dataGridView_Catm1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
985
-            this.Catm1_SerialNumber,
986
-            this.Modem_Ver,
987
-            this.RSRP});
988
-            this.dataGridView_Catm1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(230)))));
989
-            this.dataGridView_Catm1.Location = new System.Drawing.Point(17, 3);
990
-            this.dataGridView_Catm1.Name = "dataGridView_Catm1";
991
-            this.dataGridView_Catm1.RowTemplate.Height = 23;
992
-            this.dataGridView_Catm1.Size = new System.Drawing.Size(1176, 56);
993
-            this.dataGridView_Catm1.TabIndex = 15;
994
-            // 
995
-            // Catm1_SerialNumber
996
-            // 
997
-            this.Catm1_SerialNumber.HeaderText = "생산번호";
998
-            this.Catm1_SerialNumber.Name = "Catm1_SerialNumber";
999
-            // 
1000
-            // Modem_Ver
1001
-            // 
1002
-            this.Modem_Ver.HeaderText = "Modem Ver";
1003
-            this.Modem_Ver.Name = "Modem_Ver";
1004
-            // 
1005
-            // RSRP
1006
-            // 
1007
-            this.RSRP.HeaderText = "RSRP";
1008
-            this.RSRP.Name = "RSRP";
1009
-            // 
1010
-            // panel_SnCheckMain
1011
-            // 
1012
-            this.panel_SnCheckMain.Controls.Add(this.button_DiffClear);
1013
-            this.panel_SnCheckMain.Controls.Add(this.button_DuplicateClear);
1014
-            this.panel_SnCheckMain.Controls.Add(this.button_SNClear);
1015
-            this.panel_SnCheckMain.Controls.Add(this.button_ChkStart);
1016
-            this.panel_SnCheckMain.Controls.Add(this.label_Diff);
1017
-            this.panel_SnCheckMain.Controls.Add(this.label8);
1018
-            this.panel_SnCheckMain.Controls.Add(this.label_Duplicate);
1019
-            this.panel_SnCheckMain.Controls.Add(this.listBox_Diff);
1020
-            this.panel_SnCheckMain.Controls.Add(this.listBox_ProductDuplicate);
1021
-            this.panel_SnCheckMain.Controls.Add(this.listBox_SNDuplicate);
1022
-            this.panel_SnCheckMain.Controls.Add(this.dataGridView_Chk);
1023
-            this.panel_SnCheckMain.Controls.Add(this.button_FileFindLoad);
1024
-            this.panel_SnCheckMain.Controls.Add(this.progressBar2);
1025
-            this.panel_SnCheckMain.Location = new System.Drawing.Point(163, 44);
1026
-            this.panel_SnCheckMain.Name = "panel_SnCheckMain";
1027
-            this.panel_SnCheckMain.Size = new System.Drawing.Size(1202, 599);
1028
-            this.panel_SnCheckMain.TabIndex = 90;
1029
-            // 
1030
-            // button_DiffClear
1031
-            // 
1032
-            this.button_DiffClear.Location = new System.Drawing.Point(826, 549);
1033
-            this.button_DiffClear.Name = "button_DiffClear";
1034
-            this.button_DiffClear.Size = new System.Drawing.Size(167, 40);
1035
-            this.button_DiffClear.TabIndex = 8;
1036
-            this.button_DiffClear.Text = "Clear";
1037
-            this.button_DiffClear.UseVisualStyleBackColor = true;
1038
-            this.button_DiffClear.Click += new System.EventHandler(this.button_DiffClear_Click);
1039
-            // 
1040
-            // button_DuplicateClear
1041
-            // 
1042
-            this.button_DuplicateClear.Location = new System.Drawing.Point(653, 549);
1043
-            this.button_DuplicateClear.Name = "button_DuplicateClear";
1044
-            this.button_DuplicateClear.Size = new System.Drawing.Size(167, 40);
1045
-            this.button_DuplicateClear.TabIndex = 8;
1046
-            this.button_DuplicateClear.Text = "Clear";
1047
-            this.button_DuplicateClear.UseVisualStyleBackColor = true;
1048
-            this.button_DuplicateClear.Click += new System.EventHandler(this.button_DuplicateClear_Click);
1049
-            // 
1050
-            // button_SNClear
1051
-            // 
1052
-            this.button_SNClear.Location = new System.Drawing.Point(481, 549);
1053
-            this.button_SNClear.Name = "button_SNClear";
1054
-            this.button_SNClear.Size = new System.Drawing.Size(167, 40);
1055
-            this.button_SNClear.TabIndex = 8;
1056
-            this.button_SNClear.Text = "Clear";
1057
-            this.button_SNClear.UseVisualStyleBackColor = true;
1058
-            this.button_SNClear.Click += new System.EventHandler(this.button_SNClear_Click);
1059
-            // 
1060
-            // button_ChkStart
1061
-            // 
1062
-            this.button_ChkStart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
1063
-            this.button_ChkStart.Location = new System.Drawing.Point(1007, 68);
1064
-            this.button_ChkStart.Name = "button_ChkStart";
1065
-            this.button_ChkStart.Size = new System.Drawing.Size(75, 519);
1066
-            this.button_ChkStart.TabIndex = 7;
1067
-            this.button_ChkStart.Text = "Start";
1068
-            this.button_ChkStart.UseVisualStyleBackColor = false;
1069
-            this.button_ChkStart.Click += new System.EventHandler(this.button_ChkStart_Click);
1070
-            // 
1071
-            // label_Diff
1072
-            // 
1073
-            this.label_Diff.AutoSize = true;
1074
-            this.label_Diff.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1075
-            this.label_Diff.Location = new System.Drawing.Point(843, 78);
1076
-            this.label_Diff.Name = "label_Diff";
1077
-            this.label_Diff.Size = new System.Drawing.Size(143, 19);
1078
-            this.label_Diff.TabIndex = 6;
1079
-            this.label_Diff.Text = "짝이 틀린 항목";
1080
-            // 
1081
-            // label8
1082
-            // 
1083
-            this.label8.AutoSize = true;
1084
-            this.label8.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1085
-            this.label8.Location = new System.Drawing.Point(649, 76);
1086
-            this.label8.Name = "label8";
1087
-            this.label8.Size = new System.Drawing.Size(190, 19);
1088
-            this.label8.TabIndex = 6;
1089
-            this.label8.Text = "생산 번호 중복 항목";
1090
-            // 
1091
-            // label_Duplicate
1092
-            // 
1093
-            this.label_Duplicate.AutoSize = true;
1094
-            this.label_Duplicate.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
1095
-            this.label_Duplicate.Location = new System.Drawing.Point(499, 78);
1096
-            this.label_Duplicate.Name = "label_Duplicate";
1097
-            this.label_Duplicate.Size = new System.Drawing.Size(137, 19);
1098
-            this.label_Duplicate.TabIndex = 6;
1099
-            this.label_Duplicate.Text = "S/N 중복 항목";
1100
-            // 
1101
-            // listBox_Diff
1102
-            // 
1103
-            this.listBox_Diff.FormattingEnabled = true;
1104
-            this.listBox_Diff.ItemHeight = 12;
1105
-            this.listBox_Diff.Location = new System.Drawing.Point(828, 110);
1106
-            this.listBox_Diff.Name = "listBox_Diff";
1107
-            this.listBox_Diff.Size = new System.Drawing.Size(168, 436);
1108
-            this.listBox_Diff.TabIndex = 5;
1109
-            // 
1110
-            // listBox_ProductDuplicate
1111
-            // 
1112
-            this.listBox_ProductDuplicate.FormattingEnabled = true;
1113
-            this.listBox_ProductDuplicate.ItemHeight = 12;
1114
-            this.listBox_ProductDuplicate.Location = new System.Drawing.Point(654, 110);
1115
-            this.listBox_ProductDuplicate.Name = "listBox_ProductDuplicate";
1116
-            this.listBox_ProductDuplicate.Size = new System.Drawing.Size(168, 436);
1117
-            this.listBox_ProductDuplicate.TabIndex = 5;
1118
-            // 
1119
-            // listBox_SNDuplicate
1120
-            // 
1121
-            this.listBox_SNDuplicate.FormattingEnabled = true;
1122
-            this.listBox_SNDuplicate.ItemHeight = 12;
1123
-            this.listBox_SNDuplicate.Location = new System.Drawing.Point(480, 110);
1124
-            this.listBox_SNDuplicate.Name = "listBox_SNDuplicate";
1125
-            this.listBox_SNDuplicate.Size = new System.Drawing.Size(168, 436);
1126
-            this.listBox_SNDuplicate.TabIndex = 5;
1127
-            // 
1128
-            // dataGridView_Chk
1129
-            // 
1130
-            this.dataGridView_Chk.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
1131
-            this.dataGridView_Chk.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
1132
-            this.dataGridView_Chk.Location = new System.Drawing.Point(102, 65);
1133
-            this.dataGridView_Chk.Name = "dataGridView_Chk";
1134
-            this.dataGridView_Chk.RowTemplate.Height = 23;
1135
-            this.dataGridView_Chk.Size = new System.Drawing.Size(372, 524);
1136
-            this.dataGridView_Chk.TabIndex = 4;
1137
-            // 
1138
-            // button_FileFindLoad
1139
-            // 
1140
-            this.button_FileFindLoad.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(159)))), ((int)(((byte)(200)))));
1141
-            this.button_FileFindLoad.Location = new System.Drawing.Point(21, 65);
1142
-            this.button_FileFindLoad.Name = "button_FileFindLoad";
1143
-            this.button_FileFindLoad.Size = new System.Drawing.Size(75, 519);
1144
-            this.button_FileFindLoad.TabIndex = 3;
1145
-            this.button_FileFindLoad.Text = "Load";
1146
-            this.button_FileFindLoad.UseVisualStyleBackColor = false;
1147
-            this.button_FileFindLoad.Click += new System.EventHandler(this.button_FileFindLoad_Click);
1148
-            // 
1149
-            // progressBar2
1150
-            // 
1151
-            this.progressBar2.Location = new System.Drawing.Point(21, 21);
1152
-            this.progressBar2.Name = "progressBar2";
1153
-            this.progressBar2.Size = new System.Drawing.Size(1159, 40);
1154
-            this.progressBar2.TabIndex = 0;
1155
-            // 
1156 1172
             // openFileDialog
1157 1173
             // 
1158 1174
             this.openFileDialog.Multiselect = true;
@@ -1189,6 +1205,11 @@
1189 1205
             this.panel_Catm1Mode.PerformLayout();
1190 1206
             this.panel_GpsMode.ResumeLayout(false);
1191 1207
             this.panel_GpsMode.PerformLayout();
1208
+            this.panel_Catm1Test.ResumeLayout(false);
1209
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).EndInit();
1210
+            this.panel_SnCheckMain.ResumeLayout(false);
1211
+            this.panel_SnCheckMain.PerformLayout();
1212
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Chk)).EndInit();
1192 1213
             this.panel_GpsTest.ResumeLayout(false);
1193 1214
             this.panel_GpsTest.PerformLayout();
1194 1215
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Gps)).EndInit();
@@ -1206,11 +1227,6 @@
1206 1227
             this.panel_MergeMain.ResumeLayout(false);
1207 1228
             this.panel_MergeMain.PerformLayout();
1208 1229
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
1209
-            this.panel_Catm1Test.ResumeLayout(false);
1210
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Catm1)).EndInit();
1211
-            this.panel_SnCheckMain.ResumeLayout(false);
1212
-            this.panel_SnCheckMain.PerformLayout();
1213
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView_Chk)).EndInit();
1214 1230
             this.ResumeLayout(false);
1215 1231
 
1216 1232
         }
@@ -1260,9 +1276,6 @@
1260 1276
         private System.Windows.Forms.PictureBox pictureBox_Check3;
1261 1277
         private System.Windows.Forms.PictureBox pictureBox_Check4;
1262 1278
         private System.Windows.Forms.PictureBox pictureBox_Check1;
1263
-        private System.Windows.Forms.DataGridViewTextBoxColumn Catm1_SerialNumber;
1264
-        private System.Windows.Forms.DataGridViewTextBoxColumn Modem_Ver;
1265
-        private System.Windows.Forms.DataGridViewTextBoxColumn RSRP;
1266 1279
         private System.Windows.Forms.Button button_Clear;
1267 1280
         private System.Windows.Forms.CheckBox checkBox_GPGSV;
1268 1281
         private System.Windows.Forms.Button button_GpsTestSave;
@@ -1313,6 +1326,10 @@
1313 1326
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
1314 1327
         private System.Windows.Forms.DataGridViewTextBoxColumn LitmitMinimum;
1315 1328
         private System.Windows.Forms.DataGridViewTextBoxColumn LitmitMaximum;
1329
+        private System.Windows.Forms.DataGridViewTextBoxColumn Catm1_SerialNumber;
1330
+        private System.Windows.Forms.DataGridViewTextBoxColumn Modem_Ver;
1331
+        private System.Windows.Forms.DataGridViewTextBoxColumn RSRP;
1332
+        private System.Windows.Forms.DataGridViewTextBoxColumn RSRQ;
1316 1333
     }
1317 1334
 }
1318 1335
 

+ 432 - 57
Main.cs

@@ -490,16 +490,40 @@ namespace APL_TestCheck
490 490
                     rxString += Convert.ToChar(rxBuffer[iTemp]);
491 491
                 }
492 492
 
493
-                if (rxString.Contains(startStr))
493
+                if (panel_SensorTest.Visible == true)
494 494
                 {
495
-                    rxString = rxString.Substring(rxString.IndexOf(startStr));
496
-                    if (rxString.Contains(endStr))
495
+                    startStr = "V";
496
+                    endStr = "\n";
497
+                    if (rxString.Contains(startStr))
497 498
                     {
498
-                        this.Invoke(new StringSend(Data_Recv_Str), rxString);
499
-                        //program.dataReceived(rxString, "Receive");
500
-                        offset = 0;
499
+                        rxString = rxString.Substring(rxString.IndexOf(startStr));
500
+                        if (rxString.Contains(endStr))
501
+                        {
502
+                            this.Invoke(new StringSend(Data_Recv_Str), rxString);
503
+                            //program.dataReceived(rxString, "Receive");
504
+                            offset = 0;
505
+                        }
506
+                    }
507
+                }
508
+                else if (panel_Catm1Test.Visible == true)
509
+                {
510
+                    startStr = "B";
511
+                    endStr = "\n";
512
+                    if (rxString.Contains(startStr))
513
+                    {
514
+                        rxString = rxString.Substring(rxString.IndexOf(startStr));
515
+                        if (rxString.Contains(endStr))
516
+                        {
517
+                            this.Invoke(new StringSend(Data_Recv_Str), rxString);
518
+                            //program.dataReceived(rxString, "Receive");
519
+                            offset = 0;
520
+                        }
501 521
                     }
502 522
                 }
523
+                else
524
+                {
525
+                    this.Invoke(new StringSend(Data_Recv_Str), rxString);
526
+                }
503 527
             }
504 528
         }
505 529
        
@@ -560,6 +584,11 @@ namespace APL_TestCheck
560 584
                     Sensor_TestFunc(text);
561 585
                     tbReceived.AppendText(text);
562 586
                 }
587
+                else if (panel_Catm1Test.Visible == true)
588
+                {
589
+                    Catm1_TestFunc(text);
590
+                    tbReceived.AppendText(text);
591
+                }
563 592
                 else
564 593
                 {
565 594
                     tbReceived.AppendText(text);
@@ -802,6 +831,52 @@ namespace APL_TestCheck
802 831
             }
803 832
             catch (Exception ex) { /*MessageBox.Show(ex.StackTrace); */ }
804 833
         }
834
+        string Catm1Data = null;
835
+        private void Catm1_TestFunc(string data)
836
+        {
837
+            string str = data;
838
+            string[] sp = new string[4];
839
+            try
840
+            {
841
+                if (data.Contains("\r\n") == false)
842
+                {
843
+                    return;
844
+                }
845
+                else
846
+                {
847
+                    Catm1Data += data;
848
+                    str = Catm1Data;
849
+                }
850
+
851
+                //if (dataGridView_Catm1.Rows[0].Cells[0].Value != null)
852
+                {
853
+                    //location1 = str.IndexOf("\r\n");
854
+                    //str = str.Substring(0, location1);
855
+                    sp = str.Split(',');
856
+                    if (sp[0].Contains("B") == false/* || sp.Length != 11*/)
857
+                    {
858
+                        Catm1Data = null;
859
+                        return;
860
+                    }
861
+
862
+                    dataGridView_Catm1.Rows[0].Cells[1].Value = sp[0]; //Modem Ver
863
+                    dataGridView_Catm1.Rows[0].Cells[2].Value = sp[1];//RSRP
864
+                    
865
+                    
866
+                    if (sp[2].Contains("\r"))
867
+                    {
868
+                        int loc = sp[2].IndexOf("\r");
869
+                        sp[2] = sp[2].Substring(0, loc);
870
+                    }
871
+                    dataGridView_Catm1.Rows[0].Cells[3].Value = sp[2];//RSRQ
872
+                    Catm1Data = null;
873
+                    dataGridView_Catm1.Refresh();
874
+
875
+                }
876
+                return;
877
+            }
878
+            catch (Exception ex) { /*MessageBox.Show(ex.StackTrace); */ }
879
+        }
805 880
         private void label_Port_MouseLeave(object sender, EventArgs e)
806 881
         {
807 882
             panel_Port.BackColor = Color.FromArgb(0, 159, 200);
@@ -912,13 +987,41 @@ namespace APL_TestCheck
912 987
         string FileSaveSet = null;
913 988
 
914 989
 
915
-        //private Thread rTh_Gps;
990
+        void Gps_ThreadRun(string dst,object Value1, object Value2)
991
+        {
992
+            //DST    : 위치
993
+            //Value1 : 생산 번호
994
+            //Value2 : SNR
995
+            Thread Gps_thread = new Thread(delegate ()
996
+            {
997
+                Gps_DataxlsWrite(dst, Value1, Value2);
998
+            });
999
+            Gps_thread.Start();
1000
+        }
916 1001
 
1002
+        void Catm1_ThreadRun(object dst, object Product, object Modemver, object Rsrp, object Rsrq)
1003
+        {
1004
+            //DST    : 위치
1005
+            //Value1 : 생산 번호
1006
+            //Value2 : Modem Ver
1007
+            //Value3 : RSRP
1008
+            //Value4 : RSRQ
1009
+            Thread Catm1_thread = new Thread(delegate ()
1010
+            {
1011
+                Catm1_DataxlsWrite(dst, Product, Modemver, Rsrp, Rsrq);
1012
+            });
1013
+            Catm1_thread.Start();
1014
+
1015
+        }
1016
+
1017
+
1018
+
1019
+        //Thread rTh_Gps;
917 1020
         private void button_GpsTestSave_Click(object sender, EventArgs e)
918 1021
         {
919
-          // rTh_Gps = new Thread(new ParameterizedThreadStart(Gps_DataxlsWrite));
920
-            
921
-            Thread.Sleep(1000);
1022
+            //rTh_Gps = new Thread(new ParameterizedThreadStart(Gps_DataxlsWrite));
1023
+
1024
+            //Thread.Sleep(1000);
922 1025
             AutoClosingMessageBox.Show("저장 중.....", "알림", 1000);
923 1026
             string CheckProductionNum = null;
924 1027
             try
@@ -942,7 +1045,7 @@ namespace APL_TestCheck
942 1045
             }
943 1046
             string Ref_Xls_File = new System.IO.DirectoryInfo(System.Windows.Forms.Application.StartupPath).ToString();
944 1047
             string Dst_Xls_File = null;
945
-            Ref_Xls_File = Ref_Xls_File + @"\APL_200221.xls";
1048
+            Ref_Xls_File = Ref_Xls_File + @"\APL_200303.xls";
946 1049
             FileInfo SrcfileInfo = new FileInfo(Ref_Xls_File);
947 1050
             FileInfo DstfileInfo;
948 1051
             
@@ -985,6 +1088,7 @@ namespace APL_TestCheck
985 1088
                         else
986 1089
                         {
987 1090
                             File.Copy(Ref_Xls_File, Dst_Xls_File);
1091
+                            Thread.Sleep(2000);
988 1092
                         }
989 1093
                     }
990 1094
                 }
@@ -1000,8 +1104,8 @@ namespace APL_TestCheck
1000 1104
                 return;
1001 1105
             }
1002 1106
            // rTh_Gps.Start();
1003
-            Gps_DataxlsWrite(Dst_Xls_File);
1004
-            //rTh_Gps.Start(Dst_Xls_File);
1107
+            //Gps_DataxlsWrite(Dst_Xls_File, dataGridView_Gps.Rows[0].Cells[0].Value, dataGridView_Gps.Rows[0].Cells[1].Value);
1108
+            Gps_ThreadRun(Dst_Xls_File, dataGridView_Gps.Rows[0].Cells[0].Value, dataGridView_Gps.Rows[0].Cells[1].Value);
1005 1109
             dataGridView_Gps.Rows[0].Cells[0].Value = null;
1006 1110
             dataGridView_Gps.Rows[0].Cells[1].Value = null;
1007 1111
             dataGridView_Gps.Refresh();
@@ -1049,7 +1153,7 @@ namespace APL_TestCheck
1049 1153
             }
1050 1154
             string Ref_Xls_File = new System.IO.DirectoryInfo(System.Windows.Forms.Application.StartupPath).ToString();
1051 1155
             string Dst_Xls_File = null;
1052
-            Ref_Xls_File = Ref_Xls_File + @"\APL_200221.xls";
1156
+            Ref_Xls_File = Ref_Xls_File + @"\APL_200303.xls";
1053 1157
             FileInfo SrcfileInfo = new FileInfo(Ref_Xls_File);
1054 1158
             FileInfo DstfileInfo;
1055 1159
 
@@ -1091,6 +1195,7 @@ namespace APL_TestCheck
1091 1195
                         else
1092 1196
                         {
1093 1197
                             File.Copy(Ref_Xls_File, Dst_Xls_File);
1198
+                            Thread.Sleep(2000);
1094 1199
                         }
1095 1200
                     }
1096 1201
                 }
@@ -1125,24 +1230,146 @@ namespace APL_TestCheck
1125 1230
             }
1126 1231
 #endif
1127 1232
         }
1233
+        private void button_Catm1TestSave()
1234
+        {
1235
+            string CheckProductionNum = null;
1236
+            try
1237
+            {
1238
+                CheckProductionNum = dataGridView_Catm1.Rows[0].Cells[0].Value.ToString();
1239
+            }
1240
+            catch
1241
+            {
1242
+
1243
+            }
1244
+            try
1245
+            {
1246
+                if (!CheckProductionNum.Contains("BL-VITE00-V"))
1247
+                {
1248
+                    MessageBox.Show("잘못된 생산 번호 입니다.");
1249
+                    return;
1250
+                }
1251
+            }
1252
+            catch
1253
+            {
1254
+                MessageBox.Show("생산번호를 적어주세요.");
1255
+            }
1256
+            string Ref_Xls_File = new System.IO.DirectoryInfo(System.Windows.Forms.Application.StartupPath).ToString();
1257
+            string Dst_Xls_File = null;
1258
+            Ref_Xls_File = Ref_Xls_File + @"\APL_200303.xls";
1259
+            FileInfo SrcfileInfo = new FileInfo(Ref_Xls_File);
1260
+            FileInfo DstfileInfo;
1261
+
1262
+            if (dataGridView_Catm1.Rows[0].Cells[0].Value != null)
1263
+            {
1264
+                if (SrcfileInfo.Exists)
1265
+                {
1266
+                    if (FileSaveSet == null)
1267
+                    {
1268
+                        button_Path_Click(null, null);
1269
+                        return;
1270
+                        //                        MessageBox.Show("레퍼런스 엑셀 파일이 존재하지 않습니다. \r\n강차장님에게 문의 하세요.");
1271
+                    }
1272
+                    else
1273
+                    {
1274
+                        // File Copy 후 Data 입력 
1275
+                        Dst_Xls_File = FileSaveSet + @"\" + dataGridView_Catm1.Rows[0].Cells[0].Value.ToString() + @".xls";
1276
+                        DstfileInfo = new FileInfo(Dst_Xls_File);
1277
+                        if (DstfileInfo.Exists)
1278
+                        {
1279
+                            if (MessageBox.Show("이미 파일이 있습니다.\r\n 덮어씌우겠습니까?", "YesOrNo", MessageBoxButtons.YesNo) == DialogResult.Yes)
1280
+                            {
1281
+                                try
1282
+                                {
1283
+                                    //  File.Copy(Ref_Xls_File, Dst_Xls_File, true);
1284
+                                }
1285
+                                catch (Exception ex)
1286
+                                {
1287
+                                    MessageBox.Show(ex.StackTrace);
1288
+                                    return;
1289
+                                }
1290
+                            }
1291
+                            else
1292
+                            {
1293
+                                //MessageBox.Show("아니요 클릭");
1294
+                                return; // 아니오시 Return;
1295
+                            }
1296
+                        }
1297
+                        else
1298
+                        {
1299
+                            File.Copy(Ref_Xls_File, Dst_Xls_File);
1300
+                            Thread.Sleep(2000);
1301
+                        }
1302
+                    }
1303
+                }
1304
+                else
1305
+                {
1306
+                    MessageBox.Show("레퍼런스 엑셀 파일이 존재하지 않습니다. \r\n강차장님에게 문의 하세요.");
1307
+                    return;
1308
+                }
1309
+            }
1310
+            else
1311
+            {
1312
+                MessageBox.Show("생산번호 값이 제대로 입력 되지 않았습니다.\r\n확인후 다시 저장하세요.");
1313
+                return;
1314
+            }
1315
+            Catm1_ThreadRun(Dst_Xls_File, dataGridView_Catm1.Rows[0].Cells[0].Value, dataGridView_Catm1.Rows[0].Cells[1].Value, dataGridView_Catm1.Rows[0].Cells[2].Value, dataGridView_Catm1.Rows[0].Cells[3].Value);
1316
+            for (int i = 0; i < 4; i++)
1317
+                dataGridView_Catm1.Rows[0].Cells[i].Value = null;
1318
+
1319
+            //Catm1_DataxlsWrite(Dst_Xls_File, dataGridView_Catm1.Rows[0].Cells[0].Value, dataGridView_Catm1.Rows[0].Cells[1].Value, dataGridView_Catm1.Rows[0].Cells[2].Value, dataGridView_Catm1.Rows[0].Cells[3].Value);
1320
+            //  dataGridView_Catm1.Rows[0].Cells[0].Value = null;
1321
+            // dataGridView_Catm1.Rows[0].Cells[1].Value = null;
1322
+
1323
+            //   if (!di.Exists) { di.Create(); }
1324
+            //string tmppath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
1325
+#if false
1326
+            if (dataGridView_Gps.Rows[0].Cells[1].Value != null)
1327
+            {
1328
+                string path = @"xxxx.txt";
1329
+                FileInfo file = new FileInfo(path);
1330
+                if (file.Exists)
1331
+                { //파일이 있는지
1332
+                  //복사(경로,덮어쓰기 옵션 기본값 false)
1333
+                  //만약 덮어쓰기 false일 때 파일이 존재하면 에러남.
1334
+                    file.CopyTo(@"xxx2.txt", true);
1335
+                }
1336
+            }
1337
+#endif
1338
+        }
1339
+        private void ExcelKill()
1340
+        {
1341
+            System.Diagnostics.Process[] process = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1342
+            foreach (System.Diagnostics.Process p in process)
1343
+            {
1344
+                if (!string.IsNullOrEmpty(p.ProcessName))
1345
+                {
1346
+                    try
1347
+                    {
1348
+                        p.Kill();
1349
+                    }
1350
+                    catch { }
1351
+                }
1352
+            }
1353
+        }
1128 1354
         Excel.Application ExcelApp = null;
1129 1355
         Excel.Workbook wb = null;
1130 1356
         Excel.Worksheet ws = null;
1131
-        private void Gps_DataxlsWrite(object dst)
1357
+        private void Gps_DataxlsWrite(object dst, object Value1, object Value2)
1132 1358
         {
1133 1359
 
1134
- 
1135 1360
 
1136
-            #region // 프로세스 얻기 
1137
-            System.Diagnostics.Process[] BeforeExcelProcess;
1138
-            BeforeExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1139
-            ArrayList arlProcessID = new ArrayList();
1140
-            for (int i = 0; i < BeforeExcelProcess.Length; i++)
1141
-            {
1142
-                arlProcessID.Add(BeforeExcelProcess[i].Id);
1143
-            }
1144
-            #endregion
1145 1361
 
1362
+            /*  #region // 프로세스 얻기 
1363
+              System.Diagnostics.Process[] BeforeExcelProcess;
1364
+              BeforeExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1365
+              ArrayList arlProcessID = new ArrayList();
1366
+              for (int i = 0; i < BeforeExcelProcess.Length; i++)
1367
+              {
1368
+                  arlProcessID.Add(BeforeExcelProcess[i].Id);
1369
+              }
1370
+              #endregion
1371
+              */
1372
+            ExcelKill();
1146 1373
             //Write
1147 1374
 
1148 1375
             //파일이 존재 한다면..삭제 하고..
@@ -1153,21 +1380,35 @@ namespace APL_TestCheck
1153 1380
             try
1154 1381
             {
1155 1382
                 ExcelApp = new Excel.Application();
1383
+                Thread.Sleep(1);
1384
+                try
1385
+                {
1386
+                    wb = ExcelApp.Workbooks.Open(dst.ToString(), 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
1387
+                       Missing.Value, true, false, Missing.Value, false, false, false);
1388
+                }
1389
+                catch { ExcelKill(); return; }
1390
+                Thread.Sleep(1);
1391
+                ws = wb.Worksheets["Sheet1"] as Excel.Worksheet;
1392
+                Thread.Sleep(1);
1393
+                /*ExcelApp = new Excel.Application();
1156 1394
                 wb = ExcelApp.Workbooks.Open(dst.ToString(), 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
1157 1395
                    Missing.Value, true, false, Missing.Value, false, false, false);
1396
+                wb = ExcelApp.Workbooks.Open(dst.ToString());*/
1397
+
1398
+
1158 1399
                 ws = wb.Worksheets["Sheet1"] as Excel.Worksheet;
1159 1400
 
1160 1401
                 //엑셀 시트 인덱스 번호는 0,0 부터 시작 하는 것이 아니라 1,1 A1 부터 시작 함. 0,0 으로 시작하면 오류...
1161 1402
                 //시트에 값 쓰기...
1162
-                ws.Cells[8, 9] = dataGridView_Gps.Rows[0].Cells[0].Value;
1163
-                ws.Cells[8, 11] = dataGridView_Gps.Rows[0].Cells[1].Value;
1403
+                ws.Cells[8, 9] = Value1.ToString();//dataGridView_Gps.Rows[0].Cells[0].Value;
1404
+                ws.Cells[8, 11] = Value2.ToString();//dataGridView_Gps.Rows[0].Cells[1].Value;
1164 1405
                                            /*ws.Cells[1, 3] = "123";
1165 1406
                                            ws.Cells[1, 4] = "1234";
1166 1407
                                            ws.Cells[2, 1] = "Test1"; //A2
1167 1408
                                            ws.Cells[3, 1] = "Test12"; //A3
1168 1409
                                            ws.Cells[4, 1] = "Test123"; //A4*/
1169 1410
 
1170
-                
1411
+
1171 1412
                 //다른 이름으로 저장하기...
1172 1413
                 wb.Save(); // => 오픈한 파일 그대로 저장...
1173 1414
                /* wb.SaveAs("C:\\Test.xls",
@@ -1194,7 +1435,7 @@ namespace APL_TestCheck
1194 1435
                 ReleaseExcelObject(ws);
1195 1436
                 ReleaseExcelObject(wb);
1196 1437
                 ReleaseExcelObject(ExcelApp);
1197
-                #region // 프로세스 죽이기
1438
+              /*  #region // 프로세스 죽이기
1198 1439
                 System.Diagnostics.Process[] AfterExcelProcess;
1199 1440
                 AfterExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1200 1441
 
@@ -1207,7 +1448,7 @@ namespace APL_TestCheck
1207 1448
                     }
1208 1449
                     catch { }
1209 1450
                 }
1210
-                #endregion
1451
+                #endregion*/
1211 1452
                 GC.Collect();
1212 1453
             }
1213 1454
             finally
@@ -1216,7 +1457,7 @@ namespace APL_TestCheck
1216 1457
                 ReleaseExcelObject(ws);
1217 1458
                 ReleaseExcelObject(wb);
1218 1459
                 ReleaseExcelObject(ExcelApp);
1219
-                #region // 프로세스 죽이기
1460
+              /*  #region // 프로세스 죽이기
1220 1461
                 System.Diagnostics.Process[] AfterExcelProcess;
1221 1462
                 AfterExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1222 1463
 
@@ -1229,24 +1470,24 @@ namespace APL_TestCheck
1229 1470
                     }
1230 1471
                     catch { }
1231 1472
                 }
1232
-                #endregion
1473
+                #endregion*/
1233 1474
                 //ExcelApp = null;
1234 1475
                 GC.Collect();
1235 1476
             }
1236 1477
         }
1237
-        private void Sensor_DataxlsWrite(string dst)
1478
+        private void Sensor_DataxlsWrite(object dst)
1238 1479
         {
1239
-   
1240 1480
 
1241
-            #region // 프로세스 얻기 
1242
-            System.Diagnostics.Process[] BeforeExcelProcess;
1243
-            BeforeExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1244
-            ArrayList arlProcessID = new ArrayList();
1245
-            for (int i = 0; i < BeforeExcelProcess.Length; i++)
1246
-            {
1247
-                arlProcessID.Add(BeforeExcelProcess[i].Id);
1248
-            }
1249
-            #endregion
1481
+            ExcelKill();
1482
+            /* #region // 프로세스 얻기 
1483
+             System.Diagnostics.Process[] BeforeExcelProcess;
1484
+             BeforeExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1485
+             ArrayList arlProcessID = new ArrayList();
1486
+             for (int i = 0; i < BeforeExcelProcess.Length; i++)
1487
+             {
1488
+                 arlProcessID.Add(BeforeExcelProcess[i].Id);
1489
+             }
1490
+             #endregion*/
1250 1491
             //Write
1251 1492
 
1252 1493
             //파일이 존재 한다면..삭제 하고..
@@ -1257,9 +1498,16 @@ namespace APL_TestCheck
1257 1498
             try
1258 1499
             {
1259 1500
                 ExcelApp = new Excel.Application();
1260
-                wb = ExcelApp.Workbooks.Open(dst, 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
1261
-                   Missing.Value, true, false, Missing.Value, false, false, false);
1501
+                Thread.Sleep(1);
1502
+                try
1503
+                {
1504
+                    wb = ExcelApp.Workbooks.Open(dst.ToString(), 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
1505
+                       Missing.Value, true, false, Missing.Value, false, false, false);
1506
+                }
1507
+                catch { ExcelKill(); return; }
1508
+                Thread.Sleep(1);
1262 1509
                 ws = wb.Worksheets["Sheet1"] as Excel.Worksheet;
1510
+                Thread.Sleep(1);
1263 1511
 
1264 1512
                 //엑셀 시트 인덱스 번호는 0,0 부터 시작 하는 것이 아니라 1,1 A1 부터 시작 함. 0,0 으로 시작하면 오류...
1265 1513
                 //시트에 값 쓰기...
@@ -1268,13 +1516,13 @@ namespace APL_TestCheck
1268 1516
                 ws.Cells[8, 6] = dataGridView_Sensor.Rows[0].Cells[2].Value; //IMEI 
1269 1517
                 ws.Cells[8, 7] = dataGridView_Sensor.Rows[0].Cells[3].Value;// PHONE
1270 1518
                 ws.Cells[8, 8] = dataGridView_Sensor.Rows[0].Cells[4].Value;//USIM
1271
-                ws.Cells[8, 10] = dataGridView_Sensor.Rows[0].Cells[5].Value;//VER
1272
-                ws.Cells[8, 13] = dataGridView_Sensor.Rows[0].Cells[6].Value;//BATT
1273
-                ws.Cells[8, 14] = dataGridView_Sensor.Rows[0].Cells[7].Value;//SYS
1274
-                ws.Cells[8, 15] = dataGridView_Sensor.Rows[0].Cells[8].Value;//TEMP
1275
-                ws.Cells[8, 16] = dataGridView_Sensor.Rows[0].Cells[9].Value;//BMA
1276
-                ws.Cells[8, 17] = dataGridView_Sensor.Rows[0].Cells[10].Value;//BMA
1277
-                ws.Cells[8, 18] = dataGridView_Sensor.Rows[0].Cells[11].Value;//BMA
1519
+                ws.Cells[8, 10] = dataGridView_Sensor.Rows[0].Cells[5].Value;//FIRM VER
1520
+                ws.Cells[8, 18] = dataGridView_Sensor.Rows[0].Cells[6].Value;//BATT
1521
+                ws.Cells[8, 19] = dataGridView_Sensor.Rows[0].Cells[7].Value;//SYS
1522
+                ws.Cells[8, 20] = dataGridView_Sensor.Rows[0].Cells[8].Value;//TEMP
1523
+                ws.Cells[8, 21] = dataGridView_Sensor.Rows[0].Cells[9].Value;//BMA
1524
+                ws.Cells[8, 22] = dataGridView_Sensor.Rows[0].Cells[10].Value;//BMA
1525
+                ws.Cells[8, 23] = dataGridView_Sensor.Rows[0].Cells[11].Value;//BMA
1278 1526
                 /*ws.Cells[1, 3] = "123";
1279 1527
                 ws.Cells[1, 4] = "1234";
1280 1528
                 ws.Cells[2, 1] = "Test1"; //A2
@@ -1309,7 +1557,7 @@ namespace APL_TestCheck
1309 1557
                 ReleaseExcelObject(ws);
1310 1558
                 ReleaseExcelObject(wb);
1311 1559
                 ReleaseExcelObject(ExcelApp);
1312
-                #region // 프로세스 죽이기
1560
+              /*  #region // 프로세스 죽이기
1313 1561
                 System.Diagnostics.Process[] AfterExcelProcess;
1314 1562
                 AfterExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1315 1563
 
@@ -1322,7 +1570,7 @@ namespace APL_TestCheck
1322 1570
                     }
1323 1571
                     catch { }
1324 1572
                 }
1325
-                #endregion
1573
+                #endregion*/
1326 1574
                 GC.Collect();
1327 1575
             }
1328 1576
             finally
@@ -1331,7 +1579,7 @@ namespace APL_TestCheck
1331 1579
                 ReleaseExcelObject(ws);
1332 1580
                 ReleaseExcelObject(wb);
1333 1581
                 ReleaseExcelObject(ExcelApp);
1334
-                #region // 프로세스 죽이기
1582
+              /*  #region // 프로세스 죽이기
1335 1583
                 System.Diagnostics.Process[] AfterExcelProcess;
1336 1584
                 AfterExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1337 1585
 
@@ -1344,7 +1592,120 @@ namespace APL_TestCheck
1344 1592
                     }
1345 1593
                     catch { }
1346 1594
                 }
1347
-                #endregion
1595
+                #endregion*/
1596
+                GC.Collect();
1597
+            }
1598
+        }
1599
+        private void Catm1_DataxlsWrite(object dst, object Product, object Modemver, object Rsrp, object Rsrq)
1600
+        {
1601
+
1602
+            ExcelKill();
1603
+            /* #region // 프로세스 얻기 
1604
+             System.Diagnostics.Process[] BeforeExcelProcess;
1605
+             BeforeExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1606
+             ArrayList arlProcessID = new ArrayList();
1607
+             for (int i = 0; i < BeforeExcelProcess.Length; i++)
1608
+             {
1609
+                 arlProcessID.Add(BeforeExcelProcess[i].Id);
1610
+             }
1611
+             #endregion*/
1612
+            //Write
1613
+
1614
+            //파일이 존재 한다면..삭제 하고..
1615
+            /*if (File.Exists("C:\\Test.xls"))
1616
+            {
1617
+                File.Delete("C:\\Test.xls");
1618
+            }*/
1619
+            try
1620
+            {
1621
+                ExcelApp = new Excel.Application();
1622
+                Thread.Sleep(1);
1623
+                try
1624
+                {
1625
+                    wb = ExcelApp.Workbooks.Open(dst.ToString(), 0, false, 5, Missing.Value, Missing.Value, false, Missing.Value,
1626
+                       Missing.Value, true, false, Missing.Value, false, false, false);
1627
+                }
1628
+                catch { ExcelKill(); return; }
1629
+                Thread.Sleep(1);
1630
+                ws = wb.Worksheets["Sheet1"] as Excel.Worksheet;
1631
+                Thread.Sleep(1);
1632
+
1633
+                //엑셀 시트 인덱스 번호는 0,0 부터 시작 하는 것이 아니라 1,1 A1 부터 시작 함. 0,0 으로 시작하면 오류...
1634
+                //시트에 값 쓰기...
1635
+                ws.Cells[8, 9] = Product.ToString();//dataGridView_Catm1.Rows[0].Cells[0].Value; //Bluecell 제조 번호
1636
+                ws.Cells[8, 12] = Modemver.ToString(); //dataGridView_Catm1.Rows[0].Cells[5].Value;//RSRP
1637
+                ws.Cells[8, 13] = Rsrp.ToString(); //dataGridView_Catm1.Rows[0].Cells[6].Value;//RSRQ
1638
+                ws.Cells[8, 14] = Rsrq.ToString(); //dataGridView_Catm1.Rows[0].Cells[6].Value;//RSRQ
1639
+                /*ws.Cells[1, 3] = "123";
1640
+                ws.Cells[1, 4] = "1234";
1641
+                ws.Cells[2, 1] = "Test1"; //A2
1642
+                ws.Cells[3, 1] = "Test12"; //A3
1643
+                ws.Cells[4, 1] = "Test123"; //A4*/
1644
+
1645
+
1646
+                //다른 이름으로 저장하기...
1647
+                wb.Save(); // => 오픈한 파일 그대로 저장...
1648
+                           /* wb.SaveAs("C:\\Test.xls",
1649
+                                      Excel.XlFileFormat.xlWorkbookNormal,
1650
+                                      Type.Missing,
1651
+                                      Type.Missing,
1652
+                                      Type.Missing,
1653
+                                      Type.Missing,
1654
+                                      Excel.XlSaveAsAccessMode.xlNoChange,
1655
+                                      Type.Missing,
1656
+                                      Type.Missing,
1657
+                                      Type.Missing,
1658
+                                      Type.Missing,
1659
+                                      Type.Missing);
1660
+                                      */
1661
+                           //파일 닫기... 
1662
+                wb.Close(false, Type.Missing, Type.Missing);
1663
+                // wb = null;
1664
+                ExcelApp.Quit();
1665
+                //ExcelApp = null;
1666
+            }
1667
+            catch (Exception ex)
1668
+            {
1669
+                //객체들 메모리 해제
1670
+                ReleaseExcelObject(ws);
1671
+                ReleaseExcelObject(wb);
1672
+                ReleaseExcelObject(ExcelApp);
1673
+                /*  #region // 프로세스 죽이기
1674
+                  System.Diagnostics.Process[] AfterExcelProcess;
1675
+                  AfterExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1676
+
1677
+                  for (int i = 0; i < AfterExcelProcess.Length; i++)
1678
+                  {
1679
+                      try
1680
+                      {
1681
+                          if (!arlProcessID.Contains(AfterExcelProcess[i].Id))
1682
+                              AfterExcelProcess[i].Kill();
1683
+                      }
1684
+                      catch { }
1685
+                  }
1686
+                  #endregion*/
1687
+                GC.Collect();
1688
+            }
1689
+            finally
1690
+            {
1691
+                //객체들 메모리 해제
1692
+                ReleaseExcelObject(ws);
1693
+                ReleaseExcelObject(wb);
1694
+                ReleaseExcelObject(ExcelApp);
1695
+                /*  #region // 프로세스 죽이기
1696
+                  System.Diagnostics.Process[] AfterExcelProcess;
1697
+                  AfterExcelProcess = System.Diagnostics.Process.GetProcessesByName("EXCEL");
1698
+
1699
+                  for (int i = 0; i < AfterExcelProcess.Length; i++)
1700
+                  {
1701
+                      try
1702
+                      {
1703
+                          if (!arlProcessID.Contains(AfterExcelProcess[i].Id))
1704
+                              AfterExcelProcess[i].Kill();
1705
+                      }
1706
+                      catch { }
1707
+                  }
1708
+                  #endregion*/
1348 1709
                 GC.Collect();
1349 1710
             }
1350 1711
         }
@@ -1845,7 +2206,7 @@ namespace APL_TestCheck
1845 2206
         {
1846 2207
             string value = "";
1847 2208
             //BL-VITE00-V
1848
-            if (InputBox("번호 입력", "일련 번호:", ref value) == DialogResult.OK && dataGridView_Gps.Rows[0].Cells[1].Value != null)
2209
+            if (InputBox("번호 입력", "생산 번호:", ref value) == DialogResult.OK && dataGridView_Gps.Rows[0].Cells[1].Value != null)
1849 2210
             {
1850 2211
                 // SN
1851 2212
                 dataGridView_Gps.Rows[0].Cells[0].Value = Name = value;
@@ -1854,6 +2215,20 @@ namespace APL_TestCheck
1854 2215
 
1855 2216
             }
1856 2217
         }
2218
+
2219
+        private void dataGridView_Catm1_CellClick(object sender, DataGridViewCellEventArgs e)
2220
+        {
2221
+            string value = "";
2222
+            //BL-VITE00-V
2223
+            if (InputBox("번호 입력", "생산 번호:", ref value) == DialogResult.OK && dataGridView_Catm1.Rows[0].Cells[1].Value != null)
2224
+            {
2225
+                // SN
2226
+                dataGridView_Catm1.Rows[0].Cells[0].Value = Name = value;
2227
+                button_Catm1TestSave();
2228
+                dataGridView_Catm1_CellClick(null, null);
2229
+
2230
+            }
2231
+        }
1857 2232
     }
1858 2233
     class AutoClosingMessageBox
1859 2234
     {

+ 69 - 3
Main.resx

@@ -120,6 +120,42 @@
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="RSRQ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133
+    <value>True</value>
134
+  </metadata>
135
+  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
136
+    <value>True</value>
137
+  </metadata>
138
+  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139
+    <value>True</value>
140
+  </metadata>
141
+  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142
+    <value>True</value>
143
+  </metadata>
144
+  <metadata name="RSRQ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
145
+    <value>True</value>
146
+  </metadata>
147
+  <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
148
+    <value>True</value>
149
+  </metadata>
150
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
151
+    <value>True</value>
152
+  </metadata>
153
+  <metadata name="LitmitMinimum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
154
+    <value>True</value>
155
+  </metadata>
156
+  <metadata name="LitmitMaximum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
157
+    <value>True</value>
158
+  </metadata>
123 159
   <metadata name="Gps_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124 160
     <value>True</value>
125 161
   </metadata>
@@ -269,13 +305,40 @@
269 305
   <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
270 306
     <value>True</value>
271 307
   </metadata>
272
-  <metadata name="Catm1_SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
308
+  <metadata name="ProductNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
273 309
     <value>True</value>
274 310
   </metadata>
275
-  <metadata name="Modem_Ver.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
311
+  <metadata name="SN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
276 312
     <value>True</value>
277 313
   </metadata>
278
-  <metadata name="RSRP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
314
+  <metadata name="IMEI.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
315
+    <value>True</value>
316
+  </metadata>
317
+  <metadata name="Phone.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
318
+    <value>True</value>
319
+  </metadata>
320
+  <metadata name="USIM.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
321
+    <value>True</value>
322
+  </metadata>
323
+  <metadata name="Version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
324
+    <value>True</value>
325
+  </metadata>
326
+  <metadata name="BatteryVoltage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
327
+    <value>True</value>
328
+  </metadata>
329
+  <metadata name="SystemVoltage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
330
+    <value>True</value>
331
+  </metadata>
332
+  <metadata name="Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
333
+    <value>True</value>
334
+  </metadata>
335
+  <metadata name="BMA_X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
336
+    <value>True</value>
337
+  </metadata>
338
+  <metadata name="BMA_Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
339
+    <value>True</value>
340
+  </metadata>
341
+  <metadata name="BMA_Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
279 342
     <value>True</value>
280 343
   </metadata>
281 344
   <metadata name="folderBrowserDialog_Mainpath.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -284,6 +347,9 @@
284 347
   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
285 348
     <value>329, 17</value>
286 349
   </metadata>
350
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
351
+    <value>90</value>
352
+  </metadata>
287 353
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
288 354
     <value>
289 355
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAMMOAADDDgAAAAAAAAAA

BIN
bin/Debug/APL_200303.xls


BIN
bin/Debug/APL_TestCheck (2).zip


BIN
bin/Debug/APL_TestCheck.exe


BIN
bin/Debug/APL_TestCheck.pdb


BIN
bin/Debug/APL_TestCheck.zip


BIN
obj/Debug/APL_TestCheck.csproj.GenerateResource.cache


BIN
obj/Debug/APL_TestCheck.exe


BIN
obj/Debug/APL_TestCheck.pdb