【万利达MES】转号，测试采集界面特殊格式SN录入处理

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -144,6 +144,7 @@ namespace UAS_MES.Make
                     //无值,可补打
                     inputValue.Text = inputText.Text;
                     inputText.Text = "";
+                    printBtn.Enabled = true;
                 }
                 //打印类型为卡通箱
                 else if (CartonBox.Checked || BigBox.Checked || Pallte.Checked)
@@ -163,6 +164,7 @@ namespace UAS_MES.Make
                     //展示产品编号和标签模板到界面
                     inputValue.Text = inputText.Text;
                     inputText.Text = "";
+                    printBtn.Enabled = true;
                 }
             }
         }
@@ -366,7 +368,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update makeserial set ms_downstatus='0' where ms_id='" + re_ms_id + "'", sql.GetString());
                                 }
                             }
-                            printBtn.Enabled = true;
+                            //printBtn.Enabled = true;
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["ms_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
@@ -416,7 +418,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update package set pa_downstatus='0' where pa_outboxcode='" + TSN + "'", sql.GetString());
                                 }
                             }
-                            printBtn.Enabled = true;
+                            //printBtn.Enabled = true;
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对,箱号:" + TSN, "核对成功", TSN, "");
                         }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -50,6 +50,18 @@ namespace UAS_MES.Make
             {
                 if (sncode.Text != "")
                 {
+                    if (sncode.Text.Contains(":"))
+                    {
+                        if (sncode.Text.Contains("SN:"))
+                        {
+                            sncode.Text = sncode.Text.Split(':')[1];
+                        }
+                        else
+                        {
+                            sncode.Clear();
+                            return;
+                        }
+                    }
                     if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out errorMessage))
                     {
                         OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -181,6 +181,18 @@ namespace UAS_MES.Make
                 ChoosedRejectList.Items.Clear();
                 WaitList.Clear();
                 ChoosedList.Clear();
+                if (ms_sncode.Text.Contains(":"))
+                {
+                    if (ms_sncode.Text.Contains("SN:"))
+                    {
+                        ms_sncode.Text = ms_sncode.Text.Split(':')[1];
+                    }
+                    else
+                    {
+                        ms_sncode.Clear();
+                        return;
+                    }
+                }
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     //是否提示过工单切换框，检测前执行