烧录采集修改

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -43,6 +43,8 @@ namespace UAS_MES.Make
         StringBuilder s1 = new StringBuilder();
         //存放工单中数量
         int ma_qty;
+        //存放第一步查询出来的工单号，判断是否更换了工单
+        string makecode;
         public Make_SeqProgramTransform()
         {
             InitializeComponent();
@@ -77,8 +79,10 @@ namespace UAS_MES.Make
 
                             string oMakecode = "";
                             string oMsid = "";
+                            //记录当前序列号查出来的工单
+                            makecode = dh.getFieldDataByCondition("makeserial","ms_makecode","ms_sncode='"+code.Text+"'").ToString();
                             //核对工序
-                            if (LogicHandler.CheckStepSNAndMacode(ms_macode.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
+                            if (LogicHandler.CheckStepSNAndMacode(makecode==ms_macode.Text?makecode:"", User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
                             {
                                 //核对TSN是否正确
                                 string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();