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

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();
 
         }

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);
                 }

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -136,7 +136,7 @@ namespace UAS_MES.Make
                             if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                             {
                                 //调用  SETSTEPRESULT ，获取返回的工单号，
-                                if (LogicHandler.SetStepFinish(omakeCode, User.UserSourceCode, SN, "标签核对", "OK", User.UserCode, out oErrorMessage))
+                                if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "标签核对", "OK", User.UserCode, out oErrorMessage))
                                 {
                                     //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
                                     sql.Clear();

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -379,7 +379,7 @@ namespace UAS_MES.Make
                         //写入日志
                         LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                         //完成该道工序 setFinish
-                        LogicHandler.UpdateMakeMessage(SN, ms_macode.Text, "序列烧录转换", User.UserSourceCode, User.UserCode, "序列烧录转换成功", out errorMessage);
+                        LogicHandler.SetStepResult( ms_macode.Text, User.UserSourceCode, SN, "序列烧录转换", "序列烧录转换成功", User.UserCode, out errorMessage);
 
                         //输出提示用户“>>序列号转换成功”，“>>关联采集成功”
                         //获取剩余数，刷新页面

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -196,7 +196,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran(updateSql, insertSql);
                                     OperateResult.AppendText(">>转换成功\n", Color.Green);
                                     //写入日志
-                                    LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "序列转换", User.UserSourceCode, User.UserCode, "序列转换成功", out errorMessage);
+                                    LogicHandler.SetStepResult( ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
                                     LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
                                     OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
                                     //置空