记录日志调整，维修添加记录不良备注

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -183,6 +183,8 @@ namespace UAS_MES.Make
         private void LoadBadInfTree(object sender, EventArgs e)
         {
             BadCodeTree.Nodes.Clear();
+            BadInf_1.Clear();
+            BadInf_2.Clear();
             sql.Clear();
             sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,nvl(bc_name,mb_badcode) bc_name,nvl(bg_name,mb_bgcode) bg_name,");
             sql.Append("mb_badremark from makebad left join badcode on bc_code=mb_badcode left join badgroup ");
@@ -382,6 +384,9 @@ namespace UAS_MES.Make
                 }
             }
             OperatResult.AppendText(">>不良位置保存成功\n", Color.Green);
+            //将不良备注更新回数据库，同时更新本地缓存数据    
+            dh.ExecuteSql("update makebad set mb_badremark='"+mb_badremark.Text+"' where mb_id='"+mb_id+"'", "update");
+            BadInf_1[mb_id]["mb_badremark"] = mb_badremark.Text;
         }
 
         private void DeleteRepairInf_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/OQC/OQC_Inspection.Designer.cs

@@ -72,9 +72,8 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1220, 35);
+            this.panel2.Size = new System.Drawing.Size(915, 28);
             this.panel2.TabIndex = 89;
             this.panel2.Tag = "NoAuto";
             // 
@@ -83,10 +82,9 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(8, 4);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(6, 3);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(157, 27);
+            this.label1.Size = new System.Drawing.Size(127, 21);
             this.label1.TabIndex = 0;
             this.label1.Text = "OQC生成送检批";
             // 
@@ -94,10 +92,9 @@
             // 
             this.obd_makecode_label.AutoSize = true;
             this.obd_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_makecode_label.Location = new System.Drawing.Point(32, 174);
-            this.obd_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.obd_makecode_label.Location = new System.Drawing.Point(24, 139);
             this.obd_makecode_label.Name = "obd_makecode_label";
-            this.obd_makecode_label.Size = new System.Drawing.Size(72, 27);
+            this.obd_makecode_label.Size = new System.Drawing.Size(58, 21);
             this.obd_makecode_label.TabIndex = 144;
             this.obd_makecode_label.Text = "工单号";
             // 
@@ -105,10 +102,9 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(32, 128);
-            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_sncode_label.Location = new System.Drawing.Point(24, 102);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
             this.ms_sncode_label.TabIndex = 146;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -116,10 +112,9 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(35, 84);
-            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(26, 68);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.obd_outboxcode_label.TabIndex = 148;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -127,10 +122,9 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(32, 48);
-            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno_label.Location = new System.Drawing.Point(24, 38);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
             this.ob_checkno_label.TabIndex = 150;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -138,10 +132,9 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(351, 171);
-            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(263, 139);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ob_prodcode_label.TabIndex = 152;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -149,10 +142,9 @@
             // 
             this.ob_status_label.AutoSize = true;
             this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(688, 174);
-            this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_status_label.Location = new System.Drawing.Point(516, 139);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_status_label.Size = new System.Drawing.Size(74, 21);
             this.ob_status_label.TabIndex = 154;
             this.ob_status_label.Text = "批次状态";
             // 
@@ -160,10 +152,9 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(29, 632);
-            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(22, 506);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_batchqty_label.TabIndex = 160;
             this.ob_batchqty_label.Text = "批数量";
             // 
@@ -171,10 +162,9 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(29, 676);
-            this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(22, 541);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_outboxcode_label.TabIndex = 162;
             this.pa_outboxcode_label.Text = "输入箱号";
             // 
@@ -182,10 +172,9 @@
             // 
             this.WithDraw.AutoSize = true;
             this.WithDraw.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WithDraw.Location = new System.Drawing.Point(556, 676);
-            this.WithDraw.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WithDraw.Location = new System.Drawing.Point(417, 541);
             this.WithDraw.Name = "WithDraw";
-            this.WithDraw.Size = new System.Drawing.Size(74, 31);
+            this.WithDraw.Size = new System.Drawing.Size(61, 25);
             this.WithDraw.TabIndex = 169;
             this.WithDraw.Text = "撤销";
             this.WithDraw.UseVisualStyleBackColor = true;
@@ -197,13 +186,12 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(136, 174);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_code.Location = new System.Drawing.Point(102, 140);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(207, 26);
+            this.ma_code.Size = new System.Drawing.Size(155, 21);
             this.ma_code.TabIndex = 176;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = false;
@@ -216,13 +204,12 @@
             this.ChooseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ChooseAll.Image = ((System.Drawing.Image)(resources.GetObject("ChooseAll.Image")));
             this.ChooseAll.IsShowBorder = true;
-            this.ChooseAll.Location = new System.Drawing.Point(739, 634);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseAll.Location = new System.Drawing.Point(554, 507);
             this.ChooseAll.MoveImage = ((System.Drawing.Image)(resources.GetObject("ChooseAll.MoveImage")));
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.NormalImage = ((System.Drawing.Image)(resources.GetObject("ChooseAll.NormalImage")));
             this.ChooseAll.Power = null;
-            this.ChooseAll.Size = new System.Drawing.Size(80, 30);
+            this.ChooseAll.Size = new System.Drawing.Size(60, 24);
             this.ChooseAll.TabIndex = 175;
             this.ChooseAll.Text = "全部勾选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -231,10 +218,9 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(931, 219);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(698, 175);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(280, 398);
+            this.OperateResult.Size = new System.Drawing.Size(211, 319);
             this.OperateResult.TabIndex = 174;
             this.OperateResult.Text = "";
             // 
@@ -246,13 +232,12 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1029, 632);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Location = new System.Drawing.Point(772, 506);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(80, 30);
+            this.Clean.Size = new System.Drawing.Size(60, 24);
             this.Clean.TabIndex = 173;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -266,13 +251,12 @@
             this.Delete.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Delete.Image = ((System.Drawing.Image)(resources.GetObject("Delete.Image")));
             this.Delete.IsShowBorder = true;
-            this.Delete.Location = new System.Drawing.Point(213, 712);
-            this.Delete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Delete.Location = new System.Drawing.Point(160, 570);
             this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
             this.Delete.Name = "Delete";
             this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
             this.Delete.Power = "ifDelete";
-            this.Delete.Size = new System.Drawing.Size(80, 30);
+            this.Delete.Size = new System.Drawing.Size(60, 24);
             this.Delete.TabIndex = 172;
             this.Delete.Text = "删除";
             this.Delete.UseVisualStyleBackColor = true;
@@ -287,13 +271,12 @@
             this.SendOQC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SendOQC.Image = ((System.Drawing.Image)(resources.GetObject("SendOQC.Image")));
             this.SendOQC.IsShowBorder = true;
-            this.SendOQC.Location = new System.Drawing.Point(361, 712);
-            this.SendOQC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SendOQC.Location = new System.Drawing.Point(271, 570);
             this.SendOQC.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendOQC.MoveImage")));
             this.SendOQC.Name = "SendOQC";
             this.SendOQC.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendOQC.NormalImage")));
             this.SendOQC.Power = null;
-            this.SendOQC.Size = new System.Drawing.Size(80, 30);
+            this.SendOQC.Size = new System.Drawing.Size(60, 24);
             this.SendOQC.TabIndex = 171;
             this.SendOQC.Text = "送检";
             this.SendOQC.UseVisualStyleBackColor = true;
@@ -307,13 +290,12 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(931, 175);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GetBatch.Location = new System.Drawing.Point(698, 140);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(80, 30);
+            this.GetBatch.Size = new System.Drawing.Size(60, 24);
             this.GetBatch.TabIndex = 170;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -324,11 +306,10 @@
             this.pa_outboxcode.AllPower = null;
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(156, 678);
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_outboxcode.Location = new System.Drawing.Point(117, 542);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(388, 25);
+            this.pa_outboxcode.Size = new System.Drawing.Size(292, 21);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
@@ -341,11 +322,10 @@
             this.ob_batchqty.AllPower = null;
             this.ob_batchqty.BackColor = System.Drawing.Color.White;
             this.ob_batchqty.ID = null;
-            this.ob_batchqty.Location = new System.Drawing.Point(156, 634);
-            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_batchqty.Location = new System.Drawing.Point(117, 507);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Power = null;
-            this.ob_batchqty.Size = new System.Drawing.Size(388, 25);
+            this.ob_batchqty.Size = new System.Drawing.Size(292, 21);
             this.ob_batchqty.Str = null;
             this.ob_batchqty.Str1 = null;
             this.ob_batchqty.Str2 = null;
@@ -360,13 +340,12 @@
             this.RemoveAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.RemoveAll.Image = ((System.Drawing.Image)(resources.GetObject("RemoveAll.Image")));
             this.RemoveAll.IsShowBorder = true;
-            this.RemoveAll.Location = new System.Drawing.Point(843, 634);
-            this.RemoveAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RemoveAll.Location = new System.Drawing.Point(632, 507);
             this.RemoveAll.MoveImage = ((System.Drawing.Image)(resources.GetObject("RemoveAll.MoveImage")));
             this.RemoveAll.Name = "RemoveAll";
             this.RemoveAll.NormalImage = ((System.Drawing.Image)(resources.GetObject("RemoveAll.NormalImage")));
             this.RemoveAll.Power = "ifDelete";
-            this.RemoveAll.Size = new System.Drawing.Size(80, 30);
+            this.RemoveAll.Size = new System.Drawing.Size(60, 24);
             this.RemoveAll.TabIndex = 159;
             this.RemoveAll.Text = "全部移除";
             this.RemoveAll.UseVisualStyleBackColor = true;
@@ -380,13 +359,12 @@
             this.NewBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NewBatch.Image = ((System.Drawing.Image)(resources.GetObject("NewBatch.Image")));
             this.NewBatch.IsShowBorder = true;
-            this.NewBatch.Location = new System.Drawing.Point(931, 128);
-            this.NewBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.NewBatch.Location = new System.Drawing.Point(698, 102);
             this.NewBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewBatch.MoveImage")));
             this.NewBatch.Name = "NewBatch";
             this.NewBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewBatch.NormalImage")));
             this.NewBatch.Power = "ifWrite";
-            this.NewBatch.Size = new System.Drawing.Size(80, 30);
+            this.NewBatch.Size = new System.Drawing.Size(60, 24);
             this.NewBatch.TabIndex = 156;
             this.NewBatch.Tag = "OQC!Inspection";
             this.NewBatch.Text = "生成新批";
@@ -399,11 +377,10 @@
             this.ob_status.BackColor = System.Drawing.Color.White;
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(817, 178);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_status.Location = new System.Drawing.Point(613, 140);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(103, 25);
+            this.ob_status.Size = new System.Drawing.Size(78, 21);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -416,11 +393,10 @@
             this.ma_prodcode.BackColor = System.Drawing.Color.White;
             this.ma_prodcode.Enabled = false;
             this.ma_prodcode.ID = null;
-            this.ma_prodcode.Location = new System.Drawing.Point(479, 175);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_prodcode.Location = new System.Drawing.Point(359, 140);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(187, 25);
+            this.ma_prodcode.Size = new System.Drawing.Size(141, 21);
             this.ma_prodcode.Str = null;
             this.ma_prodcode.Str1 = null;
             this.ma_prodcode.Str2 = null;
@@ -432,11 +408,10 @@
             this.ob_checkno.AllPower = null;
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(137, 52);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_checkno.Location = new System.Drawing.Point(103, 42);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = null;
-            this.ob_checkno.Size = new System.Drawing.Size(424, 25);
+            this.ob_checkno.Size = new System.Drawing.Size(319, 21);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -450,11 +425,10 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(137, 90);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.obd_outboxcode.Location = new System.Drawing.Point(103, 73);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(424, 25);
+            this.obd_outboxcode.Size = new System.Drawing.Size(319, 21);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -467,11 +441,10 @@
             this.ms_sncode.AllPower = null;
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(137, 132);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ms_sncode.Location = new System.Drawing.Point(103, 106);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(424, 25);
+            this.ms_sncode.Size = new System.Drawing.Size(319, 21);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -489,12 +462,11 @@
             this.obd_outboxcode_dgv,
             this.obd_id,
             this.obd_makecode});
-            this.CheckBatchDGV.Location = new System.Drawing.Point(36, 218);
-            this.CheckBatchDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CheckBatchDGV.Location = new System.Drawing.Point(27, 174);
             this.CheckBatchDGV.Name = "CheckBatchDGV";
             this.CheckBatchDGV.RowHeadersWidth = 20;
             this.CheckBatchDGV.RowTemplate.Height = 23;
-            this.CheckBatchDGV.Size = new System.Drawing.Size(887, 398);
+            this.CheckBatchDGV.Size = new System.Drawing.Size(665, 318);
             this.CheckBatchDGV.TabIndex = 90;
             this.CheckBatchDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckBatchDGV_CellContentClick);
             this.CheckBatchDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridViewExpand1_DataError);
@@ -538,9 +510,9 @@
             // 
             // OQC_Inspection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1220, 750);
+            this.ClientSize = new System.Drawing.Size(915, 600);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.OperateResult);
@@ -569,7 +541,6 @@
             this.Controls.Add(this.CheckBatchDGV);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "OQC_Inspection";
             this.Tag = "OQC!Inspection";
             this.Text = "生成送检批";

UAS-MES/FunctionCode/OQC/OQC_Inspection.resx

@@ -1050,4 +1050,19 @@
   <metadata name="obd_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="勾选.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ob_batchqty_dgv.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="obd_outboxcode_dgv.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="obd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="obd_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -88,7 +88,6 @@ namespace UAS_MES.OQC
                         }
                         else
                         {
-
                             string oMakeCode = "";
                             string oMsID = "";
                             if (LogicHandler.CheckStepSNAndMacode(dt.Rows[0]["ob_makecode"].ToString(), User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
@@ -229,7 +228,7 @@ namespace UAS_MES.OQC
                         if (LogicHandler.SetStepFinish(ob_makecode.Text, User.UserSourceCode, sncode.Text, "OQC检查", "抽样数据采集完成", User.UserCode, out ErrorMessage))
                         {
                             OperateResult.AppendText(">>操作成功\n", Color.Green);
-                            GetBatchTypeGridData();
+                            GetBatch.PerformClick();
                             ChoosedDGV.DataSource = null;
                             TempForCheckType.Clear();
                         }

UAS-MES/Login.cs

@@ -60,12 +60,7 @@ namespace UAS_MES
                 PassWord.Select();
             else
                 UserName.Select();
-            //本来static是不要实例化的，但是需要调用触发添加键值对的构造函数
-            if (lgc == null)
-                lgc = new LogicHandler();
             BaseUtil.SetFormCenter(this);
-            //try { CertImport(); }
-            //catch (Exception) { }
         }
 
         //点击登陆按钮的时候
@@ -99,16 +94,14 @@ namespace UAS_MES
                     SetInf();//设置User的全局变量
                     LogManager.DoLog("登陆成功" + User.UserName + ",超级用户");
                     string Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
-                    LogicHandler.RecordLogInf(User.UserCode,User.UserName, Version, BaseUtil.GetLocalIP());
+                    LogicHandler.RecordLogInf(User.UserCode, User.UserName, Version, BaseUtil.GetLocalIP(), "CS");
                     Main dialog = new Main();
                     dialog.ShowDialog();
                     this.Close();
                 }
-                else
-                    MessageBox.Show(ErrorMessage);
+                else MessageBox.Show(ErrorMessage);
             }
-            else
-                MessageBox.Show(ErrorMessage);
+            else MessageBox.Show(ErrorMessage);
         }
 
         /// <summary>

UAS-MES/PublicMethod/LogicHandler.cs

@@ -958,10 +958,10 @@ namespace UAS_MES.PublicMethod
         /// </summary>
         /// <param name="iUserCode"></param>
         /// <param name="iIP"></param>
-        public static void RecordLogInf(string iUserCode,string iUserName,string iVersion, string iIP)
+        public static void RecordLogInf(string iUserCode,string iUserName,string iVersion, string iIP,string iType)
         {
             sql.Clear();
-            sql.Append("insert into LOGINFO(ID,SIP,USCODE,USNAME,VERSIONCODE,INDATE) values(LOGINFO_seq.nextval,'" + iIP + "','" + iUserCode + "','"+ iUserName + "','"+ iVersion + "',sysdate)");
+            sql.Append("insert into LOGINFO(ID,SIP,USCODE,USNAME,VERSIONCODE,INDATE,TERMINALTYPE) values(LOGINFO_seq.nextval,'" + iIP + "','" + iUserCode + "','"+ iUserName + "','"+ iVersion + "',sysdate,'"+iType+"')");
             dh.ExecuteSql(sql.ToString(), "insert");
         }
 
@@ -1005,8 +1005,6 @@ namespace UAS_MES.PublicMethod
             oErrorMessage = "";
             string StepCode = dh.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "'").ToString();
             string CurrentStep = GetStepCodeBySource(iSourceCode);
-            Console.WriteLine("StepCode" + StepCode);
-            Console.WriteLine("CurrentStep" + CurrentStep);
             if (StepCode == CurrentStep)
             {
                 InsertMakeProcess(iSN, iMakeCode, iSourceCode, iMPKind, iResult, iUserCode);

UAS-MES/UAS-MES.csproj

@@ -41,7 +41,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>243</ApplicationRevision>
+    <ApplicationRevision>244</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>