SN验标逻辑修改，上料采集修改

UAS_MES_HYSX/FunctionCode/Make/Make_FeedingCollection.cs

@@ -258,12 +258,12 @@ namespace UAS_MES_NEW.Make
         //获取采集的项目
         private void GetCollectItem()
         {
-            bool NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(code.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
-            if (!NoteAlready)
-            {
-                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
-                return;
-            }
+            //bool NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(code.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
+            //if (!NoteAlready)
+            //{
+            //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
+            //    return;
+            //}
             dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + code.Text + "' or ms_sncode='"+code.Text+"' order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
@@ -271,11 +271,11 @@ namespace UAS_MES_NEW.Make
             }
             if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
             {
-                if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(code.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
-                {
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
-                    return;
-                }
+                //if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(code.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
+                //{
+                //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
+                //    return;
+                //}
                 //string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
                 //if (nextstepcode != User.CurrentStepCode)
                 //{

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_ThreeLabel.cs

@@ -95,7 +95,7 @@ namespace UAS_MES_NEW.Make
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     sql.Clear();
-                    sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "' or ms_code='"+sncode.Text+"' ");
+                    sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "' or ms_code='" + sncode.Text + "' ");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                     {
@@ -105,12 +105,12 @@ namespace UAS_MES_NEW.Make
                     //存在该SN号
                     //根据该ms_id查询ms_imei1,ms_makecode信息
                     sql.Clear();
-                    sql.Append("select ms_sncode from  makeserial  where ms_id='" + dt.Rows[0]["ms_id"].ToString() + "'");
+                    sql.Append("select ms_sncode,ms_code from  makeserial  where ms_id='" + dt.Rows[0]["ms_id"].ToString() + "'");
                     info = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (info.Rows.Count > 0)
                     {
                         //用变量记录imei1和makecode
-                        checksn = info.Rows[0]["ms_sncode"].ToString();
+                        checksn = info.Rows[0]["ms_code"].ToString();
                         SN = sncode.Text;
                         //>> 请输入彩盒上的SN
                         OperateResult.AppendText("<<条码" + sncode.Text + "对应的SN号为:" + checksn + "\n", Color.Green);
@@ -172,7 +172,7 @@ namespace UAS_MES_NEW.Make
                         if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                         {
                             //判断序列号下一工序（CHECKSTEPSNANDMACODE）   
-                            if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, checksn, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                            if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                             {
                                 string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
                                 if (nextstepcode != User.CurrentStepCode)
@@ -187,7 +187,7 @@ namespace UAS_MES_NEW.Make
                                     return;
                                 }
                                 //调用  SETSTEPRESULT ，获取返回的工单号，
-                                if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, checksn, "标签核对", "OK", User.UserCode, out oErrorMessage))
+                                if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "标签核对", "OK", User.UserCode, out oErrorMessage))
                                 {
 
                                     //提示正确返回时传递的信息