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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -502,7 +502,7 @@ namespace UAS_MES.Make
                     //写入日志
                     LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                     //记录日志
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列烧录转换", "转换成功", TSN, "");
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列烧录转换", TSN+"转换为"+SN, SN, "");
                     //获取剩余数，刷新页面
                     sql.Clear();
                     sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ms_macode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -210,32 +210,35 @@ namespace UAS_MES.Make
                             //防呆验证完成
                             if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'")))
                             {
-                                onlyPass = false;
-                                string firstsn = "";
-                                string updateSql = "";
-                                //勾选了修改转换结果
-                                if (ChangeResult.Checked)
-                                {
-                                    //查询ms_firstsn
-                                    firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_id='" + oMsId + "' and  ms_beforesn='" + bsncode + "'").ToString();
-                                    //记录本次修改，存入makesnrelation表中
-                                    updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_id='" + oMsId + "' and  ms_beforesn='" + bsncode + "'";
-                                    //删除最近一条转换记录
-                                    dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + bsncode + "' and makecode='" + ma_code.Text + "'", "delete");
-                                }
-                                //未勾选修改转换结果
-                                else
+                                if (!ChangeResult.Checked && !onlyPass || bsncode != sncode.Text)
                                 {
-                                    //查询ms_firstsn
-                                    firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_id='" + oMsId + "' and  ms_sncode='" + bsncode + "'").ToString();
-                                    //记录本次修改，存入makesnrelation表中
-                                    updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_id='" + oMsId + "' and  ms_sncode='" + bsncode + "'";
+                                    string firstsn = "";
+                                    string updateSql = "";
+                                    //勾选了修改转换结果
+                                    if (ChangeResult.Checked)
+                                    {
+                                        //查询ms_firstsn
+                                        firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_id='" + oMsId + "' and  ms_beforesn='" + bsncode + "'").ToString();
+                                        //记录本次修改，存入makesnrelation表中
+                                        updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_id='" + oMsId + "' and  ms_beforesn='" + bsncode + "'";
+                                        //删除最近一条转换记录
+                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + bsncode + "' and makecode='" + ma_code.Text + "'", "delete");
+                                    }
+                                    //未勾选修改转换结果
+                                    else
+                                    {
+                                        //查询ms_firstsn
+                                        firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_id='" + oMsId + "' and  ms_sncode='" + bsncode + "'").ToString();
+                                        //记录本次修改，存入makesnrelation表中
+                                        updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_id='" + oMsId + "' and  ms_sncode='" + bsncode + "'";
+                                    }
+                                    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);
                                 }
-                                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);
+                                onlyPass = false;
                                 OperateResult.AppendText("<<序列号"+bsncode+"成功转换为"+sncode.Text+"\n", Color.Green);
                                 //记录日志
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", bsncode+"转换为"+sncode.Text, sncode.Text, "");
                                 LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
                                 //写入日志
                                 if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage))