Merge remote-tracking branch 'refs/remotes/origin/master'

MES接口/LogicHandler.cs

@@ -25,15 +25,15 @@ namespace MES_Interface
         /// <param name="iSourceCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
-        public bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode, string iUserCode,out string oMSID,out string oMacode, out string oErrMessage)
+        public bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode, string iUserCode,out string oMacode, out string oMSID, out string oErrMessage)
         {
             oErrMessage = "";
             oMSID = "";
             oMacode = "";
-            string[] param = new string[] { iMakeCode, iSourceCode, iSnCode, iUserCode, oMSID,oMacode,oErrMessage };
+            string[] param = new string[] { iMakeCode, iSourceCode, iSnCode, iUserCode, oMacode, oMSID, oErrMessage };
             dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
-            oMSID = param[4];
-            oMacode = param[5];
+            oMacode = param[4];
+            oMSID = param[5];
             oErrMessage = param[6];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -129,23 +129,7 @@ namespace MES_Interface
                 return true;
             else
                 return false;
-        }
-
-        public bool CheckStepSNAndMacode(string iMakeCode, string iSourceCode, string iSN, string iUserCode, out string oMakeCode, out string oMsID, out string oErrorMessage)
-        {
-            oErrorMessage = "";
-            oMakeCode = "";
-            oMsID = "";
-            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, oMakeCode, oMsID, oErrorMessage };
-            dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
-            oMakeCode = param[4];
-            oMsID = param[5];
-            oErrorMessage = param[6];
-            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
-                return true;
-            else
-                return false;
-        }
+        }     
 
         /// <summary>
         /// 分配Mac地址和BT地址