添加从设备里面读取条码

UAS_MES_JH/FunctionCode/Make/Make_TestCollectionqrcode.cs

@@ -567,7 +567,7 @@ namespace UAS_MES_NEW.Make
         {
             //获取工单的其他信息
             sql.Clear();
-            sql.Append("select pr_serial,ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,ma_softversion,pr_detail,pr_spec from  ");
+            sql.Append("select pr_macinto,pr_btinfo,pr_netinfo,pr_feederspec,pr_serial,pr_versioninfo,ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,ma_softversion,pr_detail,pr_spec from  ");
             sql.Append("make left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
@@ -595,12 +595,10 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText("读取软件版本：" + version + "\n");
                 }
 
-                if (!String.IsNullOrEmpty(serial))
-                {
-                    serial = BaseUtil.GetDataAdb(serial);
-                    OperateResult.AppendText("读取SN：" + serial + "\n");
-                    ms_sncode.Text = serial;
-                }
+                serial = BaseUtil.GetDataAdb(serial == "" ? "shell getprop ro.serialno" : serial);
+                OperateResult.AppendText("读取SN：" + serial + "\n");
+                ms_sncode.Text = serial;
+
 
                 if (!String.IsNullOrEmpty(macinfo))
                 {