限制核对必须扫码二维码内容

UAS_MES_LGDZ/FunctionCode/Make/Make_FuselageLabelPrintCheck.cs

@@ -122,7 +122,7 @@ namespace UAS_MES_NEW.Make
                     string oStatus = "";
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确
                     string status = "";
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' or ms_psn='"+sncode.Text+"' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sncode.Text + "' or ms_psn='" + sncode.Text + "' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
@@ -204,10 +204,16 @@ namespace UAS_MES_NEW.Make
                             }
                         }
                         dt = (DataTable)dh.ExecuteSql("select ms_imei1,ms_imei2,ms_netcard,ms_othid1,ms_psn,ms_othid2,ms_netcode,ms_othid3,ms_mac,ms_bt from makeserial where ms_id='" + oMsId + "'", "select");
+                        if (sncheck.Text == "")
+                        {
+                            OperateResult.AppendText(">>请先扫码核对内容\n", Color.Red);
+                            return;
+                        }
                         string[] par = sncheck.Text.Split('#');
                         for (int i = 0; i < par.Length; i++)
                         {
-                            if (par[i] != "") {
+                            if (par[i] != "")
+                            {
                                 string name = par[i].Split('=')[0];
                                 string value = par[i].Split('=')[1];
                                 switch (name)