Explorar o código

不管称量是否合格都记录重量

章政 %!s(int64=8) %!d(string=hai) anos
pai
achega
56019aa116

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

@@ -642,12 +642,12 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.彩盒称重_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.彩盒称重_SizeChanged);
-            this.panel6.ResumeLayout(false);
+            this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

+ 4 - 1
UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -136,7 +136,10 @@ namespace UAS_MES.Make
                             }
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
                         }
-                        else OperateResult.AppendText(">>" + sncode.Text + "重量检测未通过\n", Color.Red, sncode);
+                        else OperateResult.AppendText(">>" + sncode.Text + "重量检测未通过\n", Color.Red);
+                        //称量是否通过都记录重量
+                        dh.ExecuteSql("update makeserial set ms_grossw='"+ActualWeight+"' where ms_sncode='"+sncode.Text+"' and ms_makecode='"+ms_makecode.Text+"'", "update");
+                        sncode.Clear();
                     }
                     else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
                 }