修改获取导出模板SQL存储过程

UAS-出货标签管理(泽天)/PublicMethod/LogicHandler.cs

@@ -19,12 +19,12 @@ namespace UAS_LabelMachine.PublicMethod
             oSQL = param[2];
         }
 
-        public static void GetExportDataSQL(string iCustCode,string iType, string iText, out string oSQL)
+        public static void GetExportDataSQL(string iInoutno,string iCustCode,string iType, string iText, out string oSQL)
         {
             oSQL = "";
-            string[] param = new string[] { iCustCode, iType, iText, oSQL };
+            string[] param = new string[] { iInoutno, iCustCode, iType, iText, oSQL };
             dh.CallProcedure("sp_getexportDataSql", ref param);
-            oSQL = param[3];
+            oSQL = param[4];
         }
     }
 }

UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs

@@ -1886,21 +1886,21 @@
             this.SizeChanged += new System.EventHandler(this.贴标机条码打印_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.groupBoxWithBorder2.ResumeLayout(false);
+            this.groupBoxWithBorder2.ResumeLayout(true);
             this.groupBoxWithBorder2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridPrcode)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).EndInit();
-            this.SingleLabel.ResumeLayout(false);
+            this.SingleLabel.ResumeLayout(true);
             this.SingleLabel.PerformLayout();
-            this.MidLabel.ResumeLayout(false);
+            this.MidLabel.ResumeLayout(true);
             this.MidLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.MidboxCapacity)).EndInit();
-            this.OutBoxLabel.ResumeLayout(false);
+            this.OutBoxLabel.ResumeLayout(true);
             this.OutBoxLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.OutboxCapacity)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -1400,7 +1400,7 @@ namespace UAS_LabelMachine
                 sql.Clear();
                 sql.Append("select " + Fileds.Substring(0, Fileds.Length - 1) + " from ExportView where pib_inoutno='" + pi_inoutno.Text + "'");
                 string finnalSQL = "";
-                LogicHandler.GetExportDataSQL(pi_cardcode.Text, type, sql.ToString(), out finnalSQL);
+                LogicHandler.GetExportDataSQL(pi_inoutno.Text,pi_cardcode.Text, type, sql.ToString(), out finnalSQL);
                 dt = (DataTable)dh.ExecuteSql(finnalSQL, "select");
                 eh.ExportExcel(dt, Field, ExportFileDialog.SelectedPath, pi_date.Text + "-" + pi_inoutno.Text+ type);
                 string close = MessageBox.Show(this.ParentForm, "导出成功，是否打开文件", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();