将生成条码的SQL放入存储过程中，剥离客户定制化字段分组

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

@@ -6,6 +6,19 @@ namespace UAS_LabelMachine.PublicMethod
     {
         public static DataHelper dh = SystemInf.dh;
 
+        /// <summary>
+        /// 特殊业务过滤逻辑，目前只有海创在使用
+        /// </summary>
+        /// <param name="iCustCode"></param>
+        /// <param name="iBrand"></param>
+        /// <param name="iSpec"></param>
+        /// <param name="iQty"></param>
+        /// <param name="iDateCode"></param>
+        /// <param name="iLotno"></param>
+        /// <param name="oSpec"></param>
+        /// <param name="oQty"></param>
+        /// <param name="oDatecode"></param>
+        /// <param name="oLotno"></param>
         public static void FilterData(string iCustCode, string iBrand, string iSpec, string iQty, string iDateCode, string iLotno, out string oSpec, out string oQty, out string oDatecode, out string oLotno)
         {
             oSpec = "";
@@ -20,6 +33,15 @@ namespace UAS_LabelMachine.PublicMethod
             oLotno = param[9];
         }
 
+        /// <summary>
+        /// 通用方法，日期格式转换，转换成指定的年月日
+        /// </summary>
+        /// <param name="iDatecode"></param>
+        /// <param name="iCustcode"></param>
+        /// <param name="oYear"></param>
+        /// <param name="oMonth"></param>
+        /// <param name="oDay"></param>
+        /// <param name="oDate"></param>
         public static void GetTimeFromDatecode(string iDatecode, string iCustcode, out string oYear, out string oMonth, out string oDay, out string oDate)
         {
             oYear = "0";
@@ -34,12 +56,31 @@ namespace UAS_LabelMachine.PublicMethod
             oDate = param[5];
         }
 
-        public static void CustBarCode(string iInoutno,out string oSQL)
+        /// <summary>
+        /// 特殊业务条码处理，目前针对海创长城客户
+        /// </summary>
+        /// <param name="iInoutno"></param>
+        /// <param name="oSQL"></param>
+        public static void CustBarCode(string iInoutno, out string oSQL)
         {
             oSQL = "";
             string[] param = new string[] { iInoutno, oSQL };
             dh.CallProcedure("SP_CUSTBARCODE", ref param);
             oSQL = param[1];
         }
+
+        /// <summary>
+        /// 获取生成条码的SQL，目前添加用户海创和凯而高，凯而高有特殊定制逻辑
+        /// </summary>
+        /// <param name="iPiid"></param>
+        /// <param name="iCustCode"></param>
+        /// <param name="oSQL"></param>
+        public static void GenerateBarCode(string iPiid, string iCustCode, out string oSQL)
+        {
+            oSQL = "";
+            string[] param = new string[] { iPiid, iCustCode, oSQL };
+            dh.CallProcedure("sp_GenerateBarCode", ref param);
+            oSQL = param[2];
+        }
     }
 }

UAS-出货标签管理(贸易版)/生成条码.cs

@@ -500,8 +500,10 @@ namespace UAS_LabelMachine
                 switch (pi_class.Text)
                 {
                     case "出货单":
+                        string outsql = "";
+                        LogicHandler.GenerateBarCode(pi_id, CustCode, out outsql);
                         sql.Clear();
-                        sql.Append(CustomerBarCode());
+                        sql.Append(outsql);
                         break;
                     case "完工入库单":
                         sql.Clear();
@@ -544,37 +546,5 @@ namespace UAS_LabelMachine
                 pi_inoutno.Text = "";
             }
         }
-
-        private string CustomerBarCode()
-        {
-            DataTable custrule = (DataTable)dh.ExecuteSql("select CU_PRINT_MIDSPEC,CU_PRINT_MIDPO,cu_print_midprod from customer where cu_code='" + CustCode + "'", "select");
-            string condition = "";
-            if (custrule.Rows.Count > 0)
-            {
-                string cu_print_midspec = custrule.Rows[0]["cu_print_midspec"].ToString();
-                string cu_print_midpo = custrule.Rows[0]["cu_print_midpo"].ToString();
-                string cu_print_midprod = custrule.Rows[0]["cu_print_midprod"].ToString();
-                if (cu_print_midspec == "-1")
-                {
-                    condition += ",pd_vespec_user";
-                }
-                if (cu_print_midpo == "-1")
-                {
-                    condition += ",pd_pocode";
-                }
-                if (cu_print_midprod == "-1")
-                {
-                    condition += ",pd_custprodcode";
-                }
-            }
-            string sql = "";
-            sql += ("select pd_piid,pd_id,pr_id,pr_brand,pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,pd_custprodcode,");
-            sql += ("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,nvl(pd_vespec_user,pr_orispeccode)pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,");
-            sql += ("pd_prodcode,pd_custprodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
-            sql += ("from (select pd_piid,min(pd_id)pd_id,max(nvl(pd_vespecprint_user,pd_vespec_user))pd_vespec_user,sum(pd_outqty)outqty,min(pd_pocode)pd_pocode,min(pd_ordercode)pd_ordercode,min(pd_orderdetno)pd_orderdetno,min(pd_pdno)pd_pdno,max(pd_custprodcode)pd_custprodcode,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
-            sql += ("from prodiodetail group by pd_piid" + condition + ")T left join product ");
-            sql += ("on pr_code=pd_prodcode)  where  pd_piid='" + pi_id + "' order by pd_pdno");
-            return sql;
-        }
     }
 }

UAS-出货标签管理(贸易版)/附件内容打印.Designer.cs

@@ -54,12 +54,22 @@
             this.lap_id2 = new System.Windows.Forms.Label();
             this.lap_id3 = new System.Windows.Forms.Label();
             this.lap_id1 = new System.Windows.Forms.Label();
+            this.lap_id6 = new System.Windows.Forms.Label();
+            this.lap_value6 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.lap_value6_label = new System.Windows.Forms.Label();
+            this.lap_param6 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.lap_param6_label = new System.Windows.Forms.Label();
+            this.lap_id7 = new System.Windows.Forms.Label();
+            this.lap_value7 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.lap_value7_label = new System.Windows.Forms.Label();
+            this.lap_param7 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.lap_param7_label = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // lap_param1
             // 
             this.lap_param1.ID = null;
-            this.lap_param1.Location = new System.Drawing.Point(77, 49);
+            this.lap_param1.Location = new System.Drawing.Point(77, 21);
             this.lap_param1.Name = "lap_param1";
             this.lap_param1.Size = new System.Drawing.Size(89, 21);
             this.lap_param1.Str = null;
@@ -72,7 +82,7 @@
             this.lap_param1_label.AutoSize = true;
             this.lap_param1_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_param1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_param1_label.Location = new System.Drawing.Point(29, 49);
+            this.lap_param1_label.Location = new System.Drawing.Point(29, 21);
             this.lap_param1_label.Name = "lap_param1_label";
             this.lap_param1_label.Size = new System.Drawing.Size(42, 21);
             this.lap_param1_label.TabIndex = 61;
@@ -81,7 +91,7 @@
             // lap_value1
             // 
             this.lap_value1.ID = null;
-            this.lap_value1.Location = new System.Drawing.Point(235, 49);
+            this.lap_value1.Location = new System.Drawing.Point(235, 21);
             this.lap_value1.Name = "lap_value1";
             this.lap_value1.Size = new System.Drawing.Size(89, 21);
             this.lap_value1.Str = null;
@@ -94,7 +104,7 @@
             this.lap_value1_label.AutoSize = true;
             this.lap_value1_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_value1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_value1_label.Location = new System.Drawing.Point(187, 49);
+            this.lap_value1_label.Location = new System.Drawing.Point(187, 21);
             this.lap_value1_label.Name = "lap_value1_label";
             this.lap_value1_label.Size = new System.Drawing.Size(42, 21);
             this.lap_value1_label.TabIndex = 63;
@@ -103,7 +113,7 @@
             // lap_value3
             // 
             this.lap_value3.ID = null;
-            this.lap_value3.Location = new System.Drawing.Point(235, 153);
+            this.lap_value3.Location = new System.Drawing.Point(235, 109);
             this.lap_value3.Name = "lap_value3";
             this.lap_value3.Size = new System.Drawing.Size(89, 21);
             this.lap_value3.Str = null;
@@ -116,7 +126,7 @@
             this.lap_value3_label.AutoSize = true;
             this.lap_value3_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_value3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_value3_label.Location = new System.Drawing.Point(187, 153);
+            this.lap_value3_label.Location = new System.Drawing.Point(187, 109);
             this.lap_value3_label.Name = "lap_value3_label";
             this.lap_value3_label.Size = new System.Drawing.Size(42, 21);
             this.lap_value3_label.TabIndex = 67;
@@ -125,7 +135,7 @@
             // lap_param3
             // 
             this.lap_param3.ID = null;
-            this.lap_param3.Location = new System.Drawing.Point(77, 153);
+            this.lap_param3.Location = new System.Drawing.Point(77, 109);
             this.lap_param3.Name = "lap_param3";
             this.lap_param3.Size = new System.Drawing.Size(89, 21);
             this.lap_param3.Str = null;
@@ -138,7 +148,7 @@
             this.lap_param3_labe.AutoSize = true;
             this.lap_param3_labe.BackColor = System.Drawing.Color.Transparent;
             this.lap_param3_labe.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_param3_labe.Location = new System.Drawing.Point(29, 153);
+            this.lap_param3_labe.Location = new System.Drawing.Point(29, 109);
             this.lap_param3_labe.Name = "lap_param3_labe";
             this.lap_param3_labe.Size = new System.Drawing.Size(42, 21);
             this.lap_param3_labe.TabIndex = 65;
@@ -147,7 +157,7 @@
             // lap_value2
             // 
             this.lap_value2.ID = null;
-            this.lap_value2.Location = new System.Drawing.Point(235, 102);
+            this.lap_value2.Location = new System.Drawing.Point(235, 64);
             this.lap_value2.Name = "lap_value2";
             this.lap_value2.Size = new System.Drawing.Size(89, 21);
             this.lap_value2.Str = null;
@@ -160,7 +170,7 @@
             this.lap_value2_label.AutoSize = true;
             this.lap_value2_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_value2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_value2_label.Location = new System.Drawing.Point(187, 102);
+            this.lap_value2_label.Location = new System.Drawing.Point(187, 64);
             this.lap_value2_label.Name = "lap_value2_label";
             this.lap_value2_label.Size = new System.Drawing.Size(42, 21);
             this.lap_value2_label.TabIndex = 71;
@@ -169,7 +179,7 @@
             // lap_param2
             // 
             this.lap_param2.ID = null;
-            this.lap_param2.Location = new System.Drawing.Point(77, 102);
+            this.lap_param2.Location = new System.Drawing.Point(77, 64);
             this.lap_param2.Name = "lap_param2";
             this.lap_param2.Size = new System.Drawing.Size(89, 21);
             this.lap_param2.Str = null;
@@ -182,7 +192,7 @@
             this.lap_param2_label.AutoSize = true;
             this.lap_param2_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_param2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_param2_label.Location = new System.Drawing.Point(29, 102);
+            this.lap_param2_label.Location = new System.Drawing.Point(29, 64);
             this.lap_param2_label.Name = "lap_param2_label";
             this.lap_param2_label.Size = new System.Drawing.Size(42, 21);
             this.lap_param2_label.TabIndex = 69;
@@ -191,7 +201,7 @@
             // lap_value5
             // 
             this.lap_value5.ID = null;
-            this.lap_value5.Location = new System.Drawing.Point(235, 247);
+            this.lap_value5.Location = new System.Drawing.Point(235, 204);
             this.lap_value5.Name = "lap_value5";
             this.lap_value5.Size = new System.Drawing.Size(89, 21);
             this.lap_value5.Str = null;
@@ -204,7 +214,7 @@
             this.lap_value5_label.AutoSize = true;
             this.lap_value5_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_value5_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_value5_label.Location = new System.Drawing.Point(187, 247);
+            this.lap_value5_label.Location = new System.Drawing.Point(187, 204);
             this.lap_value5_label.Name = "lap_value5_label";
             this.lap_value5_label.Size = new System.Drawing.Size(42, 21);
             this.lap_value5_label.TabIndex = 75;
@@ -213,7 +223,7 @@
             // lap_param5
             // 
             this.lap_param5.ID = null;
-            this.lap_param5.Location = new System.Drawing.Point(77, 247);
+            this.lap_param5.Location = new System.Drawing.Point(77, 204);
             this.lap_param5.Name = "lap_param5";
             this.lap_param5.Size = new System.Drawing.Size(89, 21);
             this.lap_param5.Str = null;
@@ -226,7 +236,7 @@
             this.lap_param5_label.AutoSize = true;
             this.lap_param5_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_param5_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_param5_label.Location = new System.Drawing.Point(29, 247);
+            this.lap_param5_label.Location = new System.Drawing.Point(29, 204);
             this.lap_param5_label.Name = "lap_param5_label";
             this.lap_param5_label.Size = new System.Drawing.Size(42, 21);
             this.lap_param5_label.TabIndex = 73;
@@ -235,7 +245,7 @@
             // lap_value4
             // 
             this.lap_value4.ID = null;
-            this.lap_value4.Location = new System.Drawing.Point(235, 197);
+            this.lap_value4.Location = new System.Drawing.Point(235, 155);
             this.lap_value4.Name = "lap_value4";
             this.lap_value4.Size = new System.Drawing.Size(89, 21);
             this.lap_value4.Str = null;
@@ -248,7 +258,7 @@
             this.lap_value4_label.AutoSize = true;
             this.lap_value4_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_value4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_value4_label.Location = new System.Drawing.Point(187, 197);
+            this.lap_value4_label.Location = new System.Drawing.Point(187, 155);
             this.lap_value4_label.Name = "lap_value4_label";
             this.lap_value4_label.Size = new System.Drawing.Size(42, 21);
             this.lap_value4_label.TabIndex = 79;
@@ -257,7 +267,7 @@
             // lap_param4
             // 
             this.lap_param4.ID = null;
-            this.lap_param4.Location = new System.Drawing.Point(77, 197);
+            this.lap_param4.Location = new System.Drawing.Point(77, 155);
             this.lap_param4.Name = "lap_param4";
             this.lap_param4.Size = new System.Drawing.Size(89, 21);
             this.lap_param4.Str = null;
@@ -270,7 +280,7 @@
             this.lap_param4_label.AutoSize = true;
             this.lap_param4_label.BackColor = System.Drawing.Color.Transparent;
             this.lap_param4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_param4_label.Location = new System.Drawing.Point(29, 197);
+            this.lap_param4_label.Location = new System.Drawing.Point(29, 155);
             this.lap_param4_label.Name = "lap_param4_label";
             this.lap_param4_label.Size = new System.Drawing.Size(42, 21);
             this.lap_param4_label.TabIndex = 77;
@@ -278,7 +288,7 @@
             // 
             // Confirm
             // 
-            this.Confirm.Location = new System.Drawing.Point(148, 308);
+            this.Confirm.Location = new System.Drawing.Point(143, 360);
             this.Confirm.Name = "Confirm";
             this.Confirm.Size = new System.Drawing.Size(75, 23);
             this.Confirm.TabIndex = 81;
@@ -291,7 +301,7 @@
             this.lap_id4.AutoSize = true;
             this.lap_id4.BackColor = System.Drawing.Color.Transparent;
             this.lap_id4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_id4.Location = new System.Drawing.Point(139, 197);
+            this.lap_id4.Location = new System.Drawing.Point(139, 155);
             this.lap_id4.Name = "lap_id4";
             this.lap_id4.Size = new System.Drawing.Size(0, 21);
             this.lap_id4.TabIndex = 86;
@@ -302,7 +312,7 @@
             this.lap_id5.AutoSize = true;
             this.lap_id5.BackColor = System.Drawing.Color.Transparent;
             this.lap_id5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_id5.Location = new System.Drawing.Point(139, 247);
+            this.lap_id5.Location = new System.Drawing.Point(139, 204);
             this.lap_id5.Name = "lap_id5";
             this.lap_id5.Size = new System.Drawing.Size(0, 21);
             this.lap_id5.TabIndex = 85;
@@ -313,7 +323,7 @@
             this.lap_id2.AutoSize = true;
             this.lap_id2.BackColor = System.Drawing.Color.Transparent;
             this.lap_id2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_id2.Location = new System.Drawing.Point(139, 102);
+            this.lap_id2.Location = new System.Drawing.Point(139, 64);
             this.lap_id2.Name = "lap_id2";
             this.lap_id2.Size = new System.Drawing.Size(0, 21);
             this.lap_id2.TabIndex = 84;
@@ -324,7 +334,7 @@
             this.lap_id3.AutoSize = true;
             this.lap_id3.BackColor = System.Drawing.Color.Transparent;
             this.lap_id3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_id3.Location = new System.Drawing.Point(139, 153);
+            this.lap_id3.Location = new System.Drawing.Point(139, 109);
             this.lap_id3.Name = "lap_id3";
             this.lap_id3.Size = new System.Drawing.Size(0, 21);
             this.lap_id3.TabIndex = 83;
@@ -335,17 +345,137 @@
             this.lap_id1.AutoSize = true;
             this.lap_id1.BackColor = System.Drawing.Color.Transparent;
             this.lap_id1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lap_id1.Location = new System.Drawing.Point(139, 49);
+            this.lap_id1.Location = new System.Drawing.Point(139, 21);
             this.lap_id1.Name = "lap_id1";
             this.lap_id1.Size = new System.Drawing.Size(0, 21);
             this.lap_id1.TabIndex = 82;
             this.lap_id1.Visible = false;
             // 
+            // lap_id6
+            // 
+            this.lap_id6.AutoSize = true;
+            this.lap_id6.BackColor = System.Drawing.Color.Transparent;
+            this.lap_id6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lap_id6.Location = new System.Drawing.Point(139, 251);
+            this.lap_id6.Name = "lap_id6";
+            this.lap_id6.Size = new System.Drawing.Size(0, 21);
+            this.lap_id6.TabIndex = 91;
+            this.lap_id6.Visible = false;
+            // 
+            // lap_value6
+            // 
+            this.lap_value6.ID = null;
+            this.lap_value6.Location = new System.Drawing.Point(235, 251);
+            this.lap_value6.Name = "lap_value6";
+            this.lap_value6.Size = new System.Drawing.Size(89, 21);
+            this.lap_value6.Str = null;
+            this.lap_value6.Str1 = null;
+            this.lap_value6.Str2 = null;
+            this.lap_value6.TabIndex = 88;
+            // 
+            // lap_value6_label
+            // 
+            this.lap_value6_label.AutoSize = true;
+            this.lap_value6_label.BackColor = System.Drawing.Color.Transparent;
+            this.lap_value6_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lap_value6_label.Location = new System.Drawing.Point(187, 251);
+            this.lap_value6_label.Name = "lap_value6_label";
+            this.lap_value6_label.Size = new System.Drawing.Size(42, 21);
+            this.lap_value6_label.TabIndex = 90;
+            this.lap_value6_label.Text = "内容";
+            // 
+            // lap_param6
+            // 
+            this.lap_param6.ID = null;
+            this.lap_param6.Location = new System.Drawing.Point(77, 251);
+            this.lap_param6.Name = "lap_param6";
+            this.lap_param6.Size = new System.Drawing.Size(89, 21);
+            this.lap_param6.Str = null;
+            this.lap_param6.Str1 = null;
+            this.lap_param6.Str2 = null;
+            this.lap_param6.TabIndex = 87;
+            // 
+            // lap_param6_label
+            // 
+            this.lap_param6_label.AutoSize = true;
+            this.lap_param6_label.BackColor = System.Drawing.Color.Transparent;
+            this.lap_param6_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lap_param6_label.Location = new System.Drawing.Point(29, 251);
+            this.lap_param6_label.Name = "lap_param6_label";
+            this.lap_param6_label.Size = new System.Drawing.Size(42, 21);
+            this.lap_param6_label.TabIndex = 89;
+            this.lap_param6_label.Text = "参数";
+            // 
+            // lap_id7
+            // 
+            this.lap_id7.AutoSize = true;
+            this.lap_id7.BackColor = System.Drawing.Color.Transparent;
+            this.lap_id7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lap_id7.Location = new System.Drawing.Point(139, 300);
+            this.lap_id7.Name = "lap_id7";
+            this.lap_id7.Size = new System.Drawing.Size(0, 21);
+            this.lap_id7.TabIndex = 96;
+            this.lap_id7.Visible = false;
+            // 
+            // lap_value7
+            // 
+            this.lap_value7.ID = null;
+            this.lap_value7.Location = new System.Drawing.Point(235, 300);
+            this.lap_value7.Name = "lap_value7";
+            this.lap_value7.Size = new System.Drawing.Size(89, 21);
+            this.lap_value7.Str = null;
+            this.lap_value7.Str1 = null;
+            this.lap_value7.Str2 = null;
+            this.lap_value7.TabIndex = 93;
+            // 
+            // lap_value7_label
+            // 
+            this.lap_value7_label.AutoSize = true;
+            this.lap_value7_label.BackColor = System.Drawing.Color.Transparent;
+            this.lap_value7_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lap_value7_label.Location = new System.Drawing.Point(187, 300);
+            this.lap_value7_label.Name = "lap_value7_label";
+            this.lap_value7_label.Size = new System.Drawing.Size(42, 21);
+            this.lap_value7_label.TabIndex = 95;
+            this.lap_value7_label.Text = "内容";
+            // 
+            // lap_param7
+            // 
+            this.lap_param7.ID = null;
+            this.lap_param7.Location = new System.Drawing.Point(77, 300);
+            this.lap_param7.Name = "lap_param7";
+            this.lap_param7.Size = new System.Drawing.Size(89, 21);
+            this.lap_param7.Str = null;
+            this.lap_param7.Str1 = null;
+            this.lap_param7.Str2 = null;
+            this.lap_param7.TabIndex = 92;
+            // 
+            // lap_param7_label
+            // 
+            this.lap_param7_label.AutoSize = true;
+            this.lap_param7_label.BackColor = System.Drawing.Color.Transparent;
+            this.lap_param7_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lap_param7_label.Location = new System.Drawing.Point(29, 300);
+            this.lap_param7_label.Name = "lap_param7_label";
+            this.lap_param7_label.Size = new System.Drawing.Size(42, 21);
+            this.lap_param7_label.TabIndex = 94;
+            this.lap_param7_label.Text = "参数";
+            // 
             // 附件内容打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(364, 359);
+            this.ClientSize = new System.Drawing.Size(364, 395);
+            this.Controls.Add(this.lap_id7);
+            this.Controls.Add(this.lap_value7);
+            this.Controls.Add(this.lap_value7_label);
+            this.Controls.Add(this.lap_param7);
+            this.Controls.Add(this.lap_param7_label);
+            this.Controls.Add(this.lap_id6);
+            this.Controls.Add(this.lap_value6);
+            this.Controls.Add(this.lap_value6_label);
+            this.Controls.Add(this.lap_param6);
+            this.Controls.Add(this.lap_param6_label);
             this.Controls.Add(this.lap_id4);
             this.Controls.Add(this.lap_id5);
             this.Controls.Add(this.lap_id2);
@@ -409,5 +539,15 @@
         private System.Windows.Forms.Label lap_id2;
         private System.Windows.Forms.Label lap_id3;
         private System.Windows.Forms.Label lap_id1;
+        private System.Windows.Forms.Label lap_id6;
+        private CustomControl.EnterTextBox lap_value6;
+        private System.Windows.Forms.Label lap_value6_label;
+        private CustomControl.EnterTextBox lap_param6;
+        private System.Windows.Forms.Label lap_param6_label;
+        private System.Windows.Forms.Label lap_id7;
+        private CustomControl.EnterTextBox lap_value7;
+        private System.Windows.Forms.Label lap_value7_label;
+        private CustomControl.EnterTextBox lap_param7;
+        private System.Windows.Forms.Label lap_param7_label;
     }
 }

UAS-出货标签管理(贸易版)/附件内容打印.cs

@@ -37,7 +37,7 @@ namespace UAS_LabelMachine
         private void Confirm_Click(object sender, EventArgs e)
         {
             string SQL = "";
-            for (int i = 1; i < 6; i++)
+            for (int i = 1; i < 8; i++)
             {
                 if (Controls["lap_id" + i].Text == "")
                 {