Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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

@@ -49,6 +49,7 @@
             this.FirstPage.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.FirstPage.Location = new System.Drawing.Point(12, 50);
             this.FirstPage.Name = "FirstPage";
+            this.FirstPage.ReadOnly = true;
             this.FirstPage.RowTemplate.Height = 23;
             this.FirstPage.Size = new System.Drawing.Size(1197, 270);
             this.FirstPage.TabIndex = 0;
@@ -63,6 +64,7 @@
             this.DataPage.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DataPage.Location = new System.Drawing.Point(12, 365);
             this.DataPage.Name = "DataPage";
+            this.DataPage.ReadOnly = true;
             this.DataPage.RowTemplate.Height = 23;
             this.DataPage.Size = new System.Drawing.Size(1197, 270);
             this.DataPage.TabIndex = 1;

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
 {
@@ -47,7 +48,7 @@ namespace UAS_LabelMachine
             List<string> es_filed1 = new List<string>();
             List<string> es_istitle = new List<string>();
             //插入首页固定的抬头
-            es_filed.Add("pi_title"); es_caption.Add("客户"); es_enable.Add("-1"); es_prefix.Add("'客户：'"); es_suffix.Add("''"); es_detno.Add("0.1"); es_filed1.Add("pi_title"); es_istitle.Add("-1");
+            es_filed.Add("pi_title"); es_caption.Add("客户"); es_enable.Add("-1"); es_prefix.Add("'客户:'"); es_suffix.Add("''"); es_detno.Add("0.1"); es_filed1.Add("pi_title"); es_istitle.Add("-1");
             es_filed.Add("pi_inoutno"); es_caption.Add("出货单号"); es_enable.Add("-1"); es_prefix.Add("'出货单号：'"); es_suffix.Add("''"); es_detno.Add("0.2"); es_filed1.Add("pi_inoutno"); es_istitle.Add("-1");
             es_filed.Add("pr_spec"); es_caption.Add("型号"); es_enable.Add("-1"); es_prefix.Add("'型号：'"); es_suffix.Add("''"); es_detno.Add("0.3"); es_filed1.Add("pr_spec"); es_istitle.Add("-1");
             es_filed.Add("pi_date"); es_caption.Add("销售日期"); es_enable.Add("-1"); es_prefix.Add("'销售日期：'"); es_suffix.Add("'销售部门:市场部'"); es_detno.Add("0.4"); es_filed1.Add("pi_date"); es_istitle.Add("-1");
@@ -65,7 +66,7 @@ namespace UAS_LabelMachine
                         es_enable.Add("-1");
                         es_prefix.Add("''");
                         es_suffix.Add("''");
-                        es_detno.Add((FirstPage.Columns[j].DisplayIndex+1).ToString());
+                        es_detno.Add((FirstPage.Columns[j].DisplayIndex + 1).ToString());
                         es_filed1.Add(FirstPage.Columns[j].Tag.ToString());
                         es_istitle.Add("");
                     }
@@ -76,7 +77,7 @@ namespace UAS_LabelMachine
             sql.Append("values('First',:es_filed,:es_caption,:es_enable,:es_prefix,:es_suffix,:es_detno,:es_filed1,'" + custcode + "',:es_istitle)");
             dh.BatchInsert(sql.ToString(), new string[] { "es_filed", "es_caption", "es_enable", "es_prefix", "es_suffix", "es_detno", "es_filed1", "es_istitle" }, es_filed.ToArray(), es_caption.ToArray(), es_enable.ToArray(), es_prefix.ToArray(), es_suffix.ToArray(), es_detno.ToArray(), es_filed1.ToArray(), es_istitle.ToArray());
             //清除首页赋的值
-            es_filed.Clear(); es_caption.Clear();es_enable.Clear();es_prefix.Clear();es_suffix.Clear();es_detno.Clear();es_filed.Clear();es_filed1.Clear();es_istitle.Clear();
+            es_filed.Clear(); es_caption.Clear(); es_enable.Clear(); es_prefix.Clear(); es_suffix.Clear(); es_detno.Clear(); es_filed.Clear(); es_filed1.Clear(); es_istitle.Clear();
             //新生成Data的抬头
             es_filed.Add("pi_title"); es_caption.Add("客户"); es_enable.Add("-1"); es_prefix.Add("'客户：'"); es_suffix.Add("''"); es_detno.Add("0.1"); es_filed1.Add("pi_title"); es_istitle.Add("-1");
             es_filed.Add("pi_inoutno"); es_caption.Add("出货单号"); es_enable.Add("-1"); es_prefix.Add("'出货单号：'"); es_suffix.Add("''"); es_detno.Add("0.2"); es_filed1.Add("pi_inoutno"); es_istitle.Add("-1");
@@ -89,7 +90,7 @@ namespace UAS_LabelMachine
                     if (i == DataPage.Columns[j].DisplayIndex)
                     {
                         //pr_spec1 冲突BUG暂时无解，先特殊处理
-                        es_filed.Add(DataPage.Columns[j].Tag.ToString()=="pr_spec1"?"pr_spec": DataPage.Columns[j].Tag.ToString());
+                        es_filed.Add(DataPage.Columns[j].Tag.ToString() == "pr_spec1" ? "pr_spec" : DataPage.Columns[j].Tag.ToString());
                         es_caption.Add(DataPage.Columns[j].DataPropertyName);
                         es_enable.Add("-1");
                         es_prefix.Add("''");
@@ -104,6 +105,7 @@ namespace UAS_LabelMachine
             sql.Append("insert into CS_EXPORTSETTING(es_type,es_filed,es_caption,es_enable,es_prefix,es_suffix,es_detno,es_filed1,es_custcode,es_istitle)");
             sql.Append("values('DataPage',:es_filed,:es_caption,:es_enable,:es_prefix,:es_suffix,:es_detno,:es_filed1,'" + custcode + "',:es_istitle)");
             dh.BatchInsert(sql.ToString(), new string[] { "es_filed", "es_caption", "es_enable", "es_prefix", "es_suffix", "es_detno", "es_filed1", "es_istitle" }, es_filed.ToArray(), es_caption.ToArray(), es_enable.ToArray(), es_prefix.ToArray(), es_suffix.ToArray(), es_detno.ToArray(), es_filed1.ToArray(), es_istitle.ToArray());
+            MessageBox.Show("保存成功!");
         }
 
         private void ResetColumns_Click(object sender, EventArgs e)
@@ -174,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  prodinout left join prodiodetail on pi_id=pd_piid left join ");
-            sql.Append("chip_in_out on pd_id=io_pdid 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())
@@ -240,6 +238,10 @@ namespace UAS_LabelMachine
                     }
                 }
             }
+            DataPage.Columns["chw_percent1"].HeaderText = "机测1";
+            DataPage.Columns["chw_percent2"].HeaderText = "机测2";
+            DataPage.Columns["chw_itemname1"].Visible = false;
+            DataPage.Columns["chw_itemname2"].Visible = false;
         }
     }
 }

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];
+        }
     }
 }

UAS-出货标签管理(贸易版)/SQL/SQL.txt

@@ -316,4 +316,18 @@ namespace CustInitSpace
     }
 }';
   end;
+end;
+
+
+/*获取数据页数据的SQL*/
+create or replace PROCEDURE sp_getDataSql(
+  v_inoutno in varchar2,
+  v_text in varchar2,
+  v_sql out varchar2
+)as 
+begin
+  v_sql:='select' ||v_text|| ' from  prodinout left join prodiodetail 
+  on pi_id=pd_piid left join chip_in_out on io_piid=pi_id and pd_id=io_pdid left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode 
+  left join CHIP_EDCDATA_VIEW on che_chipcode=ch_code left join product on pr_code=pd_prodcode left join prodiobarcode on 
+  pib_piid=pi_id and pib_custbarcode=ch_code where pi_inoutno='''||v_inoutno||''' order by ch_code';
 end;