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

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

@@ -181,6 +181,7 @@
             // 
             // OperateResult
             // 
+            this.OperateResult.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(45, 176);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(602, 383);
@@ -205,6 +206,7 @@
             this.columnHeader2,
             this.columnHeader3,
             this.columnHeader4});
+            this.showResult.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.showResult.Location = new System.Drawing.Point(708, 176);
             this.showResult.Name = "showResult";
             this.showResult.Size = new System.Drawing.Size(585, 383);

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -159,6 +159,7 @@ namespace UAS_MES.Make
                                         string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
                                         dh.ExecuteSQLTran(updateSql, insertSql);
                                         OperateResult.AppendText(">>转换成功");
+                                        LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "序列转换", User.UserSourceCode, User.UserCode, "序列转换成功", out errorMessage);
                                         //写入日志
                                         LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
                                         OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
@@ -183,6 +184,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);
                                         LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
                                         OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
                                         //置空