三码核对修改规则

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_ThreeLabelNEW.cs

@@ -61,7 +61,7 @@ namespace UAS_MES_NEW.Make
         {
             asc.controlAutoSize(this);
         }
-
+        string ZD_D_SN = "";
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
             //判断是enter事件
@@ -89,6 +89,7 @@ namespace UAS_MES_NEW.Make
                             imei1 = "";
                             imei2 = "";
                             checksn = "";
+                            ZD_D_SN = "";
                             return;
                         }
                         sql.Clear();
@@ -142,7 +143,8 @@ namespace UAS_MES_NEW.Make
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     imei1 = sncode.Text;
-                    if (imei1.Contains(checksn))
+                    ZD_D_SN = dh.getFieldDataByCondition("ZTEDATA", "ZD_D_SN", "zd_sn='" + checksn + "' and zd_type='彩盒机身标'").ToString();
+                    if (imei1.Contains(checksn) || (ZD_D_SN != "" && imei1.Contains(ZD_D_SN)))
                     {
                         sn2.Text = sncode.Text;
                         OperateResult.AppendText("<<条码1核对成功\n", Color.Green, sncode);
@@ -169,7 +171,7 @@ namespace UAS_MES_NEW.Make
                     {
                         imei2 = info.Rows[0]["ZD_SN"].ToString();
                     }
-                    if (imei1.Contains(checksn) && imei2 == checksn)
+                    if ((imei1.Contains(checksn) || (ZD_D_SN != "" && imei1.Contains(ZD_D_SN)) && imei2 == checksn))
                     {
                         OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                         //说明输入的imei1对比一致