BUG修改

FileWatcher/AutoSMTRXY.cs

@@ -119,7 +119,7 @@ namespace FileWatcher
                     dh.ExecuteSql("insert into makehourcount(mhc_id,mhc_macode,mhc_indate,mhc_type,mhc_qty,mhc_linecode,mhc_pcbcount)" +
                              "values(makehourcount_seq.nextval,'" + ma_code.Text + "',sysdate,'" + Type.Text + "','" + (qty - lastqty) + "','" + li_code.Text + "','" + pr_pcbacount.Value + "')", "insert");
                 }
-                LogicHandler.CS_SetResult(ma_code.Text, li_code.Text, "", qty.ToString(), li_code.Text, "OK", out error);
+                LogicHandler.CS_SetResultRXY(ma_code.Text, li_code.Text, "", qty.ToString(), li_code.Text, "OK", out error);
                 lastqty = qty;
             }
         }
@@ -239,7 +239,7 @@ namespace FileWatcher
                     if (dt.Rows.Count > 0)
                     {
                         string MainSN = dt.Rows[0]["MSL_MAINSN"].ToString();
-                        if (LogicHandler.CS_SetResult(ma_code.Text, li_code.Text, MainSN, "0", li_code.Text, "OK", out error))
+                        if (LogicHandler.CS_SetResultRXY(ma_code.Text, li_code.Text, MainSN, "0", li_code.Text, "OK", out error))
                         {
                             OperateResult.AppendText("SN:" + MainSN + "采集成功\n");
                         }

FileWatcher/LogicHandler.cs

@@ -222,9 +222,9 @@ namespace FileWatcher
             return false;
         }
 
-        public static bool SetStepResult(string iMakeCode, string iSourceCode, string iSN, string passqty, string iResult, string iUserCode, out string oErrorMessage)
+        public static bool SetStepResult(string iMakeCode, string iSourceCode, string iSN,string iMPKIND, string iResult, string iUserCode, out string oErrorMessage)
         {
-            return CS_SetResult(iMakeCode, iSourceCode, iSN, passqty, iUserCode, iResult, out oErrorMessage);
+            return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
         }
 
         public static bool SetStepResultRXY(string iMakeCode, string iSourceCode, string iSN, string passqty, string iResult, string iUserCode, out string oErrorMessage)
@@ -232,12 +232,12 @@ namespace FileWatcher
             return CS_SetResultRXY(iMakeCode, iSourceCode, iSN, passqty, iUserCode, iResult, out oErrorMessage);
         }
 
-        public static bool CS_SetResult(string iMakeCode, string iSourceCode, string iSN,string passqty, string iUserCode, string iResult, out string oErrorMessage)
+        public static bool CS_SetResult(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string[] param = new string[] { iMakeCode, iSourceCode, iSN, passqty, iUserCode, iResult, oErrorMessage };
+            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, oErrorMessage };
             dh.CallProcedure("CS_SETSTEPRESULT", ref param);
-            oErrorMessage = param[6];
+            oErrorMessage = param[5];
             if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
             else