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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -200,13 +200,22 @@ namespace UAS_MES.Make
                                     //修改转换结果时，输入两次SN直接过站
                                     if (dh.CheckExist("MakeSerial", "ms_id='" + oMsid + "' and ms_sncode='" + code.Text + "' and ms_beforesn is not null"))
                                     {
-                                        step = 1;
-                                        TSN = code.Text;
-                                        //显示序列号
-                                        show_sncode.Text = TSN;
-                                        OperateResult.AppendText(">>请输入SN\n", Color.Green, code);
-                                        ChangeResult.Enabled = false;
-                                        onlyPass = true;
+                                        string nextstepcode=dh.getFieldDataByCondition("makeserial","ms_nextstepcode","ms_id='"+oMsid+"'").ToString();
+                                        if ( nextstepcode==User.CurrentStepCode)
+                                        {
+                                            step = 1;
+                                            TSN = code.Text;
+                                            //显示序列号
+                                            show_sncode.Text = TSN;
+                                            OperateResult.AppendText(">>请输入SN\n", Color.Green, code);
+                                            ChangeResult.Enabled = false;
+                                            onlyPass = true;
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText("<<序列号:" + code.Text + "下一工序是"+nextstepcode+",不是当前岗位的工序\n", Color.Red, code);
+                                            OperateResult.AppendText(">>请重新输入TSN\n", Color.Black);
+                                        }
                                     }
                                     else
                                     {

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -159,12 +159,21 @@ namespace UAS_MES.Make
                                         //修改转换结果时，输入两次SN直接过站
                                         if (dh.CheckExist("MakeSerial", "ms_id='" + oMsId + "' and  ms_sncode='" + sncode.Text + "' and ms_beforesn is not null"))
                                         {
-                                            bsncode = sncode.Text;
-                                            //显示序列号
-                                            show_sncode.Text = bsncode;
-                                            OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
-                                            ChangeResult.Enabled = false;
-                                            onlyPass = true;
+                                            string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsId + "'").ToString();
+                                            if (nextstepcode == User.CurrentStepCode)
+                                            {
+                                                bsncode = sncode.Text;
+                                                //显示序列号
+                                                show_sncode.Text = bsncode;
+                                                OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
+                                                ChangeResult.Enabled = false;
+                                                onlyPass = true;
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
+                                                OperateResult.AppendText(">>请重新输入TSN号\n", Color.Black);
+                                            }
                                         }
                                         else
                                         {