打印数量获取

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -236,16 +236,14 @@ namespace UAS_MES.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_prodcode='" + pr_code.Text + "' order by pl_isdefault desc ", "select");
+            dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "pl_laname";
-            PrintLabel.ValueMember = "pl_labelcode";
+            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.ValueMember = "la_id";
             ftpOperater ftp = new ftpOperater();
-            indate = new System.DateTime[dt.Rows.Count];
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());
-                indate[i] = Convert.ToDateTime(dt.Rows[i]["pl_indate"].ToString());
+                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
             }
         }
 

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.Designer.cs

@@ -54,20 +54,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1164, 102);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(776, 68);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(190, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(128, 20);
             this.PrintLabel.TabIndex = 181;
+            this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1068, 26);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(712, 17);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 31);
+            this.label2.Size = new System.Drawing.Size(58, 21);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -75,10 +75,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1068, 102);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(712, 68);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 31);
+            this.label1.Size = new System.Drawing.Size(42, 21);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -86,10 +85,9 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(675, 29);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(450, 19);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -99,10 +97,9 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(18, 623);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(12, 415);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(86, 31);
+            this.sncode_label.Size = new System.Drawing.Size(58, 21);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "序列号";
             // 
@@ -110,10 +107,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(675, 102);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(450, 68);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(110, 31);
+            this.label4.Size = new System.Drawing.Size(74, 21);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -121,10 +117,9 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(346, 102);
-            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(231, 68);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(86, 31);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(58, 21);
             this.mcd_remainqty_label.TabIndex = 166;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -132,10 +127,9 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(18, 102);
-            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(12, 68);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(74, 21);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -143,10 +137,9 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(346, 29);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(231, 19);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -154,10 +147,9 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(18, 29);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(12, 19);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "工单编号";
             // 
@@ -165,27 +157,27 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(128, 32);
+            this.ma_code.Location = new System.Drawing.Point(85, 21);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 31);
+            this.ma_code.Size = new System.Drawing.Size(0, 21);
             this.ma_code.TabIndex = 182;
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1164, 26);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(776, 17);
+            this.Printer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(190, 37);
+            this.Printer.Size = new System.Drawing.Size(127, 25);
             this.Printer.TabIndex = 178;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(440, 99);
-            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Location = new System.Drawing.Point(293, 66);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_remainqty.Size = new System.Drawing.Size(19, 21);
             this.mcd_remainqty.TabIndex = 177;
             this.mcd_remainqty.Text = "0";
             // 
@@ -193,10 +185,9 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(128, 102);
-            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty.Location = new System.Drawing.Point(85, 68);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(19, 21);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -205,11 +196,10 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(456, 32);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(304, 21);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 175;
             this.ma_prodcode.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -218,11 +208,10 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(793, 32);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.Location = new System.Drawing.Point(529, 21);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(133, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 21);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -231,12 +220,11 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(793, 99);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Location = new System.Drawing.Point(529, 66);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(224, 31);
+            this.PrintNum.Size = new System.Drawing.Size(151, 23);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -250,11 +238,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(143, 623);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sncode.Location = new System.Drawing.Point(95, 415);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(196, 21);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -265,18 +252,17 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(24, 162);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(16, 108);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1057, 436);
+            this.OperateResult.Size = new System.Drawing.Size(706, 292);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
             // Make_FuselageLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1378, 672);
+            this.ClientSize = new System.Drawing.Size(919, 448);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.PrintLabel);
             this.Controls.Add(this.label2);
@@ -297,7 +283,6 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_FuselageLabelPrint";
             this.Tag = "Make!FuselageLabelPrint";
             this.Text = "Make_FuselageLabelPrint";
@@ -305,7 +290,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_FuselageLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_FuselageLabelPrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_FuselageLabelPrint_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -221,5 +221,14 @@ namespace UAS_MES.Make
         {
             asc.controlAutoSize(this);
         }
+
+        private void PrintLabel_SelectedValueChanged(object sender, EventArgs e)
+        {
+            if (PrintLabel.SelectedValue != null && PrintLabel.SelectedValue.ToString() != "System.Data.DataRowView")
+            {
+                string PrintNums = dh.getFieldDataByCondition("label", "la_printnos", "la_id='" + PrintLabel.SelectedValue.ToString() + "'").ToString();
+                PrintNum.Text = (PrintNums == "" ? "1" : PrintNums);
+            }
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.Designer.cs

@@ -87,9 +87,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.pr_detail_label);
             this.groupBoxWithBorder1.Controls.Add(this.ma_qty_label);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(9, 10);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1091, 183);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(818, 146);
             this.groupBoxWithBorder1.TabIndex = 0;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "工单信息";
@@ -99,10 +101,11 @@
             // 
             this.ma_id.AutoSize = true;
             this.ma_id.CutLength = null;
-            this.ma_id.Location = new System.Drawing.Point(793, 143);
-            this.ma_id.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_id.Location = new System.Drawing.Point(595, 114);
+            this.ma_id.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_id.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_id.Name = "ma_id";
-            this.ma_id.Size = new System.Drawing.Size(0, 27);
+            this.ma_id.Size = new System.Drawing.Size(0, 21);
             this.ma_id.TabIndex = 16;
             this.ma_id.Visible = false;
             // 
@@ -110,20 +113,22 @@
             // 
             this.ma_craftcode.AutoSize = true;
             this.ma_craftcode.CutLength = null;
-            this.ma_craftcode.Location = new System.Drawing.Point(720, 143);
-            this.ma_craftcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_craftcode.Location = new System.Drawing.Point(540, 114);
+            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_craftcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_craftcode.Name = "ma_craftcode";
-            this.ma_craftcode.Size = new System.Drawing.Size(0, 27);
+            this.ma_craftcode.Size = new System.Drawing.Size(0, 21);
             this.ma_craftcode.TabIndex = 15;
             this.ma_craftcode.Visible = false;
             // 
             // ma_saveimei
             // 
             this.ma_saveimei.AutoSize = true;
-            this.ma_saveimei.Location = new System.Drawing.Point(418, 139);
+            this.ma_saveimei.Location = new System.Drawing.Point(314, 111);
+            this.ma_saveimei.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ma_saveimei.Name = "ma_saveimei";
             this.ma_saveimei.Power = null;
-            this.ma_saveimei.Size = new System.Drawing.Size(246, 31);
+            this.ma_saveimei.Size = new System.Drawing.Size(199, 25);
             this.ma_saveimei.TabIndex = 14;
             this.ma_saveimei.Text = "保留原有IMEI/网标信息";
             this.ma_saveimei.UseVisualStyleBackColor = true;
@@ -131,10 +136,11 @@
             // ma_savemacbt
             // 
             this.ma_savemacbt.AutoSize = true;
-            this.ma_savemacbt.Location = new System.Drawing.Point(43, 139);
+            this.ma_savemacbt.Location = new System.Drawing.Point(32, 111);
+            this.ma_savemacbt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ma_savemacbt.Name = "ma_savemacbt";
             this.ma_savemacbt.Power = null;
-            this.ma_savemacbt.Size = new System.Drawing.Size(234, 31);
+            this.ma_savemacbt.Size = new System.Drawing.Size(189, 25);
             this.ma_savemacbt.TabIndex = 13;
             this.ma_savemacbt.Text = "保留原有MAC/BT信息";
             this.ma_savemacbt.UseVisualStyleBackColor = true;
@@ -144,9 +150,10 @@
             this.LockCheckBox.AutoSize = true;
             this.LockCheckBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockCheckBox.LeaveEvent = false;
-            this.LockCheckBox.Location = new System.Drawing.Point(322, 46);
+            this.LockCheckBox.Location = new System.Drawing.Point(242, 37);
+            this.LockCheckBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.LockCheckBox.Name = "LockCheckBox";
-            this.LockCheckBox.Size = new System.Drawing.Size(61, 24);
+            this.LockCheckBox.Size = new System.Drawing.Size(51, 21);
             this.LockCheckBox.TabIndex = 12;
             this.LockCheckBox.Text = "锁定";
             this.LockCheckBox.UseVisualStyleBackColor = true;
@@ -154,9 +161,10 @@
             // ma_code_label
             // 
             this.ma_code_label.AutoSize = true;
-            this.ma_code_label.Location = new System.Drawing.Point(38, 42);
+            this.ma_code_label.Location = new System.Drawing.Point(28, 34);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_code_label.Size = new System.Drawing.Size(74, 21);
             this.ma_code_label.TabIndex = 11;
             this.ma_code_label.Text = "返工单号";
             // 
@@ -168,13 +176,14 @@
             this.ma_code.DBTitle = null;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(153, 42);
+            this.ma_code.Location = new System.Drawing.Point(115, 34);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(156, 28);
+            this.ma_code.Size = new System.Drawing.Size(117, 22);
             this.ma_code.TabIndex = 10;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = true;
@@ -184,30 +193,33 @@
             // 
             this.pr_spec.AutoSize = true;
             this.pr_spec.CutLength = null;
-            this.pr_spec.Location = new System.Drawing.Point(826, 96);
-            this.pr_spec.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_spec.Location = new System.Drawing.Point(620, 77);
+            this.pr_spec.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_spec.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(0, 27);
+            this.pr_spec.Size = new System.Drawing.Size(0, 21);
             this.pr_spec.TabIndex = 9;
             // 
             // getsnqty
             // 
             this.getsnqty.AutoSize = true;
             this.getsnqty.CutLength = null;
-            this.getsnqty.Location = new System.Drawing.Point(826, 40);
-            this.getsnqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.getsnqty.Location = new System.Drawing.Point(620, 32);
+            this.getsnqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.getsnqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.getsnqty.Name = "getsnqty";
-            this.getsnqty.Size = new System.Drawing.Size(0, 27);
+            this.getsnqty.Size = new System.Drawing.Size(0, 21);
             this.getsnqty.TabIndex = 8;
             // 
             // pr_code
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
-            this.pr_code.Location = new System.Drawing.Point(148, 96);
-            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_code.Location = new System.Drawing.Point(111, 77);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 27);
+            this.pr_code.Size = new System.Drawing.Size(0, 21);
             this.pr_code.TabIndex = 7;
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -215,64 +227,71 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
-            this.ma_qty.Location = new System.Drawing.Point(523, 40);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_qty.Location = new System.Drawing.Point(392, 32);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 27);
+            this.ma_qty.Size = new System.Drawing.Size(0, 21);
             this.ma_qty.TabIndex = 6;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
-            this.pr_detail.Location = new System.Drawing.Point(523, 96);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.Location = new System.Drawing.Point(392, 77);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.Size = new System.Drawing.Size(0, 21);
             this.pr_detail.TabIndex = 5;
             // 
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
-            this.pr_code_label.Location = new System.Drawing.Point(38, 96);
+            this.pr_code_label.Location = new System.Drawing.Point(28, 77);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
             this.pr_code_label.TabIndex = 4;
             this.pr_code_label.Text = "产品编号";
             // 
             // pr_spec_label
             // 
             this.pr_spec_label.AutoSize = true;
-            this.pr_spec_label.Location = new System.Drawing.Point(720, 96);
+            this.pr_spec_label.Location = new System.Drawing.Point(540, 77);
+            this.pr_spec_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_spec_label.Name = "pr_spec_label";
-            this.pr_spec_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_spec_label.Size = new System.Drawing.Size(74, 21);
             this.pr_spec_label.TabIndex = 3;
             this.pr_spec_label.Text = "产品规格";
             // 
             // getsnqty_label
             // 
             this.getsnqty_label.AutoSize = true;
-            this.getsnqty_label.Location = new System.Drawing.Point(720, 40);
+            this.getsnqty_label.Location = new System.Drawing.Point(540, 32);
+            this.getsnqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.getsnqty_label.Name = "getsnqty_label";
-            this.getsnqty_label.Size = new System.Drawing.Size(92, 27);
+            this.getsnqty_label.Size = new System.Drawing.Size(74, 21);
             this.getsnqty_label.TabIndex = 2;
             this.getsnqty_label.Text = "已维护数";
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Location = new System.Drawing.Point(413, 96);
+            this.pr_detail_label.Location = new System.Drawing.Point(310, 77);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
             this.pr_detail_label.TabIndex = 1;
             this.pr_detail_label.Text = "产品名称";
             // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
-            this.ma_qty_label.Location = new System.Drawing.Point(413, 40);
+            this.ma_qty_label.Location = new System.Drawing.Point(310, 32);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
             this.ma_qty_label.TabIndex = 0;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -287,9 +306,11 @@
             this.groupBoxWithBorder2.Controls.Add(this.PrinterList_label);
             this.groupBoxWithBorder2.Controls.Add(this.PrinterList);
             this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(12, 201);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(9, 161);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(536, 177);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(402, 142);
             this.groupBoxWithBorder2.TabIndex = 13;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "打印设置";
@@ -298,18 +319,20 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(301, 139);
+            this.label2.Location = new System.Drawing.Point(226, 111);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 18;
             this.label2.Text = "打印份数";
             // 
             // PrintNum
             // 
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintNum.Location = new System.Drawing.Point(403, 139);
+            this.PrintNum.Location = new System.Drawing.Point(302, 111);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(120, 27);
+            this.PrintNum.Size = new System.Drawing.Size(90, 23);
             this.PrintNum.TabIndex = 17;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -322,53 +345,58 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(141, 93);
+            this.PrintLabel.Location = new System.Drawing.Point(106, 74);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(252, 28);
+            this.PrintLabel.Size = new System.Drawing.Size(190, 25);
             this.PrintLabel.TabIndex = 16;
+            this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
             // PrintLabel_label
             // 
             this.PrintLabel_label.AutoSize = true;
-            this.PrintLabel_label.Location = new System.Drawing.Point(18, 96);
+            this.PrintLabel_label.Location = new System.Drawing.Point(14, 77);
+            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
+            this.PrintLabel_label.Size = new System.Drawing.Size(74, 21);
             this.PrintLabel_label.TabIndex = 15;
             this.PrintLabel_label.Text = "产品名称";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(141, 139);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.AutoPrint.Location = new System.Drawing.Point(106, 111);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(124, 31);
+            this.AutoPrint.Size = new System.Drawing.Size(93, 25);
             this.AutoPrint.TabIndex = 14;
             // 
             // PrinterList_label
             // 
             this.PrinterList_label.AutoSize = true;
-            this.PrinterList_label.Location = new System.Drawing.Point(18, 40);
+            this.PrinterList_label.Location = new System.Drawing.Point(14, 32);
+            this.PrinterList_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
+            this.PrinterList_label.Size = new System.Drawing.Size(90, 21);
             this.PrinterList_label.TabIndex = 13;
             this.PrinterList_label.Text = "打印机列表";
             // 
             // PrinterList
             // 
             this.PrinterList.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrinterList.Location = new System.Drawing.Point(141, 39);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.PrinterList.Location = new System.Drawing.Point(106, 31);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(252, 28);
+            this.PrinterList.Size = new System.Drawing.Size(189, 22);
             this.PrinterList.TabIndex = 0;
             // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(12, 384);
+            this.OperateResult.Location = new System.Drawing.Point(9, 307);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1091, 213);
+            this.OperateResult.Size = new System.Drawing.Size(819, 171);
             this.OperateResult.TabIndex = 14;
             this.OperateResult.Text = "";
             // 
@@ -380,9 +408,11 @@
             this.groupBoxWithBorder3.Controls.Add(this.label1);
             this.groupBoxWithBorder3.Controls.Add(this.sn_code);
             this.groupBoxWithBorder3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder3.Location = new System.Drawing.Point(12, 603);
+            this.groupBoxWithBorder3.Location = new System.Drawing.Point(9, 482);
+            this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBoxWithBorder3.Name = "groupBoxWithBorder3";
-            this.groupBoxWithBorder3.Size = new System.Drawing.Size(1091, 77);
+            this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder3.Size = new System.Drawing.Size(818, 62);
             this.groupBoxWithBorder3.TabIndex = 14;
             this.groupBoxWithBorder3.TabStop = false;
             this.groupBoxWithBorder3.Text = "输入信息";
@@ -391,9 +421,10 @@
             // ReWorkAsRelateTSN
             // 
             this.ReWorkAsRelateTSN.AutoSize = true;
-            this.ReWorkAsRelateTSN.Location = new System.Drawing.Point(653, 32);
+            this.ReWorkAsRelateTSN.Location = new System.Drawing.Point(490, 26);
+            this.ReWorkAsRelateTSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ReWorkAsRelateTSN.Name = "ReWorkAsRelateTSN";
-            this.ReWorkAsRelateTSN.Size = new System.Drawing.Size(220, 31);
+            this.ReWorkAsRelateTSN.Size = new System.Drawing.Size(177, 25);
             this.ReWorkAsRelateTSN.TabIndex = 15;
             this.ReWorkAsRelateTSN.Text = "以SN关联的TSN返工";
             this.ReWorkAsRelateTSN.UseVisualStyleBackColor = true;
@@ -402,9 +433,10 @@
             // 
             this.ReWorkAsCurrentSN.AutoSize = true;
             this.ReWorkAsCurrentSN.Checked = true;
-            this.ReWorkAsCurrentSN.Location = new System.Drawing.Point(465, 32);
+            this.ReWorkAsCurrentSN.Location = new System.Drawing.Point(349, 26);
+            this.ReWorkAsCurrentSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ReWorkAsCurrentSN.Name = "ReWorkAsCurrentSN";
-            this.ReWorkAsCurrentSN.Size = new System.Drawing.Size(153, 31);
+            this.ReWorkAsCurrentSN.Size = new System.Drawing.Size(124, 25);
             this.ReWorkAsCurrentSN.TabIndex = 14;
             this.ReWorkAsCurrentSN.TabStop = true;
             this.ReWorkAsCurrentSN.Text = "以当前号返工";
@@ -413,9 +445,10 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(56, 34);
+            this.label1.Location = new System.Drawing.Point(42, 27);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(72, 27);
+            this.label1.Size = new System.Drawing.Size(58, 21);
             this.label1.TabIndex = 13;
             this.label1.Text = "输入框";
             // 
@@ -425,10 +458,11 @@
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(153, 33);
+            this.sn_code.Location = new System.Drawing.Point(115, 26);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(196, 27);
+            this.sn_code.Size = new System.Drawing.Size(148, 23);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -437,14 +471,15 @@
             // 
             // Make_GetReMakeSN
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1115, 692);
+            this.ClientSize = new System.Drawing.Size(836, 554);
             this.Controls.Add(this.groupBoxWithBorder3);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Make_GetReMakeSN";
             this.Tag = "Make!GetReMakeSN";
             this.Text = "返工数据采集";

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -90,15 +90,15 @@ namespace UAS_MES.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_labeltype='SN标签' order by pl_isdefault desc ", "select");
-            PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "pl_laname";
-            PrintLabel.ValueMember = "pl_labelcode";
-            indate = new System.DateTime[dt.Rows.Count];
-            for (int i = 0; i < dt.Rows.Count; i++)
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='SN标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            PrintLabel.DataSource = _dt;
+            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.ValueMember = "la_id";
+            ftpOperater ftp = new ftpOperater();
+            indate = new System.DateTime[_dt.Rows.Count];
+            for (int i = 0; i < _dt.Rows.Count; i++)
             {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());
-                indate[i] = Convert.ToDateTime(dt.Rows[i]["pl_indate"].ToString());
+                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
             }
         }
 
@@ -288,5 +288,14 @@ namespace UAS_MES.Make
                 }
             }
         }
+
+        private void PrintLabel_SelectedValueChanged(object sender, EventArgs e)
+        {
+            if (PrintLabel.SelectedValue != null && PrintLabel.SelectedValue.ToString() != "System.Data.DataRowView")
+            {
+                string PrintNums = dh.getFieldDataByCondition("label", "la_printnos", "la_id='" + PrintLabel.SelectedValue.ToString() + "'").ToString();
+                PrintNum.Text = (PrintNums == "" ? "1" : PrintNums);
+            }
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -75,10 +75,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(41, 77);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.panel4.Location = new System.Drawing.Point(31, 62);
+            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(491, 155);
+            this.panel4.Size = new System.Drawing.Size(369, 124);
             this.panel4.TabIndex = 92;
             // 
             // pr_cartonunit
@@ -87,10 +87,9 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(409, 63);
-            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_cartonunit.Location = new System.Drawing.Point(307, 50);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
+            this.pr_cartonunit.Size = new System.Drawing.Size(31, 25);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -100,10 +99,9 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(20, 63);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label22.Location = new System.Drawing.Point(15, 50);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
+            this.label22.Size = new System.Drawing.Size(50, 25);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -115,20 +113,18 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(139, 53);
-            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight.Location = new System.Drawing.Point(104, 42);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 50);
+            this.weight.Size = new System.Drawing.Size(0, 39);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(41, 13);
-            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Location = new System.Drawing.Point(31, 10);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(107, 39);
+            this.label15.Size = new System.Drawing.Size(86, 31);
             this.label15.TabIndex = 93;
             this.label15.Text = "栈板号";
             // 
@@ -136,10 +132,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(869, 78);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(652, 62);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 165;
             this.label1.Text = "打印标签";
             // 
@@ -147,10 +142,9 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(869, 17);
-            this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Printer_label.Location = new System.Drawing.Point(652, 14);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(112, 27);
+            this.Printer_label.Size = new System.Drawing.Size(90, 21);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -159,20 +153,21 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("宋体", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1000, 83);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.PrintLabel.Location = new System.Drawing.Point(750, 66);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(175, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(132, 20);
             this.PrintLabel.TabIndex = 162;
-            this.PrintLabel.SelectedIndexChanged += new System.EventHandler(this.PrintLabel_SelectedIndexChanged);
+            this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
             // printNum_label
             // 
             this.printNum_label.AutoSize = true;
             this.printNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum_label.Location = new System.Drawing.Point(869, 142);
+            this.printNum_label.Location = new System.Drawing.Point(652, 114);
+            this.printNum_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.printNum_label.Name = "printNum_label";
-            this.printNum_label.Size = new System.Drawing.Size(52, 27);
+            this.printNum_label.Size = new System.Drawing.Size(42, 21);
             this.printNum_label.TabIndex = 167;
             this.printNum_label.Text = "份数";
             // 
@@ -180,9 +175,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(35, 263);
+            this.label2.Location = new System.Drawing.Point(26, 210);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(90, 32);
+            this.label2.Size = new System.Drawing.Size(72, 27);
             this.label2.TabIndex = 169;
             this.label2.Text = "工单号";
             // 
@@ -190,9 +186,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label3.Location = new System.Drawing.Point(35, 315);
+            this.label3.Location = new System.Drawing.Point(26, 252);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(115, 32);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 170;
             this.label3.Text = "栈内总数";
             // 
@@ -200,9 +197,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label4.Location = new System.Drawing.Point(35, 372);
+            this.label4.Location = new System.Drawing.Point(26, 298);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(115, 32);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 171;
             this.label4.Text = "产品编号";
             // 
@@ -210,9 +208,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(35, 427);
+            this.label5.Location = new System.Drawing.Point(26, 342);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(115, 32);
+            this.label5.Size = new System.Drawing.Size(92, 27);
             this.label5.TabIndex = 172;
             this.label5.Text = "名称规格";
             // 
@@ -220,9 +219,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label6.Location = new System.Drawing.Point(382, 263);
+            this.label6.Location = new System.Drawing.Point(286, 210);
+            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(115, 32);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 173;
             this.label6.Text = "订单编号";
             // 
@@ -230,9 +230,10 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(382, 315);
+            this.label7.Location = new System.Drawing.Point(286, 252);
+            this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(115, 32);
+            this.label7.Size = new System.Drawing.Size(92, 27);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
@@ -240,9 +241,10 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(869, 207);
+            this.label8.Location = new System.Drawing.Point(652, 166);
+            this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(52, 27);
+            this.label8.Size = new System.Drawing.Size(42, 21);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
@@ -254,10 +256,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.showResult.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(684, 315);
-            this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.showResult.Location = new System.Drawing.Point(513, 252);
+            this.showResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(520, 422);
+            this.showResult.Size = new System.Drawing.Size(391, 338);
             this.showResult.TabIndex = 190;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -288,29 +290,29 @@
             // 
             this.pr_detailspec.AutoSize = true;
             this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pr_detailspec.Location = new System.Drawing.Point(156, 427);
+            this.pr_detailspec.Location = new System.Drawing.Point(117, 342);
+            this.pr_detailspec.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detailspec.Name = "pr_detailspec";
-            this.pr_detailspec.Size = new System.Drawing.Size(0, 32);
+            this.pr_detailspec.Size = new System.Drawing.Size(0, 27);
             this.pr_detailspec.TabIndex = 192;
             // 
             // autoPrint
             // 
             this.autoPrint.Checked = false;
-            this.autoPrint.Location = new System.Drawing.Point(874, 263);
-            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.autoPrint.Location = new System.Drawing.Point(656, 210);
+            this.autoPrint.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.autoPrint.Name = "autoPrint";
-            this.autoPrint.Size = new System.Drawing.Size(125, 34);
+            this.autoPrint.Size = new System.Drawing.Size(94, 27);
             this.autoPrint.TabIndex = 193;
             // 
             // ComList
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(595, 153);
-            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ComList.Location = new System.Drawing.Point(446, 122);
+            this.ComList.MaximumSize = new System.Drawing.Size(150, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(63, 15);
+            this.ComList.Size = new System.Drawing.Size(47, 12);
             this.ComList.TabIndex = 191;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -320,12 +322,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(596, 112);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.BaudRate.Location = new System.Drawing.Point(447, 90);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(159, 25);
+            this.BaudRate.Size = new System.Drawing.Size(120, 21);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -339,13 +341,13 @@
             this.stopWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.DownImage")));
             this.stopWeigh.Image = null;
             this.stopWeigh.IsShowBorder = true;
-            this.stopWeigh.Location = new System.Drawing.Point(684, 17);
-            this.stopWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.stopWeigh.Location = new System.Drawing.Point(513, 14);
+            this.stopWeigh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.stopWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.MoveImage")));
             this.stopWeigh.Name = "stopWeigh";
             this.stopWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.NormalImage")));
             this.stopWeigh.Power = null;
-            this.stopWeigh.Size = new System.Drawing.Size(96, 32);
+            this.stopWeigh.Size = new System.Drawing.Size(72, 26);
             this.stopWeigh.TabIndex = 187;
             this.stopWeigh.Text = "停止称重";
             this.stopWeigh.UseVisualStyleBackColor = false;
@@ -358,13 +360,13 @@
             this.startWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.DownImage")));
             this.startWeigh.Image = null;
             this.startWeigh.IsShowBorder = true;
-            this.startWeigh.Location = new System.Drawing.Point(578, 17);
-            this.startWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.startWeigh.Location = new System.Drawing.Point(434, 14);
+            this.startWeigh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.startWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.MoveImage")));
             this.startWeigh.Name = "startWeigh";
             this.startWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.NormalImage")));
             this.startWeigh.Power = null;
-            this.startWeigh.Size = new System.Drawing.Size(82, 32);
+            this.startWeigh.Size = new System.Drawing.Size(62, 26);
             this.startWeigh.TabIndex = 186;
             this.startWeigh.Text = "开始称重";
             this.startWeigh.UseVisualStyleBackColor = false;
@@ -376,12 +378,12 @@
             this.weightedNum.BackColor = System.Drawing.Color.White;
             this.weightedNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weightedNum.ID = null;
-            this.weightedNum.Location = new System.Drawing.Point(997, 207);
-            this.weightedNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.weightedNum.Location = new System.Drawing.Point(748, 166);
+            this.weightedNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.weightedNum.Name = "weightedNum";
             this.weightedNum.Negative = false;
             this.weightedNum.Power = null;
-            this.weightedNum.Size = new System.Drawing.Size(175, 25);
+            this.weightedNum.Size = new System.Drawing.Size(132, 21);
             this.weightedNum.Str = null;
             this.weightedNum.Str1 = null;
             this.weightedNum.Str2 = null;
@@ -393,10 +395,11 @@
             this.PA_PACKAGEQTY.AutoSize = true;
             this.PA_PACKAGEQTY.CutLength = null;
             this.PA_PACKAGEQTY.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(498, 315);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(178, 0);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(374, 252);
+            this.PA_PACKAGEQTY.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(134, 0);
             this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
-            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 32);
+            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 27);
             this.PA_PACKAGEQTY.TabIndex = 184;
             // 
             // pa_salecode
@@ -404,10 +407,11 @@
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_salecode.Location = new System.Drawing.Point(498, 263);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(178, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(374, 210);
+            this.pa_salecode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(134, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 32);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 27);
             this.pa_salecode.TabIndex = 183;
             // 
             // pa_totalqty
@@ -415,10 +419,11 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_totalqty.Location = new System.Drawing.Point(156, 315);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(178, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(117, 252);
+            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(134, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 32);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 27);
             this.pa_totalqty.TabIndex = 180;
             // 
             // pa_makecode
@@ -426,10 +431,11 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_makecode.Location = new System.Drawing.Point(156, 263);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(178, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(117, 210);
+            this.pa_makecode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(134, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 32);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
             this.pa_makecode.TabIndex = 179;
             // 
             // PrintNum
@@ -438,12 +444,12 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(997, 142);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintNum.Location = new System.Drawing.Point(748, 114);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(175, 25);
+            this.PrintNum.Size = new System.Drawing.Size(132, 21);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -453,20 +459,20 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(29, 478);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.OperateResult.Location = new System.Drawing.Point(22, 382);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(589, 259);
+            this.OperateResult.Size = new System.Drawing.Size(443, 208);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
             // Printer
             // 
             this.Printer.Font = new System.Drawing.Font("宋体", 9F);
-            this.Printer.Location = new System.Drawing.Point(997, 20);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(748, 16);
+            this.Printer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(174, 27);
+            this.Printer.Size = new System.Drawing.Size(130, 22);
             this.Printer.TabIndex = 163;
             // 
             // palletcode
@@ -475,11 +481,11 @@
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(163, 12);
-            this.palletcode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.palletcode.Location = new System.Drawing.Point(122, 10);
+            this.palletcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = null;
-            this.palletcode.Size = new System.Drawing.Size(370, 47);
+            this.palletcode.Size = new System.Drawing.Size(278, 39);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -490,16 +496,17 @@
             // 
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(156, 372);
+            this.pa_prodcode.Location = new System.Drawing.Point(117, 298);
+            this.pa_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 32);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
             this.pa_prodcode.TabIndex = 194;
             // 
             // Make_PalletWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1246, 752);
+            this.ClientSize = new System.Drawing.Size(934, 602);
             this.Controls.Add(this.pa_prodcode);
             this.Controls.Add(this.autoPrint);
             this.Controls.Add(this.pr_detailspec);
@@ -531,7 +538,7 @@
             this.Controls.Add(this.label15);
             this.Controls.Add(this.panel4);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Make_PalletWeigh";
             this.Tag = "Make!PalletWeigh";
             this.Text = "栈板称重";

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -287,7 +287,7 @@ namespace UAS_MES.Make
             showResult.Items.Add(lvi);
         }
 
-        private void PrintLabel_SelectedIndexChanged(object sender, EventArgs e)
+        private void PrintLabel_SelectedValueChanged(object sender, EventArgs e)
         {
             if (PrintLabel.SelectedValue != null && PrintLabel.SelectedValue.ToString() != "System.Data.DataRowView")
             {