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

MES接口/LogicHandler.cs

@@ -25,12 +25,12 @@ namespace MES_Interface
         /// <param name="iSourceCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
-        public bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode, out string oErrMessage)
+        public bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode, string iUserCode, out string oErrMessage)
         {
             oErrMessage = "";
-            string[] param = new string[] { iSnCode, iMakeCode, iSourceCode, oErrMessage };
+            string[] param = new string[] { iSnCode, iMakeCode, iSourceCode, iUserCode, oErrMessage };
             dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
-            oErrMessage = param[3];
+            oErrMessage = param[4];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
             else