优化核对字段

UAS_MES_ODLF/FunctionCode/Make/Make_FuselageLabelPrintCheck.cs

@@ -202,7 +202,7 @@ namespace UAS_MES_NEW.Make
                                 return;
                             }
                         }
-                        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");
+                        dt = (DataTable)dh.ExecuteSql("select ms_imei1,ms_imei2,ms_netcard,ms_othid1,nvl(ms_psn,mil_psn)ms_psn,ms_othid2,ms_netcode,ms_othid3,ms_mac,ms_bt from makeserial left join makeimeilist on mil_sncode=ms_sncode and ms_makecode=mil_makecode where ms_id='" + oMsId + "'", "select");
                         string[] par = sncheck.Text.Split('#');
                         for (int i = 0; i < par.Length; i++)
                         {
@@ -412,25 +412,15 @@ namespace UAS_MES_NEW.Make
         DataTable _dt;
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
-            if (_dt.Rows.Count == 0)
+            DataTable dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            if (dt.Rows.Count == 0)
             {
-                _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode is null and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
-            }
-            if (_dt.Rows.Count > 0)
-            {
-                string la_id = _dt.Rows[0]["la_id"].ToString();
-                _dt = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_templatetype='机身标' and la_id='" + la_id + "') where COLUMN_VALUE is not null)", "select");
-                PrintLabel.DataSource = _dt;
-                PrintLabel.DisplayMember = "la_url";
-                PrintLabel.ValueMember = "la_id";
-
-                PrintLabel1.DataSource = _dt.Copy();
-                PrintLabel1.DisplayMember = "la_url";
-                PrintLabel1.ValueMember = "la_id";
-
-                pr_change = true;
+                return;
             }
+            PrintLabel.DataSource = dt;
+            PrintLabel.DisplayMember = "la_url";
+            PrintLabel.ValueMember = "la_id";
+            pr_change = true;
         }
 
         private void Make_FuselageLabelPrint_Activated(object sender, EventArgs e)