箱标打印调整

UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs

@@ -1895,7 +1895,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(69, 167);
+            this.label16.Location = new System.Drawing.Point(67, 165);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(13, 17);
             this.label16.TabIndex = 87;
@@ -1914,7 +1914,7 @@
             // 
             this.SingleBoxEnd.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SingleBoxEnd.ID = null;
-            this.SingleBoxEnd.Location = new System.Drawing.Point(87, 162);
+            this.SingleBoxEnd.Location = new System.Drawing.Point(85, 162);
             this.SingleBoxEnd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleBoxEnd.Name = "SingleBoxEnd";
             this.SingleBoxEnd.Size = new System.Drawing.Size(50, 23);
@@ -2192,7 +2192,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(67, 167);
+            this.label18.Location = new System.Drawing.Point(65, 166);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(13, 17);
             this.label18.TabIndex = 90;
@@ -2215,7 +2215,7 @@
             // 
             this.MidBoxEnd.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.MidBoxEnd.ID = null;
-            this.MidBoxEnd.Location = new System.Drawing.Point(85, 163);
+            this.MidBoxEnd.Location = new System.Drawing.Point(83, 163);
             this.MidBoxEnd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidBoxEnd.Name = "MidBoxEnd";
             this.MidBoxEnd.Size = new System.Drawing.Size(50, 23);

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -1203,10 +1203,10 @@ namespace UAS_LabelMachine
                 string la_id = MidLabelCombox.SelectedValue.ToString().Split('#')[0];
                 for (int i = (begin == 0 ? 0 : begin); i <= (end == 0 ? LabelInf.Rows.Count - 1 : end); i++)
                 {
-                    if (!MidIDAndOutboxcode.ContainsValue(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())&& LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()!="")
+                    if (!MidIDAndOutboxcode.ContainsValue(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()) && LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString() != "")
                         MidIDAndOutboxcode.Add(LabelInf.Rows[i].Cells["pib_id1"].Value.ToString(), LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString());
                     string outboxcode1 = LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString();
-                    if (!MidOutBoxCode.Contains(int.Parse(outboxcode1 == "" ? "0" : outboxcode1)))
+                    if (!MidOutBoxCode.Contains(int.Parse(outboxcode1 == "" ? "0" : outboxcode1)) && outboxcode1 != "")
                     {
                         MidOutBoxCode.Add(int.Parse(outboxcode1 == "" ? "0" : outboxcode1));
                         MidOutBoxCodeIndex.Add(i);