加仅过站

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -55,6 +55,7 @@ namespace UAS_MES.Make
 
         string oMakecode = "";
         string oMsid = "";
+        bool onlyPass = false;
         public Make_SeqProgramTransform()
         {
             InitializeComponent();
@@ -135,8 +136,21 @@ namespace UAS_MES.Make
                                         }
                                         else
                                         {
-                                            OperateResult.AppendText(">>不存在该已转序列号:" + code.Text + "\n", Color.Red,code);
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            //修改转换结果时，输入两次SN直接过站
+                                            if (dh.CheckExist("MakeSerial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "' and ms_beforesn is not null"))
+                                            {
+                                                TSN = code.Text;
+                                                //显示序列号
+                                                show_sncode.Text = TSN;
+                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green, code);
+                                                ChangeResult.Enabled = false;
+                                                onlyPass = true;
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText(">>不存在该已转序列号:" + code.Text + "\n", Color.Red, code);
+                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            }
                                         }
                                     }
                                     else
@@ -202,6 +216,25 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText(">>序列号" + code.Text + "校验错误，不在工单防呆规则指定范围内!\n", Color.Red, code);
                                 return;
                             }
+                            //如果只是需要过站的序列号
+                            if (onlyPass)
+                            {
+                                if (TSN == code.Text)
+                                {
+                                    //写入日志
+                                    LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, code.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
+                                    //记录日志
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakecode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", code.Text, "");
+                                    OperateResult.AppendText(">>转换成功\n", Color.Green);
+                                    onlyPass = false;
+                                    ChangeResult.Enabled = true;
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText(">>输入一致才可过站\n", Color.Red);
+                                }
+                                return;
+                            }
                             //开始录入SN
                             if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='"+oMsid+"'"))||!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
                             {
@@ -221,7 +254,7 @@ namespace UAS_MES.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(">>序列号" + code.Text + "已存在\n", Color.Red);
+                                OperateResult.AppendText(">>序列号" + code.Text + "已存在或无该转换后序列号\n", Color.Red);
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black,code);
                             }
                         }
@@ -642,6 +675,7 @@ namespace UAS_MES.Make
             s1.Clear();
             show_sncode.Text = "";
             ChangeResult.Enabled = true;
+            onlyPass = false;
         }
 
         private void cancel_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -31,6 +31,7 @@ namespace UAS_MES.Make
 
         string system = "";//进制
 
+        bool flag=false;//标识是否只是过站
         //存放工单中数量
         int ma_qty;
         string oMakeCode = "";
@@ -123,8 +124,21 @@ namespace UAS_MES.Make
                                         }
                                         else
                                         {
-                                            OperateResult.AppendText(">>不存在该已转序列号:" + sncode.Text + "\n", Color.Red,sncode);
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            //修改转换结果时，输入两次SN直接过站
+                                            if (dh.CheckExist("MakeSerial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "' and ms_beforesn is not null"))
+                                            {
+                                                bsncode = sncode.Text;
+                                                //显示序列号
+                                                show_sncode.Text = bsncode;
+                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green, sncode);
+                                                ChangeResult.Enabled = false;
+                                                flag = true;
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText(">>不存在该已转序列号:" + sncode.Text + "\n", Color.Red, sncode);
+                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            }
                                         }
                                         break;
                                     case CheckState.Unchecked:
@@ -181,6 +195,25 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText(">>序列号" + sncode.Text + "校验错误，不在工单防呆规则指定范围内!\n", Color.Red,sncode);
                                 return;
                             }
+                            //如果只是需要过站的序列号
+                            if (flag)
+                            {
+                                if (bsncode == sncode.Text)
+                                {
+                                    //写入日志
+                                    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, "");
+                                    OperateResult.AppendText(">>转换成功\n", Color.Green);
+                                    flag = false;
+                                    ChangeResult.Enabled = true;
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText(">>输入一致才可过站\n", Color.Red);
+                                }
+                                return;
+                            }
                             //如果两次输入的序列号相同进行提示，不相同则进行下一步
                             if (bsncode != sncode.Text)
                             {
@@ -269,6 +302,7 @@ namespace UAS_MES.Make
             bsncode = "";
             OperateResult.AppendText(">>请输需要转换的序列号\n", Color.Green,show_sncode);
             ChangeResult.Enabled = true;
+            flag = false;
         }
         /// <summary>
         /// 工单号keydown