标签核对解析

UAS_MES_YDCY/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -49,6 +49,7 @@ namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
                     this.FindForm().Tag.ToString() == "Make!ColorBoxWeigh" ||
                     this.FindForm().Tag.ToString() == "Make!TestCollection" ||
                     this.FindForm().Tag.ToString() == "Make!ColorBoxLabelPrint" ||
+                    this.FindForm().Tag.ToString() == "Make!SNLabelCheck" ||
                     this.FindForm().Tag.ToString() == "Make!Repair")
                 {
                     DataTable dt = (DataTable)SystemInf.dh.ExecuteSql("select nvl(pr_alllength,0)pr_alllength,pr_suffix,pr_prefix,nvl(pr_length,0)pr_length from product where " +

UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheck.cs

@@ -328,7 +328,7 @@ namespace UAS_MES_NEW.Make
         //获取采集的项目
         private void GetCollectItem()
         {
-            if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
+            if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
             {
                 nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
                 if (nextstepcode != User.CurrentStepCode)
@@ -339,6 +339,7 @@ namespace UAS_MES_NEW.Make
                 }
                 //将录入框的值给序列号
                 sn_code.Text = code.Text;
+                code.Str = "";
                 sql.Clear();
                 sql.Append("select ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,ma_bomversion,ma_qty,ma_code,pr_spec,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
                 sql.Append(",ms_prodcode,ms_makecode,ms_code,ms_stepname  from makeserial left join make on ma_code=ms_makecode ");
@@ -361,6 +362,7 @@ namespace UAS_MES_NEW.Make
                     nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
                     ms_status = dt.Rows[0]["ms_status"].ToString();
                     sn_code.Text = code.Text;
+                    code.Str = "";
                     sql.Clear();
                     sql.Append("select ma_code,ma_softversion,ma_ecncode,ma_prodcode,pr_spec,ma_qty from makeserial left join product ");
                     sql.Append(" on ms_prodcode=pr_code left join make on ms_makecode=ma_code left join ");
@@ -375,6 +377,7 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red, code);
                     code.Text = "";
                     sn_code.Text = "";
+                    code.Str = ma_prodcode.Text;
                 }
             }
             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
@@ -389,6 +392,7 @@ namespace UAS_MES_NEW.Make
             {
                 OperateResult.AppendText(">>序列号" + code.Text + "未设置核对类型，或者已核对完成\n", Color.Red, code);
                 sn_code.Clear();
+                code.Str = ma_prodcode.Text;
             }
             BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt1);
         }
@@ -397,6 +401,7 @@ namespace UAS_MES_NEW.Make
         {
             sn_code.Clear();
             CheckBarcode.Clear();
+            code.Str = ma_prodcode.Text;
             if (dt1 != null)
                 BaseUtil.CleanDataTableData(dt1);
             RemainIndex = 0;