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

MES接口/LogicHandler.cs

@@ -369,7 +369,6 @@ namespace MES_Interface
                         sql.Append("sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
                         sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "'");
                         dh.BatchInsert(sql.ToString(), new string[] { "bc_code"}, BadCode);
-                        dh.BatchInsert("",new string[] { "BadCode"},BadCode);
                     }
                     break;
                 default:
@@ -409,7 +408,7 @@ namespace MES_Interface
             oErrorMessage = "";
             string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, oErrorMessage };
             dh.CallProcedure("CS_SETSTEPRESULT", ref param);
-            oErrorMessage = param[4];
+            oErrorMessage = param[5];
             if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
             else