电子秤调试

UAS_MES_YD/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -227,12 +227,13 @@ namespace UAS_MES_NEW.Make
                                     OperateResult.AppendText(">>打印条码号" + sncode.Text + "\n", Color.Green);
                                     Confirm.PerformClick();
                                 }
+                                Remark.Clear();
                             }
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                            if (CollectRemark.Checked && Remark.Text != "")
-                            {
-                                LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
-                            }
+                            //if (CollectRemark.Checked && Remark.Text != "")
+                            //{
+                            //    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
+                            //}
                             LoadCollectedNum();
                             sncode.Clear();
                         }
@@ -264,7 +265,7 @@ namespace UAS_MES_NEW.Make
                                 Remark.AppendText(weigh + "\n");
                                 if (weigh != "")
                                 {
-                                    weight.Text = weigh;
+                                    weight.Text = re.Match(weigh).Value;
                                 }
                             }
                             catch (Exception)

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxWeigh_HAOQ.Designer.cs

@@ -42,8 +42,6 @@
             this.pr_cartongw_label = new System.Windows.Forms.Label();
             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.weight_label = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
             this.label15 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
@@ -224,8 +222,6 @@
             // panel4
             // 
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel4.Controls.Add(this.pr_cartonunit);
-            this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
             this.panel4.Location = new System.Drawing.Point(52, 152);
             this.panel4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
@@ -233,46 +229,14 @@
             this.panel4.Size = new System.Drawing.Size(742, 246);
             this.panel4.TabIndex = 91;
             // 
-            // pr_cartonunit
-            // 
-            this.pr_cartonunit.AutoSize = true;
-            this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(30, 172);
-            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(60, 50);
-            this.pr_cartonunit.TabIndex = 42;
-            this.pr_cartonunit.Text = "克";
-            this.pr_cartonunit.Visible = false;
-            // 
-            // weight_label
-            // 
-            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(30, 100);
-            this.weight_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.weight_label.Name = "weight_label";
-            this.weight_label.Size = new System.Drawing.Size(98, 50);
-            this.weight_label.TabIndex = 20;
-            this.weight_label.Text = "重量";
-            // 
             // weight
             // 
-            this.weight.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.weight.AutoSize = true;
-            this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
-            this.weight.ForeColor = System.Drawing.Color.Green;
-            this.weight.Location = new System.Drawing.Point(152, 60);
-            this.weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.weight.Font = new System.Drawing.Font("微软雅黑", 40F);
+            this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+            this.weight.Location = new System.Drawing.Point(235, 51);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 121);
-            this.weight.TabIndex = 41;
+            this.weight.Size = new System.Drawing.Size(331, 148);
+            this.weight.TabIndex = 43;
             // 
             // label15
             // 
@@ -702,10 +666,10 @@
             // Remark
             // 
             this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(1670, 463);
+            this.Remark.Location = new System.Drawing.Point(1670, 482);
             this.Remark.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(476, 177);
+            this.Remark.Size = new System.Drawing.Size(476, 156);
             this.Remark.TabIndex = 195;
             this.Remark.Text = "";
             // 
@@ -761,7 +725,6 @@
             this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
             this.panel4.ResumeLayout(true);
-            this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();
@@ -785,8 +748,6 @@
         private System.Windows.Forms.Label pr_cartongw_label;
         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 weight_label;
         private System.Windows.Forms.Label weight;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Label pr_detail_label;

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxWeigh_HAOQ.cs

@@ -32,7 +32,7 @@ namespace UAS_MES_NEW.Packing
 
         Document doc;
 
-        Regex re = new Regex("\\d+.\\w+");
+        Regex re = new Regex("\\d+.\\W+");
 
         Thread thread;
 
@@ -101,7 +101,7 @@ namespace UAS_MES_NEW.Packing
 
         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);
+            //weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width - 10, weight_label.Location.Y - 20);
             asc.controlAutoSize(this);
         }
 
@@ -175,7 +175,7 @@ namespace UAS_MES_NEW.Packing
                     }
                     ListViewItem lsi = new ListViewItem();
                     lsi.SubItems.Add(outboxcode.Text);
-                    lsi.SubItems.Add(ActualWeight.ToString() + pr_cartonunit.Text);
+                    lsi.SubItems.Add(ActualWeight.ToString());
                     lsi.SubItems.Add(System.DateTime.Now.ToString());
                     WeighRecord.Items.Add(lsi);
                     OperateResult.AppendText(">>箱号" + outboxcode.Text + "称重完成\n", Color.Green);
@@ -221,7 +221,7 @@ namespace UAS_MES_NEW.Packing
                                 Remark.AppendText(weigh + "\n");
                                 if (weigh != "")
                                 {
-                                    weight.Text = re.Matches(weigh)[0].Value;
+                                    weight.Text = re.Match(weigh).Value.Replace("\n", "").Replace("\t", ""); ;
                                 }
                             }
                             catch (Exception)

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxWeigh_HAOQ.resx

@@ -215,7 +215,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -346,7 +346,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -477,7 +477,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -608,7 +608,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -739,7 +739,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -870,7 +870,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

UAS_MES_YD/FunctionCode/Special/Special_QCForce.Designer.cs

@@ -30,14 +30,16 @@
         {
             this.SuspendLayout();
             // 
-            // QC强制判定
+            // Special_QCForce
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1365, 703);
-            this.Name = "QC强制判定";
+            this.ClientSize = new System.Drawing.Size(2048, 1125);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Name = "Special_QCForce";
             this.Text = "QC强制判定";
-            this.ResumeLayout(true);
+            this.Load += new System.EventHandler(this.Special_QCForce_Load);
+            this.ResumeLayout(false);
 
         }
 

UAS_MES_YD/FunctionCode/Special/Special_QCForce.cs

@@ -15,5 +15,10 @@ namespace UAS_MES_NEW.Special
         {
             InitializeComponent();
         }
+
+        private void Special_QCForce_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }