修改扣料逻辑

FileWatcher/AutoSMTRXY.cs

@@ -219,31 +219,34 @@ namespace FileWatcher
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (dh.CheckExist("make", "ma_code='" + ma_code.Text + "'"))
+                if (!dh.CheckExist("make", "ma_code='" + ma_code.Text + "'"))
                 {
-                    MessageBox.Show("工单号不存在");
+                    OperateResult.AppendText("工单号不存在\n");
                     return;
                 }
-                if (dh.CheckExist("line", "li_code='" + li_code.Text + "'"))
+                if (!dh.CheckExist("line", "li_code='" + li_code.Text + "'"))
                 {
-                    MessageBox.Show("线别不存在");
+                    OperateResult.AppendText("线别不存在\n");
                     return;
                 }
-            }
-            string error = "";
-            if (SN.Checked)
-            {
-                System.Data.DataTable dt = (System.Data.DataTable)dh.ExecuteSql("select MSL_MAINSN from makesnlist where msl_sncode='" + ms_sncode.Text + "'", "select");
-                if (dt.Rows.Count > 0)
+                string error = "";
+                if (SN.Checked)
                 {
-                    string MainSN = dt.Rows[0]["MSL_MAINS"].ToString();
-                    LogicHandler.CS_SetResult(ma_code.Text, li_code.Text, MainSN, "0", li_code.Text, "OK", out error);
+                    System.Data.DataTable dt = (System.Data.DataTable)dh.ExecuteSql("select MSL_MAINSN from makesnlist where msl_sncode='" + ms_sncode.Text + "'", "select");
+                    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))
+                        {
+                            OperateResult.AppendText("SN:" + MainSN + "采集成功\n");
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(error + "\n");
+                        }
+                    }
                 }
             }
-            else
-            {
-
-            }
         }
 
         private void RemindTimer_Tick(object sender, EventArgs e)

FileWatcher/LogicHandler.cs

@@ -232,7 +232,7 @@ namespace FileWatcher
             oErrorMessage = "";
             string[] param = new string[] { iMakeCode, iSourceCode, iSN, passqty, iUserCode, iResult, oErrorMessage };
             dh.CallProcedure("CS_SETSTEPRESULT_SMT", ref param);
-            oErrorMessage = param[5];
+            oErrorMessage = param[6];
             if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
             else