测试采集界面可以采集不同工单序列号时切换工单

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -165,8 +165,8 @@ namespace UAS_MES.Make
                 ChoosedList.Clear();
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    //判断界面工单是否为空时的序列号是否自动归属工单
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    LogicHandler.GetMakeInfo(ms_sncode.Text, out oMakeCode, out ErrorMessage);
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text != oMakeCode && oMakeCode != "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
                         if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {

UAS-MES/PublicMethod/LogicHandler.cs

@@ -294,8 +294,7 @@ namespace UAS_MES.PublicMethod
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
             oMakeCode = "";
             oErrorMessage = "";
-            string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "upper(ms_sncode)='" + iSnCode.ToUpper() + "' or ms_firstsn in (select firstsn from makesnrelation where upper(sn)='" + iSnCode.ToUpper() + "')").ToString();
-            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
+            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSnCode+"')").ToString();
             if (oMakeCode != "")
                 return true;
             else