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

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -631,11 +631,14 @@ namespace UAS_MES.Make
 
         private void mbp_partdgv_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {
-            if (mbp_partdgv.Columns[e.ColumnIndex].Name == "DeleteCom")
+            if (e.RowIndex >= 0)
             {
-                dh.ExecuteSql("delete from makebadrspart where mbp_id='" + mbp_partdgv.Rows[e.RowIndex].Cells["mbp_id"].Value.ToString() + "'", "insert");
-                DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
-                BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
+                if (mbp_partdgv.Columns[e.ColumnIndex].Name == "DeleteCom")
+                {
+                    dh.ExecuteSql("delete from makebadrspart where mbp_id='" + mbp_partdgv.Rows[e.RowIndex].Cells["mbp_id"].Value.ToString() + "'", "insert");
+                    DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
+                    BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
+                }
             }
         }
 

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -430,7 +430,7 @@ namespace UAS_MES.Make
                         //写入日志
                         LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                         //记录日志
-                        LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,oMakecode,User.UserLineCode,User.UserSourceCode,"序列烧录转换","转换成功",SN,"");
+                        LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,oMakecode,User.UserLineCode,User.UserSourceCode,"序列烧录转换","转换成功",TSN,"");
                         //完成该道工序 setFinish
                         LogicHandler.SetStepResult( ms_macode.Text, User.UserSourceCode, SN, "序列烧录转换", "序列烧录转换成功", User.UserCode, out errorMessage);
 

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -215,7 +215,7 @@ namespace UAS_MES.Make
                                     //写入日志
                                     LogicHandler.SetStepResult( ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
                                     //记录日志
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", bsncode, "");
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
                                     LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
                                     OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
                                     //置空