关联关系调整改用存储过程

UAS-出货标签管理(贸易版)/ExportColumns.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using UAS_LabelMachine.Entity;
+using UAS_LabelMachine.PublicMethod;
 
 namespace UAS_LabelMachine
 {
@@ -175,13 +176,9 @@ namespace UAS_LabelMachine
                 es_field1 += SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString() + ",";
             }
             //分页信息的DataTable
-            sql.Clear();
-            sql.Append("select " + es_field1.Substring(0, es_field1.Length - 1) + " from chip_in_out left join prodinout on io_piid=pi_id left join prodiodetail on pi_id=pd_piid  and  pd_id=io_pdid  ");
-            sql.Append(" left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode ");
-            sql.Append("left join CHIP_EDCDATA_VIEW on che_chipcode=ch_code left join product on pr_code=pd_prodcode left join prodiobarcode on ");
-            sql.Append("pib_piid=pi_id and pib_custbarcode=ch_code where pi_inoutno='" + inoutno + "' order by ch_code");
-            DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-
+            string datasql = "";
+            LogicHandler.GetDataSQL(inoutno, es_field1.Substring(0, es_field1.Length - 1), out datasql);
+            DataTable dt = (DataTable)dh.ExecuteSql(datasql, "select");
             for (int i = 0; i < dt.Columns.Count; i++)
             {
                 if (dt.Columns[i].ColumnName == (SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString()).ToUpper())

UAS-出货标签管理(贸易版)/ExportExcel.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using UAS_LabelMachine.Entity;
+using UAS_LabelMachine.PublicMethod;
 
 namespace UAS_LabelMachine
 {
@@ -79,13 +80,9 @@ namespace UAS_LabelMachine
                     es_field1 += SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString() + ",";
                 }
                 //分页信息的DataTable
-                sql.Clear();
-                sql.Append("select " + es_field1.Substring(0, es_field1.Length - 1) + " from chip_in_out left join prodinout on io_piid=pi_id left join prodiodetail on pi_id=pd_piid  and  pd_id=io_pdid  ");
-                sql.Append(" left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode ");
-                sql.Append("left join CHIP_EDCDATA_VIEW on che_chipcode=ch_code left join product on pr_code=pd_prodcode left join prodiobarcode on ");
-                sql.Append("pib_piid=pi_id and pib_custbarcode=ch_code where pi_inoutno='" + inoutno + "' order by ch_code");
-                DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-
+                string datasql = "";
+                LogicHandler.GetDataSQL(inoutno, es_field1.Substring(0, es_field1.Length - 1), out datasql);
+                DataTable dt = (DataTable)dh.ExecuteSql(datasql, "select");
                 for (int i = 0; i < dt.Columns.Count; i++)
                 {
                     if (dt.Columns[i].ColumnName == (SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString()).ToUpper())

UAS-出货标签管理(贸易版)/PublicMethod/LogicHandler.cs

@@ -90,7 +90,7 @@ namespace UAS_LabelMachine.PublicMethod
             }
             catch (Exception)
             {
-                
+
             }
             BaseUtil.CustomerInit(oContent);
         }
@@ -481,5 +481,12 @@ namespace UAS_LabelMachine.PublicMethod
             UAS_出货标签打印.custserialnum = UAS_出货标签打印.custserialnum + 1;
             return str;
         }
+
+        public static void GetDataSQL(string iInoutno,string iText,out string oSQL) {
+            oSQL = "";
+            string[] param = new string[] { iInoutno, iText, oSQL };
+            dh.CallProcedure("SP_GETDATASQL", ref param);
+            oSQL = param[2];
+        }
     }
 }