下地界面微调

UAS-MES/FunctionCode/Make/Make_MakeCancelDown.Designer.cs

@@ -33,7 +33,6 @@
             this.pr_code = new System.Windows.Forms.Label();
             this.LabelDataGridView = new System.Windows.Forms.DataGridView();
             this.md_reson = new System.Windows.Forms.Label();
-            this.make_count = new System.Windows.Forms.Label();
             this.count_label = new System.Windows.Forms.Label();
             this.md_code_rb = new System.Windows.Forms.RadioButton();
             this.sn_code_rb = new System.Windows.Forms.RadioButton();
@@ -46,6 +45,9 @@
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.make_count = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.choosenum = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.sum = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.mdcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Sure = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -59,8 +61,6 @@
             this.md_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.MD_DOWNMAN = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.inputreson = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.sum = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.choosenum = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -115,16 +115,6 @@
             this.md_reson.TabIndex = 211;
             this.md_reson.Text = "取消下地原因";
             // 
-            // make_count
-            // 
-            this.make_count.AutoSize = true;
-            this.make_count.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.make_count.Location = new System.Drawing.Point(543, 16);
-            this.make_count.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.make_count.Name = "make_count";
-            this.make_count.Size = new System.Drawing.Size(0, 21);
-            this.make_count.TabIndex = 210;
-            // 
             // count_label
             // 
             this.count_label.AutoSize = true;
@@ -249,6 +239,39 @@
             this.dataGridViewTextBoxColumn6.ReadOnly = true;
             this.dataGridViewTextBoxColumn6.Width = 2;
             // 
+            // make_count
+            // 
+            this.make_count.AutoSize = true;
+            this.make_count.CutLength = null;
+            this.make_count.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.make_count.Location = new System.Drawing.Point(544, 16);
+            this.make_count.MaximumSize = new System.Drawing.Size(200, 0);
+            this.make_count.Name = "make_count";
+            this.make_count.Size = new System.Drawing.Size(0, 21);
+            this.make_count.TabIndex = 230;
+            // 
+            // choosenum
+            // 
+            this.choosenum.AutoSize = true;
+            this.choosenum.CutLength = null;
+            this.choosenum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.choosenum.Location = new System.Drawing.Point(238, 294);
+            this.choosenum.MaximumSize = new System.Drawing.Size(200, 0);
+            this.choosenum.Name = "choosenum";
+            this.choosenum.Size = new System.Drawing.Size(0, 21);
+            this.choosenum.TabIndex = 229;
+            // 
+            // sum
+            // 
+            this.sum.AutoSize = true;
+            this.sum.CutLength = null;
+            this.sum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sum.Location = new System.Drawing.Point(136, 293);
+            this.sum.MaximumSize = new System.Drawing.Size(200, 0);
+            this.sum.Name = "sum";
+            this.sum.Size = new System.Drawing.Size(0, 21);
+            this.sum.TabIndex = 228;
+            // 
             // ChooseAll
             // 
             this.ChooseAll.Location = new System.Drawing.Point(22, 293);
@@ -293,7 +316,7 @@
             // 
             // OperateResult
             // 
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            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(435, 322);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(412, 199);
@@ -387,33 +410,12 @@
             this.inputreson.TabIndex = 212;
             this.inputreson.Text = "";
             // 
-            // sum
-            // 
-            this.sum.AutoSize = true;
-            this.sum.CutLength = null;
-            this.sum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sum.Location = new System.Drawing.Point(136, 293);
-            this.sum.MaximumSize = new System.Drawing.Size(200, 0);
-            this.sum.Name = "sum";
-            this.sum.Size = new System.Drawing.Size(0, 21);
-            this.sum.TabIndex = 228;
-            // 
-            // choosenum
-            // 
-            this.choosenum.AutoSize = true;
-            this.choosenum.CutLength = null;
-            this.choosenum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.choosenum.Location = new System.Drawing.Point(238, 294);
-            this.choosenum.MaximumSize = new System.Drawing.Size(200, 0);
-            this.choosenum.Name = "choosenum";
-            this.choosenum.Size = new System.Drawing.Size(0, 21);
-            this.choosenum.TabIndex = 229;
-            // 
             // Make_MakeCancelDown
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(872, 533);
+            this.Controls.Add(this.make_count);
             this.Controls.Add(this.choosenum);
             this.Controls.Add(this.sum);
             this.Controls.Add(this.已选);
@@ -430,7 +432,6 @@
             this.Controls.Add(this.LabelDataGridView);
             this.Controls.Add(this.inputreson);
             this.Controls.Add(this.md_reson);
-            this.Controls.Add(this.make_count);
             this.Controls.Add(this.count_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "Make_MakeCancelDown";
@@ -458,7 +459,6 @@
         private System.Windows.Forms.DataGridView LabelDataGridView;
         private CustomControl.RichText.RichTextAutoBottom inputreson;
         private System.Windows.Forms.Label md_reson;
-        private System.Windows.Forms.Label make_count;
         private System.Windows.Forms.Label count_label;
         private CustomControl.ButtonUtil.NormalButton Sure;
         private CustomControl.TextBoxWithIcon.EnterTextBox mdcode;
@@ -478,5 +478,6 @@
         private System.Windows.Forms.Label 已选;
         private CustomControl.ValueLabel.ValueLabel sum;
         private CustomControl.ValueLabel.ValueLabel choosenum;
+        private CustomControl.ValueLabel.ValueLabel make_count;
     }
 }

UAS-MES/FunctionCode/Make/Make_MakeCancelDown.cs

@@ -87,6 +87,7 @@ namespace UAS_MES.Make
                         BaseUtil.CleanDGVData(LabelDataGridView);
                     }
                     sum.Text = dt1.Rows.Count.ToString();
+                    make_count.Text = dt1.Rows.Count.ToString(); 
                 }
                 else
                 {
@@ -132,7 +133,7 @@ namespace UAS_MES.Make
                 }
                 if (!haveclick)
                 {
-                    OperateResult.AppendText("没有勾选下地记录\n", Color.Red);
+                    OperateResult.AppendText(">>>没有勾选下地记录\n", Color.Red);
                     return;
                 }
                 for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
@@ -153,7 +154,7 @@ namespace UAS_MES.Make
 
                 if (sn_code.Enabled)
                 {
-                    OperateResult.AppendText("序列号" + sn_code.Text + "取消下地成功\n", Color.Green);
+                    OperateResult.AppendText(">>>序列号" + sn_code.Text + "取消下地成功\n", Color.Green);
                     sn_code.Text = "";
                     sn_code.Focus();
                     inputreson.Text = "";
@@ -165,18 +166,19 @@ namespace UAS_MES.Make
                 {
                     sum.Text = "";
                     choosenum.Text = "";
-                    OperateResult.AppendText("事件号" + mdcode.Text + "取消下地成功\n", Color.Green);
+                    OperateResult.AppendText(">>>事件号" + mdcode.Text + "取消下地成功\n", Color.Green);
                     mdcode.Focus();
                     md_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
                 }
             }
             else
             {
-                OperateResult.AppendText("没有填写下地原因\n", Color.Red);
+                OperateResult.AppendText(">>>没有填写下地原因\n", Color.Red);
                 return;
             }
         }
 
+        //已选数据更新
         private void LabelDataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         {
             int choosecount = 0;
@@ -193,6 +195,7 @@ namespace UAS_MES.Make
             choosenum.Text = choosecount.ToString();
         }
 
+        //勾选框更改提交
         private void LabelDataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
         {
             if (LabelDataGridView.IsCurrentCellDirty) {

UAS-MES/FunctionCode/Make/Make_MakeDown.cs

@@ -96,7 +96,7 @@ namespace UAS_MES.Make
                                 dh.ExecuteSql(sql.GetString(), "insert");
                                 //更新序列号状态为下地
                                 dh.UpdateByCondition("makeserial", "ms_downstatus='-1'", "ms_id='"+ms_id+"'");
-                                OperateResult.AppendText("序列号" + sn_code.Text + "下地成功\n", Color.Green);
+                                OperateResult.AppendText(">>>序列号" + sn_code.Text + "下地成功\n", Color.Green);
                                 //更新数量
                                 count++;
                                 make_count.Text = count + "";
@@ -104,7 +104,7 @@ namespace UAS_MES.Make
                                 loadGrid();
                             }
                             else {
-                                OperateResult.AppendText("序列号" + sn_code.Text + "已装箱:"+ms_outboxcode+ ",不允许下地，如需下地请先解除装箱\n", Color.Red);
+                                OperateResult.AppendText(">>>序列号" + sn_code.Text + "已装箱:"+ms_outboxcode+ ",不允许下地，如需下地请先解除装箱\n", Color.Red);
                                 sn_code.Text = "";
                                 sn_code.Focus();
                                 return;
@@ -112,7 +112,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
-                            OperateResult.AppendText("序列号"+ sn_code.Text + "目前已经是下地状态，无需重复下地\n", Color.Red);
+                            OperateResult.AppendText(">>>序列号" + sn_code.Text + "目前已经是下地状态，无需重复下地\n", Color.Red);
                             sn_code.Text = "";
                             sn_code.Focus();
                             return;
@@ -121,14 +121,14 @@ namespace UAS_MES.Make
                     }
                     else {
                         ms_id = null; 
-                        OperateResult.AppendText("序列号"+ sn_code.Text + "不存在\n", Color.Red);
+                        OperateResult.AppendText(">>>序列号" + sn_code.Text + "不存在\n", Color.Red);
                         sn_code.Text = "";
                         sn_code.Focus();
                     }
                 }
                 else
                 {
-                    OperateResult.AppendText("序列号"+ sn_code.Text + "未输入下地原因\n", Color.Red);
+                    OperateResult.AppendText(">>>序列号" + sn_code.Text + "未输入下地原因\n", Color.Red);
                     sn_code.Text = "";
                     sn_code.Focus();
                     return;