Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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

@@ -44,8 +44,9 @@
             this.pr_code_label = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
             this.pr_cartonunit = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
+            this.weight_label = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
+            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.label15 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ma_qty_label = new System.Windows.Forms.Label();
@@ -75,7 +76,6 @@
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.panel6.SuspendLayout();
             this.panel4.SuspendLayout();
             this.SuspendLayout();
@@ -110,22 +110,22 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label3.Location = new System.Drawing.Point(45, 85);
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.label3.Location = new System.Drawing.Point(38, 85);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(115, 32);
+            this.label3.Size = new System.Drawing.Size(101, 30);
             this.label3.TabIndex = 184;
             this.label3.Text = "当前批号";
             // 
             // ob_checkno
             // 
             this.ob_checkno.AutoSize = true;
-            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_checkno.Location = new System.Drawing.Point(180, 85);
+            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_checkno.Location = new System.Drawing.Point(168, 85);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 32);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 30);
             this.ob_checkno.TabIndex = 184;
             this.ob_checkno.Visible = false;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
@@ -139,7 +139,7 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(431, 110);
+            this.SendCheck.Location = new System.Drawing.Point(414, 110);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
@@ -155,42 +155,42 @@
             // ob_nowcheckqty
             // 
             this.ob_nowcheckqty.AutoSize = true;
-            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(427, 28);
+            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(416, 28);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 32);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 30);
             this.ob_nowcheckqty.TabIndex = 182;
             // 
             // ob_batchqty
             // 
             this.ob_batchqty.AutoSize = true;
-            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_batchqty.Location = new System.Drawing.Point(179, 28);
+            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_batchqty.Location = new System.Drawing.Point(167, 28);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 32);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 30);
             this.ob_batchqty.TabIndex = 181;
             // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
-            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
             this.ob_nowcheckqty_label.Location = new System.Drawing.Point(293, 28);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(115, 32);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_nowcheckqty_label.TabIndex = 180;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
             // ob_batchqty_label
             // 
             this.ob_batchqty_label.AutoSize = true;
-            this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_batchqty_label.Location = new System.Drawing.Point(45, 28);
+            this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(38, 28);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(115, 32);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_batchqty_label.TabIndex = 179;
             this.ob_batchqty_label.Text = "标准批数";
             // 
@@ -246,9 +246,8 @@
             // panel4
             // 
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel4.Controls.Add(this.RefreshWeigh);
             this.panel4.Controls.Add(this.pr_cartonunit);
-            this.panel4.Controls.Add(this.label22);
+            this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
             this.panel4.Location = new System.Drawing.Point(33, 95);
             this.panel4.Margin = new System.Windows.Forms.Padding(4);
@@ -270,18 +269,18 @@
             this.pr_cartonunit.Text = "克";
             this.pr_cartonunit.Visible = false;
             // 
-            // label22
+            // weight_label
             // 
-            this.label22.AutoSize = true;
-            this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(20, 64);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "重量";
+            this.weight_label.AutoSize = true;
+            this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.weight_label.Location = new System.Drawing.Point(20, 64);
+            this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight_label.Name = "weight_label";
+            this.weight_label.Size = new System.Drawing.Size(62, 31);
+            this.weight_label.TabIndex = 20;
+            this.weight_label.Text = "重量";
             // 
             // weight
             // 
@@ -290,13 +289,32 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
-            this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(122, 39);
+            this.weight.ForeColor = System.Drawing.Color.Green;
+            this.weight.Location = new System.Drawing.Point(102, 39);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 78);
             this.weight.TabIndex = 41;
             // 
+            // RefreshWeigh
+            // 
+            this.RefreshWeigh.AllPower = null;
+            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
+            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
+            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
+            this.RefreshWeigh.IsShowBorder = true;
+            this.RefreshWeigh.Location = new System.Drawing.Point(446, 281);
+            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4);
+            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
+            this.RefreshWeigh.Name = "RefreshWeigh";
+            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
+            this.RefreshWeigh.Power = null;
+            this.RefreshWeigh.Size = new System.Drawing.Size(80, 30);
+            this.RefreshWeigh.TabIndex = 186;
+            this.RefreshWeigh.Text = "刷新重量";
+            this.RefreshWeigh.UseVisualStyleBackColor = true;
+            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
+            // 
             // label15
             // 
             this.label15.AutoSize = true;
@@ -356,7 +374,7 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1119, 139);
+            this.Printer_label.Location = new System.Drawing.Point(1113, 139);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
             this.Printer_label.Size = new System.Drawing.Size(107, 25);
@@ -367,7 +385,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1119, 181);
+            this.label1.Location = new System.Drawing.Point(1113, 181);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(88, 25);
@@ -378,7 +396,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1119, 96);
+            this.label2.Location = new System.Drawing.Point(1113, 96);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(88, 25);
@@ -581,7 +599,7 @@
             // 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(1124, 268);
+            this.OperateResult.Location = new System.Drawing.Point(1113, 268);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(297, 376);
@@ -627,7 +645,7 @@
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1124, 49);
+            this.AutoPrint.Location = new System.Drawing.Point(1118, 49);
             this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoPrint.Name = "AutoPrint";
             this.AutoPrint.Size = new System.Drawing.Size(117, 35);
@@ -649,30 +667,12 @@
             this.PrintNum.Str2 = null;
             this.PrintNum.TabIndex = 185;
             // 
-            // RefreshWeigh
-            // 
-            this.RefreshWeigh.AllPower = null;
-            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
-            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
-            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
-            this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(389, 68);
-            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4);
-            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
-            this.RefreshWeigh.Name = "RefreshWeigh";
-            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
-            this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(80, 30);
-            this.RefreshWeigh.TabIndex = 186;
-            this.RefreshWeigh.Text = "刷新重量";
-            this.RefreshWeigh.UseVisualStyleBackColor = true;
-            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
-            // 
             // Make_CartonBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1429, 700);
+            this.ClientSize = new System.Drawing.Size(1292, 700);
+            this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.WeighRecord);
@@ -740,7 +740,7 @@
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label pr_cartonunit;
-        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.Label weight_label;
         private System.Windows.Forms.Label weight;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Label pr_detail_label;

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -93,6 +93,7 @@ namespace UAS_MES.Make
 
         private void 卡通箱称重_SizeChanged(object sender, EventArgs e)
         {
+            weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width-10, weight_label.Location.Y-20);
             asc.controlAutoSize(this);
         }
 
@@ -161,7 +162,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
-                            OperateResult.AppendText(">>产品" + pr_code.Text + "未维护卡通标签\n", Color.Green);
+                            OperateResult.AppendText(">>产品" + pr_code.Text + "未维护卡通标签\n", Color.Red);
                         }
                     }
                     ListViewItem lsi = new ListViewItem();

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

@@ -32,9 +32,10 @@
             this.pr_colorboxgw_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.pr_colorboxunit = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
+            this.weight_label = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.label15 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ma_qty_label = new System.Windows.Forms.Label();
@@ -75,7 +76,6 @@
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.panel4.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
             this.SuspendLayout();
@@ -84,7 +84,7 @@
             // 
             this.pr_colorboxgw_label.AutoSize = true;
             this.pr_colorboxgw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw_label.Location = new System.Drawing.Point(21, 349);
+            this.pr_colorboxgw_label.Location = new System.Drawing.Point(22, 296);
             this.pr_colorboxgw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxgw_label.Name = "pr_colorboxgw_label";
             this.pr_colorboxgw_label.Size = new System.Drawing.Size(115, 32);
@@ -116,36 +116,35 @@
             this.pr_colorboxunit.Text = "克";
             this.pr_colorboxunit.Visible = false;
             // 
-            // label22
+            // weight_label
             // 
-            this.label22.AutoSize = true;
-            this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(21, 65);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "重量";
+            this.weight_label.AutoSize = true;
+            this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.weight_label.Location = new System.Drawing.Point(21, 65);
+            this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight_label.Name = "weight_label";
+            this.weight_label.Size = new System.Drawing.Size(62, 31);
+            this.weight_label.TabIndex = 20;
+            this.weight_label.Text = "重量";
             // 
             // weight
             // 
             this.weight.AutoSize = true;
-            this.weight.Font = new System.Drawing.Font("微软雅黑", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(131, 52);
+            this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
+            this.weight.ForeColor = System.Drawing.Color.Green;
+            this.weight.Location = new System.Drawing.Point(115, 39);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 57);
+            this.weight.Size = new System.Drawing.Size(0, 78);
             this.weight.TabIndex = 41;
             // 
             // panel4
             // 
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel4.Controls.Add(this.RefreshWeigh);
             this.panel4.Controls.Add(this.pr_colorboxunit);
-            this.panel4.Controls.Add(this.label22);
+            this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
             this.panel4.Location = new System.Drawing.Point(21, 98);
             this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
@@ -153,6 +152,25 @@
             this.panel4.Size = new System.Drawing.Size(461, 154);
             this.panel4.TabIndex = 63;
             // 
+            // RefreshWeigh
+            // 
+            this.RefreshWeigh.AllPower = null;
+            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
+            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
+            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
+            this.RefreshWeigh.IsShowBorder = true;
+            this.RefreshWeigh.Location = new System.Drawing.Point(407, 296);
+            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
+            this.RefreshWeigh.Name = "RefreshWeigh";
+            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
+            this.RefreshWeigh.Power = null;
+            this.RefreshWeigh.Size = new System.Drawing.Size(72, 30);
+            this.RefreshWeigh.TabIndex = 177;
+            this.RefreshWeigh.Text = "刷新重量";
+            this.RefreshWeigh.UseVisualStyleBackColor = true;
+            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
+            // 
             // label15
             // 
             this.label15.AutoSize = true;
@@ -201,7 +219,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(21, 282);
+            this.ms_makecode_label.Location = new System.Drawing.Point(22, 358);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(115, 32);
@@ -336,22 +354,22 @@
             // ob_checkno_label
             // 
             this.ob_checkno_label.AutoSize = true;
-            this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_checkno_label.Location = new System.Drawing.Point(31, 100);
+            this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_checkno_label.Location = new System.Drawing.Point(31, 104);
             this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(115, 32);
+            this.ob_checkno_label.Size = new System.Drawing.Size(101, 30);
             this.ob_checkno_label.TabIndex = 180;
             this.ob_checkno_label.Text = "当前批号";
             // 
             // ob_checkno
             // 
             this.ob_checkno.AutoSize = true;
-            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_checkno.Location = new System.Drawing.Point(162, 100);
+            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_checkno.Location = new System.Drawing.Point(156, 104);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 32);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 30);
             this.ob_checkno.TabIndex = 179;
             this.ob_checkno.Visible = false;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
@@ -359,42 +377,42 @@
             // ob_nowcheckqty
             // 
             this.ob_nowcheckqty.AutoSize = true;
-            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(384, 41);
+            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(389, 45);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 32);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 30);
             this.ob_nowcheckqty.TabIndex = 178;
             // 
             // ob_batchqty
             // 
             this.ob_batchqty.AutoSize = true;
-            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_batchqty.Location = new System.Drawing.Point(162, 41);
+            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_batchqty.Location = new System.Drawing.Point(156, 45);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 32);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 30);
             this.ob_batchqty.TabIndex = 177;
             // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
-            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(256, 41);
+            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(264, 45);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(115, 32);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_nowcheckqty_label.TabIndex = 176;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
             // ob_batchqty_label
             // 
             this.ob_batchqty_label.AutoSize = true;
-            this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_batchqty_label.Location = new System.Drawing.Point(31, 41);
+            this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(31, 45);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(115, 32);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_batchqty_label.TabIndex = 175;
             this.ob_batchqty_label.Text = "标准批数";
             // 
@@ -407,7 +425,7 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(396, 108);
+            this.SendCheck.Location = new System.Drawing.Point(387, 108);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
@@ -425,7 +443,7 @@
             this.pr_colorboxgw.AutoSize = true;
             this.pr_colorboxgw.CutLength = null;
             this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw.Location = new System.Drawing.Point(171, 349);
+            this.pr_colorboxgw.Location = new System.Drawing.Point(172, 296);
             this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_colorboxgw.Name = "pr_colorboxgw";
@@ -490,7 +508,7 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(828, 30);
+            this.StartWeight.Location = new System.Drawing.Point(802, 30);
             this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
@@ -526,7 +544,7 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(171, 282);
+            this.ms_makecode.Location = new System.Drawing.Point(172, 358);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -617,7 +635,7 @@
             this.sncode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(671, 47);
+            this.sncode.Size = new System.Drawing.Size(624, 47);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -650,30 +668,12 @@
             this.PrintNum.Str2 = null;
             this.PrintNum.TabIndex = 176;
             // 
-            // RefreshWeigh
-            // 
-            this.RefreshWeigh.AllPower = null;
-            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
-            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
-            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
-            this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(357, 65);
-            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
-            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
-            this.RefreshWeigh.Name = "RefreshWeigh";
-            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
-            this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(72, 30);
-            this.RefreshWeigh.TabIndex = 177;
-            this.RefreshWeigh.Text = "刷新重量";
-            this.RefreshWeigh.UseVisualStyleBackColor = true;
-            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
-            // 
             // Make_ColorBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1356, 730);
+            this.ClientSize = new System.Drawing.Size(1292, 730);
+            this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.pr_colorboxgw);
@@ -730,7 +730,7 @@
         private System.Windows.Forms.Label pr_colorboxgw_label;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_colorboxunit;
-        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.Label weight_label;
         private System.Windows.Forms.Label weight;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label label15;

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -208,6 +208,7 @@ namespace UAS_MES.Make
 
         private void 彩盒称重_SizeChanged(object sender, EventArgs e)
         {
+            weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width - 10, weight_label.Location.Y - 20);
             asc.controlAutoSize(this);
         }
 

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -159,6 +159,7 @@ namespace UAS_MES.Make
             }
         }
 
+        //加载之前在新增不良代码界面选择的不良代码
         private void LoadBadcode(object sender, EventArgs e)
         {
             sql.Clear();
@@ -415,7 +416,7 @@ namespace UAS_MES.Make
                                 }
                                 //craftmaterial解除相应物料绑定
                                 sql.Clear();
-                                sql.Append("update craftmaterial set cm_status=-1,cm_dropman='" + User.UserCode + "',");
+                                sql.Append("update craftmaterial set cm_status=-1,cm_lastdeco=-1,cm_dropman='" + User.UserCode + "',");
                                 sql.Append("cm_dropdate =sysdate,cm_dropstep='" + User.CurrentStepCode + "',");
                                 sql.Append("cm_dropsccode='" + User.UserSourceCode + "' where cm_id='" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
                                 dh.ExecuteSql(sql.GetString(), "update");