补充修改

UAS-MES/PublicMethod/LogicHandler.cs

@@ -199,12 +199,16 @@ namespace UAS_MES.PublicMethod
         /// <param name="iSourceCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
-        public static bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode,string iUserCode, out string oErrMessage)
+        public static bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode, string iUserCode, out string oMSID, out string oMacode, out string oErrMessage)
         {
             oErrMessage = "";
-            string[] param = new string[] { iSnCode, iMakeCode, iSourceCode, iUserCode, oErrMessage };
+            oMSID = "";
+            oMacode = "";
+            string[] param = new string[] { iMakeCode, iSourceCode, iSnCode, iUserCode, oMSID, oMacode, oErrMessage };
             dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
-            oErrMessage = param[4];
+            oMSID = param[4];
+            oMacode = param[5];
+            oErrMessage = param[6];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
             else