归属BUG修改

UAS-MES/PublicMethod/LogicHandler.cs

@@ -215,16 +215,25 @@ namespace UAS_MES.PublicMethod
                 return true;
             else
             {
-                dt = (DataTable)dh.ExecuteSql("select msd_makecode from MAKESNRULEDETAIL where  msd_sncode='" + iSnCode + "'", "select");
+                dt = (DataTable)dh.ExecuteSql("select msl_makecode from makesnlist where msl_sncode='" + iSnCode + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    oMakeCode = dt.Rows[0]["msd_makecode"].ToString();
+                    oMakeCode = dt.Rows[0]["msl_makecode"].ToString();
                     return true;
                 }
                 else
                 {
-                    oErrorMessage = "序列号:" + iSnCode + " 未归属工单";
-                    return false;
+                    dt = (DataTable)dh.ExecuteSql("select msd_makecode from MAKESNRULEDETAIL where  msd_sncode='" + iSnCode + "'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        oMakeCode = dt.Rows[0]["msd_makecode"].ToString();
+                        return true;
+                    }
+                    else
+                    {
+                        oErrorMessage = "序列号:" + iSnCode + " 未归属工单";
+                        return false;
+                    }
                 }
             }
         }
@@ -562,13 +571,14 @@ namespace UAS_MES.PublicMethod
         public static bool CheckDiffMakeCodeBeforeStepCheck(string iSN, string iMakeCode, bool iChangeMakeCodeNote, out string oMakeCode, out string oErrorMessage)
         {
             string oStatus = "";
-            LogicHandler.GetMakeInfo(iSN, out oMakeCode, out oStatus, out oErrorMessage);
+            GetMakeInfo(iSN, out oMakeCode, out oStatus, out oErrorMessage);
+            oErrorMessage = "";
             bool NoteAlready = false;
             if (iChangeMakeCodeNote)
             {
                 if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "" && oStatus != "2")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号"+ iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     //如果选择不切换赋值当前界面工单
                     if (ChangeMakeCode != "Yes")
                     {
@@ -602,14 +612,14 @@ namespace UAS_MES.PublicMethod
         /// <param name="iMakeCode"></param>
         /// <param name="iChangeMakeCodeNote"></param>
         /// <param name="NoteAlready"></param>
-        public static bool CheckDiffMakeCodeAfterStepCheck(string iSN,string iSNMakecode, bool iChangeMakeCodeNote, bool NoteAlready, Control ctl, out string oErrMessage)
+        public static bool CheckDiffMakeCodeAfterStepCheck(string iSN, string iSNMakecode, bool iChangeMakeCodeNote, bool NoteAlready, Control ctl, out string oErrMessage)
         {
             oErrMessage = "";
             if (iChangeMakeCodeNote && !NoteAlready)
             {
                 if (iSNMakecode != ctl.Text && ctl.Text != "")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号"+ iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     //如果选择不切换赋值当前界面工单
                     if (ChangeMakeCode == "Yes")
                     {