Browse Source

附加信息BUG

章政 7 years ago
parent
commit
01ce92cffc

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

@@ -36,7 +36,6 @@
             this.CleanDetail = new System.Windows.Forms.Button();
             this.CleanDetail = new System.Windows.Forms.Button();
             this.pib_id = new System.Windows.Forms.Label();
             this.pib_id = new System.Windows.Forms.Label();
             this.pi_cardcode = new System.Windows.Forms.Label();
             this.pi_cardcode = new System.Windows.Forms.Label();
-            this.pi_cardcode_label = new System.Windows.Forms.Label();
             this.Fresh = new System.Windows.Forms.LinkLabel();
             this.Fresh = new System.Windows.Forms.LinkLabel();
             this.RefreshDBConnect = new System.Windows.Forms.Timer(this.components);
             this.RefreshDBConnect = new System.Windows.Forms.Timer(this.components);
             this.GetGridOnly = new System.Windows.Forms.CheckBox();
             this.GetGridOnly = new System.Windows.Forms.CheckBox();
@@ -151,6 +150,8 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
             this.Combindetail = new System.Windows.Forms.CheckBox();
             this.Combindetail = new System.Windows.Forms.CheckBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.pi_title = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridPrcode)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridPrcode)).BeginInit();
@@ -167,7 +168,7 @@
             // 
             // 
             this.pi_inoutno_label.AutoSize = true;
             this.pi_inoutno_label.AutoSize = true;
             this.pi_inoutno_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pi_inoutno_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_inoutno_label.Location = new System.Drawing.Point(4, 12);
+            this.pi_inoutno_label.Location = new System.Drawing.Point(12, 13);
             this.pi_inoutno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pi_inoutno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pi_inoutno_label.Name = "pi_inoutno_label";
             this.pi_inoutno_label.Name = "pi_inoutno_label";
             this.pi_inoutno_label.Size = new System.Drawing.Size(82, 24);
             this.pi_inoutno_label.Size = new System.Drawing.Size(82, 24);
@@ -224,22 +225,12 @@
             // 
             // 
             this.pi_cardcode.AutoSize = true;
             this.pi_cardcode.AutoSize = true;
             this.pi_cardcode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pi_cardcode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_cardcode.Location = new System.Drawing.Point(103, 48);
+            this.pi_cardcode.Location = new System.Drawing.Point(339, 138);
             this.pi_cardcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pi_cardcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pi_cardcode.Name = "pi_cardcode";
             this.pi_cardcode.Name = "pi_cardcode";
             this.pi_cardcode.Size = new System.Drawing.Size(0, 24);
             this.pi_cardcode.Size = new System.Drawing.Size(0, 24);
             this.pi_cardcode.TabIndex = 71;
             this.pi_cardcode.TabIndex = 71;
-            // 
-            // pi_cardcode_label
-            // 
-            this.pi_cardcode_label.AutoSize = true;
-            this.pi_cardcode_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_cardcode_label.Location = new System.Drawing.Point(4, 48);
-            this.pi_cardcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pi_cardcode_label.Name = "pi_cardcode_label";
-            this.pi_cardcode_label.Size = new System.Drawing.Size(82, 24);
-            this.pi_cardcode_label.TabIndex = 72;
-            this.pi_cardcode_label.Text = "客户编号";
+            this.pi_cardcode.Visible = false;
             // 
             // 
             // Fresh
             // Fresh
             // 
             // 
@@ -261,7 +252,7 @@
             // 
             // 
             this.GetGridOnly.AutoSize = true;
             this.GetGridOnly.AutoSize = true;
             this.GetGridOnly.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetGridOnly.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetGridOnly.Location = new System.Drawing.Point(199, 48);
+            this.GetGridOnly.Location = new System.Drawing.Point(517, 245);
             this.GetGridOnly.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.GetGridOnly.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.GetGridOnly.Name = "GetGridOnly";
             this.GetGridOnly.Name = "GetGridOnly";
             this.GetGridOnly.Size = new System.Drawing.Size(96, 23);
             this.GetGridOnly.Size = new System.Drawing.Size(96, 23);
@@ -805,7 +796,7 @@
             // 
             // 
             this.label18.AutoSize = true;
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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(85, 137);
+            this.label18.Location = new System.Drawing.Point(85, 132);
             this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label18.Name = "label18";
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(15, 20);
             this.label18.Size = new System.Drawing.Size(15, 20);
@@ -840,7 +831,7 @@
             // 
             // 
             this.label16.AutoSize = true;
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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(84, 58);
+            this.label16.Location = new System.Drawing.Point(84, 53);
             this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label16.Name = "label16";
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(15, 20);
             this.label16.Size = new System.Drawing.Size(15, 20);
@@ -875,7 +866,7 @@
             // 
             // 
             this.label12.AutoSize = true;
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(9, 90);
+            this.label12.Location = new System.Drawing.Point(9, 85);
             this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label12.Name = "label12";
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(69, 20);
             this.label12.Size = new System.Drawing.Size(69, 20);
@@ -886,7 +877,7 @@
             // 
             // 
             this.label7.AutoSize = true;
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(9, 19);
+            this.label7.Location = new System.Drawing.Point(9, 14);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(69, 20);
             this.label7.Size = new System.Drawing.Size(69, 20);
@@ -1141,7 +1132,7 @@
             // 
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(94, 220);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(229, 215);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(91, 32);
             this.SingleLabelPrint.Size = new System.Drawing.Size(91, 32);
@@ -1156,7 +1147,7 @@
             this.SingleLabelAutoPrint.Checked = true;
             this.SingleLabelAutoPrint.Checked = true;
             this.SingleLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.SingleLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(8, 115);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(8, 110);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(91, 24);
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(91, 24);
@@ -1209,7 +1200,7 @@
             // 
             // 
             this.label2.AutoSize = true;
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(5, 149);
+            this.label2.Location = new System.Drawing.Point(5, 145);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(39, 20);
             this.label2.Size = new System.Drawing.Size(39, 20);
@@ -1233,7 +1224,7 @@
             // 
             // 
             this.label5.AutoSize = true;
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(7, 189);
+            this.label5.Location = new System.Drawing.Point(7, 185);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(39, 20);
             this.label5.Size = new System.Drawing.Size(39, 20);
@@ -1267,7 +1258,7 @@
             this.MidLabelAutoPrint.Checked = true;
             this.MidLabelAutoPrint.Checked = true;
             this.MidLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.MidLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(12, 115);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(12, 111);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(91, 24);
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(91, 24);
@@ -1310,7 +1301,7 @@
             // LogingOut
             // LogingOut
             // 
             // 
             this.LogingOut.AutoSize = true;
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(145, 7);
+            this.LogingOut.Location = new System.Drawing.Point(145, 2);
             this.LogingOut.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.LogingOut.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(52, 27);
             this.LogingOut.Size = new System.Drawing.Size(52, 27);
@@ -1337,7 +1328,7 @@
             // 
             // 
             this.label10.AutoSize = true;
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(9, 184);
+            this.label10.Location = new System.Drawing.Point(9, 179);
             this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(39, 20);
             this.label10.Size = new System.Drawing.Size(39, 20);
@@ -1348,7 +1339,7 @@
             // 
             // 
             this.label6.AutoSize = true;
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(9, 137);
+            this.label6.Location = new System.Drawing.Point(9, 132);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(39, 20);
             this.label6.Size = new System.Drawing.Size(39, 20);
@@ -1408,14 +1399,38 @@
             this.Combindetail.TabIndex = 104;
             this.Combindetail.TabIndex = 104;
             this.Combindetail.Text = "合并明细";
             this.Combindetail.Text = "合并明细";
             this.Combindetail.UseVisualStyleBackColor = true;
             this.Combindetail.UseVisualStyleBackColor = true;
+            this.Combindetail.Visible = false;
             this.Combindetail.CheckedChanged += new System.EventHandler(this.Combindetail_CheckedChanged);
             this.Combindetail.CheckedChanged += new System.EventHandler(this.Combindetail_CheckedChanged);
             // 
             // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(12, 51);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(82, 24);
+            this.label8.TabIndex = 106;
+            this.label8.Text = "客户名称";
+            // 
+            // pi_title
+            // 
+            this.pi_title.AutoSize = true;
+            this.pi_title.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pi_title.Location = new System.Drawing.Point(111, 51);
+            this.pi_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pi_title.Name = "pi_title";
+            this.pi_title.Size = new System.Drawing.Size(0, 24);
+            this.pi_title.TabIndex = 105;
+            // 
             // UAS_出货标签打印
             // UAS_出货标签打印
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(1676, 911);
             this.ClientSize = new System.Drawing.Size(1676, 911);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.pi_title);
             this.Controls.Add(this.Combindetail);
             this.Controls.Add(this.Combindetail);
             this.Controls.Add(this.CustomerLabel);
             this.Controls.Add(this.CustomerLabel);
             this.Controls.Add(this.PackMidBox);
             this.Controls.Add(this.PackMidBox);
@@ -1439,7 +1454,6 @@
             this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.GetGridOnly);
             this.Controls.Add(this.GetGridOnly);
             this.Controls.Add(this.Fresh);
             this.Controls.Add(this.Fresh);
-            this.Controls.Add(this.pi_cardcode_label);
             this.Controls.Add(this.pi_cardcode);
             this.Controls.Add(this.pi_cardcode);
             this.Controls.Add(this.pib_id);
             this.Controls.Add(this.pib_id);
             this.Controls.Add(this.CleanDetail);
             this.Controls.Add(this.CleanDetail);
@@ -1528,7 +1542,6 @@
         private System.Windows.Forms.Button CleanDetail;
         private System.Windows.Forms.Button CleanDetail;
         private System.Windows.Forms.Label pib_id;
         private System.Windows.Forms.Label pib_id;
         private System.Windows.Forms.Label pi_cardcode;
         private System.Windows.Forms.Label pi_cardcode;
-        private System.Windows.Forms.Label pi_cardcode_label;
         private System.Windows.Forms.LinkLabel Fresh;
         private System.Windows.Forms.LinkLabel Fresh;
         private System.Windows.Forms.LinkLabel LogingOut;
         private System.Windows.Forms.LinkLabel LogingOut;
         private System.Windows.Forms.Timer RefreshDBConnect;
         private System.Windows.Forms.Timer RefreshDBConnect;
@@ -1602,5 +1615,7 @@
         private System.Windows.Forms.Button PackMidBox;
         private System.Windows.Forms.Button PackMidBox;
         private System.Windows.Forms.Button CustomerLabel;
         private System.Windows.Forms.Button CustomerLabel;
         private System.Windows.Forms.CheckBox Combindetail;
         private System.Windows.Forms.CheckBox Combindetail;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label pi_title;
     }
     }
 }
 }

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

@@ -414,6 +414,8 @@ namespace UAS_LabelMachine
                     else
                     else
                         pibid += PIBID[i];
                         pibid += PIBID[i];
                 }
                 }
+                if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
+                    SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
                 for (int j = 0; j < SingleReport.Parameters.Count; j++)
                 for (int j = 0; j < SingleReport.Parameters.Count; j++)
                 {
                 {
                     SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
                     SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
@@ -425,8 +427,6 @@ namespace UAS_LabelMachine
                         }
                         }
                     }
                     }
                 }
                 }
-                if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                    SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
                 DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiosingleinfo_view where 主键ID in (" + pibid + ")", "select");
                 DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiosingleinfo_view where 主键ID in (" + pibid + ")", "select");
                 SingleReport.RegisterData(dt, "prodiosingleinfo_view");
                 SingleReport.RegisterData(dt, "prodiosingleinfo_view");
                 SingleReport.GetDataSource("prodiosingleinfo_view").Enabled = true;
                 SingleReport.GetDataSource("prodiosingleinfo_view").Enabled = true;
@@ -556,11 +556,12 @@ namespace UAS_LabelMachine
             {
             {
                 Input.Clear();
                 Input.Clear();
                 sql.Clear();
                 sql.Clear();
-                sql.Append("select pi_id,pi_cardcode,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
+                sql.Append("select pi_id,pi_cardcode,pi_title,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 if (dt.Rows.Count > 0)
                 {
                 {
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
+                    pi_title.Text = dt.Rows[0]["pi_title"].ToString();
                     if (pi_cardcode.Text != "ZGCC")
                     if (pi_cardcode.Text != "ZGCC")
                     {
                     {
                         CustomerLabel.Enabled = false;
                         CustomerLabel.Enabled = false;
@@ -646,21 +647,21 @@ namespace UAS_LabelMachine
                             LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
                             LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
                         }
                         }
                     }
                     }
-                    for (int j = 0; j < SingleReport.Parameters.Count; j++)
+                    if (pibid != "")
                     {
                     {
-                        SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
-                        for (int k = 0; k < Attach.Rows.Count; k++)
+                        if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
+                            SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
+                        for (int j = 0; j < SingleReport.Parameters.Count; j++)
                         {
                         {
-                            if (Attach.Rows[k][0].ToString() == SingleReport.Parameters[j].Name)
+                            SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, "");
+                            for (int k = 0; k < Attach.Rows.Count; k++)
                             {
                             {
-                                SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, Attach.Rows[k][1].ToString());
+                                if (Attach.Rows[k][0].ToString() == SingleReport.Parameters[j].Name)
+                                {
+                                    SingleReport.SetParameterValue(SingleReport.Parameters[j].Name, Attach.Rows[k][1].ToString());
+                                }
                             }
                             }
                         }
                         }
-                    }
-                    if (pibid != "")
-                    {
-                        if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                            SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
                         DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiosingleinfo_view where 主键ID in (" + pibid.Substring(0, pibid.Length - 1) + ")", "select");
                         DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiosingleinfo_view where 主键ID in (" + pibid.Substring(0, pibid.Length - 1) + ")", "select");
                         SingleReport.RegisterData(dt, "prodiosingleinfo_view");
                         SingleReport.RegisterData(dt, "prodiosingleinfo_view");
                         SingleReport.GetDataSource("prodiosingleinfo_view").Enabled = true;
                         SingleReport.GetDataSource("prodiosingleinfo_view").Enabled = true;
@@ -917,17 +918,7 @@ namespace UAS_LabelMachine
         {
         {
             if (EnablePrint)
             if (EnablePrint)
             {
             {
-                for (int j = 0; j < MidReport.Parameters.Count; j++)
-                {
-                    MidReport.SetParameterValue(MidReport.Parameters[j].Name, "");
-                    for (int i = 0; i < Attach.Rows.Count; i++)
-                    {
-                        if (Attach.Rows[i][0].ToString() == MidReport.Parameters[j].Name)
-                        {
-                            MidReport.SetParameterValue(MidReport.Parameters[j].Name, Attach.Rows[i][1].ToString());
-                        }
-                    }
-                }
+               
                 //名称相等的时候,取SQL进行值的查询
                 //名称相等的时候,取SQL进行值的查询
                 string pib_id = LabelInf.Rows[rowindex].Cells["pib_id1"].Value.ToString();
                 string pib_id = LabelInf.Rows[rowindex].Cells["pib_id1"].Value.ToString();
                 string pib_outboxcode1 = LabelInf.Rows[rowindex].Cells["pib_outboxcode1"].Value.ToString();
                 string pib_outboxcode1 = LabelInf.Rows[rowindex].Cells["pib_outboxcode1"].Value.ToString();
@@ -944,6 +935,17 @@ namespace UAS_LabelMachine
                 {
                 {
                     if (!MidLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
                     if (!MidLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
                         MidReport.Load(MidLabelCombox.SelectedValue.ToString());
                         MidReport.Load(MidLabelCombox.SelectedValue.ToString());
+                    for (int j = 0; j < MidReport.Parameters.Count; j++)
+                    {
+                        MidReport.SetParameterValue(MidReport.Parameters[j].Name, "");
+                        for (int i = 0; i < Attach.Rows.Count; i++)
+                        {
+                            if (Attach.Rows[i][0].ToString() == MidReport.Parameters[j].Name)
+                            {
+                                MidReport.SetParameterValue(MidReport.Parameters[j].Name, Attach.Rows[i][1].ToString());
+                            }
+                        }
+                    }
                     MidReport.RegisterData(dt, "prodiomidinfo_view");
                     MidReport.RegisterData(dt, "prodiomidinfo_view");
                     MidReport.GetDataSource("prodiomidinfo_view").Enabled = true;
                     MidReport.GetDataSource("prodiomidinfo_view").Enabled = true;
                     MidReport.PrintSettings.ShowDialog = false;
                     MidReport.PrintSettings.ShowDialog = false;
@@ -962,6 +964,8 @@ namespace UAS_LabelMachine
         {
         {
             if (EnablePrint)
             if (EnablePrint)
             {
             {
+                if (!OutBoxCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
+                    OutReport.Load(OutBoxCombox.SelectedValue.ToString());
                 for (int j = 0; j < OutReport.Parameters.Count; j++)
                 for (int j = 0; j < OutReport.Parameters.Count; j++)
                 {
                 {
                     OutReport.SetParameterValue(OutReport.Parameters[j].Name, "");
                     OutReport.SetParameterValue(OutReport.Parameters[j].Name, "");
@@ -973,8 +977,6 @@ namespace UAS_LabelMachine
                         }
                         }
                     }
                     }
                 }
                 }
-                if (!OutBoxCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                    OutReport.Load(OutBoxCombox.SelectedValue.ToString());
                 string pib_outboxcode2 = LabelInf.Rows[rowindex].Cells["pib_outboxcode2"].Value.ToString();
                 string pib_outboxcode2 = LabelInf.Rows[rowindex].Cells["pib_outboxcode2"].Value.ToString();
                 DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiooutinfo_view where 出货单号='" + pi_inoutno.Text + "' and 外箱号='" + pib_outboxcode2 + "'", "select");
                 DataTable dt = (DataTable)dh.ExecuteSql("select * from prodiooutinfo_view where 出货单号='" + pi_inoutno.Text + "' and 外箱号='" + pib_outboxcode2 + "'", "select");
                 OutReport.RegisterData(dt, "prodiooutinfo_view");
                 OutReport.RegisterData(dt, "prodiooutinfo_view");
@@ -1066,7 +1068,7 @@ namespace UAS_LabelMachine
                 string CurrentPDNO = GridPrcode.Rows[i].Cells["pd_pdno"].Value.ToString();
                 string CurrentPDNO = GridPrcode.Rows[i].Cells["pd_pdno"].Value.ToString();
                 string collectqty = (LabelInfDataTable.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
                 string collectqty = (LabelInfDataTable.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
                 GridPrcode.Rows[i].Cells["CollectedNum"].Value = collectqty;
                 GridPrcode.Rows[i].Cells["CollectedNum"].Value = collectqty;
-                GridPrcode.Rows[i].Cells["UnCollectedNum"].Value =Convert.ToDouble( double.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString()) - double.Parse(collectqty == "" ? "0" : collectqty)).ToString("0.00");
+                GridPrcode.Rows[i].Cells["UnCollectedNum"].Value = Convert.ToDouble(double.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString()) - double.Parse(collectqty == "" ? "0" : collectqty)).ToString("0.00");
             }
             }
         }
         }
 
 
@@ -1287,7 +1289,7 @@ namespace UAS_LabelMachine
                 string CurrentPDNO = GridPrcode.Rows[i].Cells["pd_pdno"].Value.ToString();
                 string CurrentPDNO = GridPrcode.Rows[i].Cells["pd_pdno"].Value.ToString();
                 string collectqty = (LabelInfDataTable.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
                 string collectqty = (LabelInfDataTable.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
                 GridPrcode.Rows[i].Cells["CollectedNum"].Value = collectqty;
                 GridPrcode.Rows[i].Cells["CollectedNum"].Value = collectqty;
-                GridPrcode.Rows[i].Cells["UnCollectedNum"].Value =Convert.ToDouble( double.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString()) - double.Parse(collectqty == "" ? "0" : collectqty)).ToString("0.00");
+                GridPrcode.Rows[i].Cells["UnCollectedNum"].Value = Convert.ToDouble(double.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString()) - double.Parse(collectqty == "" ? "0" : collectqty)).ToString("0.00");
             }
             }
             if (GridPrcode.Rows.Count > 0)
             if (GridPrcode.Rows.Count > 0)
             {
             {
@@ -1523,11 +1525,11 @@ namespace UAS_LabelMachine
                     e.PaintContent(e.CellBounds);
                     e.PaintContent(e.CellBounds);
                     e.Handled = true;
                     e.Handled = true;
                 }
                 }
-                if (GridPrcode.Columns[e.ColumnIndex].Name == "UnCollectedNum" || GridPrcode.Columns[e.ColumnIndex].Name == "CollectedNum")
+                if (GridPrcode.Columns[e.ColumnIndex].Name == "UnCollectedNum")
                 {
                 {
                     SolidBrush solidBrush = new SolidBrush(Color.FromArgb(51, 153, 255));
                     SolidBrush solidBrush = new SolidBrush(Color.FromArgb(51, 153, 255));
-                    if (GridPrcode.Rows[e.RowIndex].Cells["UnCollectedNum"].Value.ToString() == "0")
-                        e.Graphics.FillRectangle(mouseOver ? solidBrush : Brushes.White, e.CellBounds);
+                    if (GridPrcode.Rows[e.RowIndex].Cells["UnCollectedNum"].Value.ToString() == "0.00")
+                        e.Graphics.FillRectangle(mouseOver ? solidBrush : Brushes.LightSeaGreen, e.CellBounds);
                     else
                     else
                         e.Graphics.FillRectangle(mouseOver ? solidBrush : Brushes.Red, e.CellBounds);
                         e.Graphics.FillRectangle(mouseOver ? solidBrush : Brushes.Red, e.CellBounds);
                     Rectangle border = e.CellBounds;
                     Rectangle border = e.CellBounds;