体现过站成功与否，序列转换不能操作有采集信息的

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -554,11 +554,18 @@ namespace UAS_MES.Make
                         LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                         //记录日志
                         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);
                         //写入sninfo表
                         insert2Sninfo(SN);
                         //输出提示用户“>>序列号转换成功”，“>>关联采集成功”
+                        //完成该道工序 setFinish
+                        if (LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, SN, "序列烧录转换", "序列烧录转换成功", User.UserCode, out errorMessage))
+                        {
+
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red, code);
+                        }
                         //获取剩余数，刷新页面
                         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

@@ -32,6 +32,8 @@ namespace UAS_MES.Make
         string system = "";//进制
 
         bool flag = false;//标识是否只是过站
+
+        DataTable ListA;
         //存放工单中数量
         int ma_qty;
         string oMakeCode = "";
@@ -101,6 +103,15 @@ namespace UAS_MES.Make
                                         //ms_makecode_lock.Checked = true;
                                     }
                                 }
+                                //获取需要关联采集的信息，以及校验规则
+                                ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
+                                //没有获取到就提示错误请维护产品对应的关联采集信息
+                                if (ListA.Rows.Count > 0)
+                                {
+                                    OperateResult.AppendText(">>产品已维护关联采集信息,不允许只做转号\n", Color.Red, sncode);
+                                    OperateResult.AppendText("<<请输入TSN\n", Color.Black);
+                                    return;
+                                }
                                 switch (ChangeResult.CheckState)
                                 {
                                     //勾选是修改已转换的序列，矫正修改错了的序列号
@@ -236,11 +247,18 @@ 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(">>转换成功\n", Color.Green);
-                                //写入日志
-                                LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
                                 //记录日志
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
                                 LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
+                                //写入日志
+                                if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage))
+                                {
+
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red, sncode);
+                                }
                                 OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
                                 //置空
                                 bsncode = "";