瀏覽代碼

修改界面取值

章政 8 年之前
父節點
當前提交
d3c3379c17
共有 2 個文件被更改,包括 96 次插入107 次删除
  1. 95 106
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs
  2. 1 1
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

+ 95 - 106
UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -55,7 +55,6 @@
             this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stopWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.startWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.weightedNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.PA_PACKAGEQTY = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -65,7 +64,8 @@
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pa_prodcode = new System.Windows.Forms.Label();
-            this.pr_detailspec = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithTextArea();
+            this.pr_detail = new System.Windows.Forms.Label();
+            this.weightedNum = new System.Windows.Forms.Label();
             this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -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(46, 94);
+            this.panel4.Location = new System.Drawing.Point(41, 78);
             this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(552, 184);
+            this.panel4.Size = new System.Drawing.Size(491, 154);
             this.panel4.TabIndex = 92;
             // 
             // pr_cartonunit
@@ -87,10 +87,10 @@
             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(460, 74);
+            this.pr_cartonunit.Location = new System.Drawing.Point(409, 62);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
+            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -100,10 +100,10 @@
             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(22, 74);
+            this.label22.Location = new System.Drawing.Point(20, 62);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(75, 38);
+            this.label22.Size = new System.Drawing.Size(62, 31);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -115,20 +115,20 @@
             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(156, 62);
+            this.weight.Location = new System.Drawing.Point(139, 52);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 58);
+            this.weight.Size = new System.Drawing.Size(0, 50);
             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(46, 14);
+            this.label15.Location = new System.Drawing.Point(41, 12);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(128, 46);
+            this.label15.Size = new System.Drawing.Size(107, 39);
             this.label15.TabIndex = 93;
             this.label15.Text = "栈板号";
             // 
@@ -136,10 +136,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(978, 94);
+            this.label1.Location = new System.Drawing.Point(869, 78);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 165;
             this.label1.Text = "打印标签";
             // 
@@ -147,10 +147,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(978, 22);
+            this.Printer_label.Location = new System.Drawing.Point(869, 18);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(134, 31);
+            this.Printer_label.Size = new System.Drawing.Size(112, 27);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -159,10 +159,10 @@
             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(1125, 98);
+            this.PrintLabel.Location = new System.Drawing.Point(1000, 82);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(196, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(175, 23);
             this.PrintLabel.TabIndex = 162;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -170,9 +170,9 @@
             // 
             this.printNum_label.AutoSize = true;
             this.printNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum_label.Location = new System.Drawing.Point(978, 170);
+            this.printNum_label.Location = new System.Drawing.Point(869, 142);
             this.printNum_label.Name = "printNum_label";
-            this.printNum_label.Size = new System.Drawing.Size(62, 31);
+            this.printNum_label.Size = new System.Drawing.Size(52, 27);
             this.printNum_label.TabIndex = 167;
             this.printNum_label.Text = "份数";
             // 
@@ -180,9 +180,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(39, 314);
+            this.label2.Location = new System.Drawing.Point(35, 262);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(107, 39);
+            this.label2.Size = new System.Drawing.Size(90, 32);
             this.label2.TabIndex = 169;
             this.label2.Text = "工单号";
             // 
@@ -190,9 +190,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label3.Location = new System.Drawing.Point(39, 378);
+            this.label3.Location = new System.Drawing.Point(35, 315);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(137, 39);
+            this.label3.Size = new System.Drawing.Size(115, 32);
             this.label3.TabIndex = 170;
             this.label3.Text = "栈内总数";
             // 
@@ -200,9 +200,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label4.Location = new System.Drawing.Point(39, 446);
+            this.label4.Location = new System.Drawing.Point(35, 372);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(137, 39);
+            this.label4.Size = new System.Drawing.Size(115, 32);
             this.label4.TabIndex = 171;
             this.label4.Text = "产品编号";
             // 
@@ -210,19 +210,19 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(39, 514);
+            this.label5.Location = new System.Drawing.Point(35, 428);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(137, 39);
+            this.label5.Size = new System.Drawing.Size(115, 32);
             this.label5.TabIndex = 172;
-            this.label5.Text = "名称规格";
+            this.label5.Text = "产品名称";
             // 
             // label6
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label6.Location = new System.Drawing.Point(429, 314);
+            this.label6.Location = new System.Drawing.Point(381, 262);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(137, 39);
+            this.label6.Size = new System.Drawing.Size(115, 32);
             this.label6.TabIndex = 173;
             this.label6.Text = "订单编号";
             // 
@@ -230,9 +230,9 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(429, 378);
+            this.label7.Location = new System.Drawing.Point(381, 315);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(137, 39);
+            this.label7.Size = new System.Drawing.Size(115, 32);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
@@ -240,9 +240,9 @@
             // 
             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(978, 250);
+            this.label8.Location = new System.Drawing.Point(869, 208);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 31);
+            this.label8.Size = new System.Drawing.Size(52, 27);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
@@ -254,10 +254,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(770, 378);
+            this.showResult.Location = new System.Drawing.Point(684, 315);
             this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(584, 506);
+            this.showResult.Size = new System.Drawing.Size(520, 422);
             this.showResult.TabIndex = 190;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -287,21 +287,21 @@
             // autoPrint
             // 
             this.autoPrint.Checked = false;
-            this.autoPrint.Location = new System.Drawing.Point(984, 314);
-            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.autoPrint.Location = new System.Drawing.Point(875, 262);
+            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.autoPrint.Name = "autoPrint";
-            this.autoPrint.Size = new System.Drawing.Size(141, 41);
+            this.autoPrint.Size = new System.Drawing.Size(125, 34);
             this.autoPrint.TabIndex = 193;
             // 
             // ComList
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(669, 182);
+            this.ComList.Location = new System.Drawing.Point(595, 152);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(71, 18);
+            this.ComList.Size = new System.Drawing.Size(63, 15);
             this.ComList.TabIndex = 191;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -311,12 +311,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(670, 134);
+            this.BaudRate.Location = new System.Drawing.Point(596, 112);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(178, 28);
+            this.BaudRate.Size = new System.Drawing.Size(159, 25);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -330,13 +330,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(770, 22);
+            this.stopWeigh.Location = new System.Drawing.Point(684, 18);
             this.stopWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(108, 38);
+            this.stopWeigh.Size = new System.Drawing.Size(96, 32);
             this.stopWeigh.TabIndex = 187;
             this.stopWeigh.Text = "停止称重";
             this.stopWeigh.UseVisualStyleBackColor = false;
@@ -349,46 +349,27 @@
             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(651, 22);
+            this.startWeigh.Location = new System.Drawing.Point(579, 18);
             this.startWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(93, 38);
+            this.startWeigh.Size = new System.Drawing.Size(83, 32);
             this.startWeigh.TabIndex = 186;
             this.startWeigh.Text = "开始称重";
             this.startWeigh.UseVisualStyleBackColor = false;
             this.startWeigh.Click += new System.EventHandler(this.startWeigh_Click);
             // 
-            // weightedNum
-            // 
-            this.weightedNum.AllPower = null;
-            this.weightedNum.BackColor = System.Drawing.Color.White;
-            this.weightedNum.Enabled = false;
-            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(1122, 250);
-            this.weightedNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.weightedNum.Name = "weightedNum";
-            this.weightedNum.Negative = false;
-            this.weightedNum.Power = null;
-            this.weightedNum.Size = new System.Drawing.Size(196, 28);
-            this.weightedNum.Str = null;
-            this.weightedNum.Str1 = null;
-            this.weightedNum.Str2 = null;
-            this.weightedNum.TabIndex = 185;
-            this.weightedNum.Text = "0";
-            // 
             // PA_PACKAGEQTY
             // 
             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(561, 378);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(201, 0);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(499, 315);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(179, 0);
             this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
-            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 39);
+            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 32);
             this.PA_PACKAGEQTY.TabIndex = 184;
             // 
             // pa_salecode
@@ -396,10 +377,10 @@
             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(561, 314);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(201, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(499, 262);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(179, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 32);
             this.pa_salecode.TabIndex = 183;
             // 
             // pa_totalqty
@@ -407,10 +388,10 @@
             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(176, 378);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(201, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(156, 315);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(179, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 39);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 32);
             this.pa_totalqty.TabIndex = 180;
             // 
             // pa_makecode
@@ -418,10 +399,10 @@
             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(176, 314);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(201, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(156, 262);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(179, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 32);
             this.pa_makecode.TabIndex = 179;
             // 
             // PrintNum
@@ -431,12 +412,12 @@
             this.PrintNum.Enabled = false;
             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(1122, 170);
+            this.PrintNum.Location = new System.Drawing.Point(997, 142);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(196, 28);
+            this.PrintNum.Size = new System.Drawing.Size(175, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -446,20 +427,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(33, 574);
+            this.OperateResult.Location = new System.Drawing.Point(29, 478);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(662, 310);
+            this.OperateResult.Size = new System.Drawing.Size(589, 259);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
             // Printer
             // 
             this.Printer.Font = new System.Drawing.Font("宋体", 9F);
-            this.Printer.Location = new System.Drawing.Point(1122, 24);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(997, 20);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(195, 34);
+            this.Printer.Size = new System.Drawing.Size(173, 28);
             this.Printer.TabIndex = 163;
             // 
             // palletcode
@@ -468,11 +449,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(183, 14);
+            this.palletcode.Location = new System.Drawing.Point(163, 12);
             this.palletcode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = null;
-            this.palletcode.Size = new System.Drawing.Size(415, 55);
+            this.palletcode.Size = new System.Drawing.Size(369, 47);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -483,28 +464,37 @@
             // 
             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(176, 446);
+            this.pa_prodcode.Location = new System.Drawing.Point(156, 372);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 39);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 32);
             this.pa_prodcode.TabIndex = 194;
             // 
-            // pr_detailspec
+            // pr_detail
+            // 
+            this.pr_detail.AutoSize = true;
+            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail.Location = new System.Drawing.Point(156, 428);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 32);
+            this.pr_detail.TabIndex = 195;
             // 
-            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            this.pr_detailspec.Location = new System.Drawing.Point(179, 515);
-            this.pr_detailspec.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.pr_detailspec.Name = "pr_detailspec";
-            this.pr_detailspec.Size = new System.Drawing.Size(242, 38);
-            this.pr_detailspec.TabIndex = 197;
-            this.pr_detailspec.TextAreaEnable = false;
-            this.pr_detailspec.TextBoxEnable = false;
+            // weightedNum
+            // 
+            this.weightedNum.AutoSize = true;
+            this.weightedNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weightedNum.Location = new System.Drawing.Point(992, 208);
+            this.weightedNum.Name = "weightedNum";
+            this.weightedNum.Size = new System.Drawing.Size(24, 27);
+            this.weightedNum.TabIndex = 196;
+            this.weightedNum.Text = "0";
             // 
             // Make_PalletWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1401, 902);
-            this.Controls.Add(this.pr_detailspec);
+            this.ClientSize = new System.Drawing.Size(1245, 752);
+            this.Controls.Add(this.weightedNum);
+            this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pa_prodcode);
             this.Controls.Add(this.autoPrint);
             this.Controls.Add(this.ComList);
@@ -512,7 +502,6 @@
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.stopWeigh);
             this.Controls.Add(this.startWeigh);
-            this.Controls.Add(this.weightedNum);
             this.Controls.Add(this.PA_PACKAGEQTY);
             this.Controls.Add(this.pa_salecode);
             this.Controls.Add(this.pa_totalqty);
@@ -575,7 +564,6 @@
         private CustomControl.ValueLabel.ValueLabel pa_totalqty;
         private CustomControl.ValueLabel.ValueLabel pa_salecode;
         private CustomControl.ValueLabel.ValueLabel PA_PACKAGEQTY;
-        private CustomControl.TextBoxWithIcon.NumOnlyTextBox weightedNum;
         private CustomControl.ButtonUtil.NormalButton startWeigh;
         private CustomControl.ButtonUtil.NormalButton stopWeigh;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox BaudRate;
@@ -587,6 +575,7 @@
         private CustomControl.ValueLabel.ValueLabel ComList;
         private CustomControl.CustomCheckBox.AutoPrintCheckBox autoPrint;
         private System.Windows.Forms.Label pa_prodcode;
-        private CustomControl.TextBoxWithIcon.TextBoxWithTextArea pr_detailspec;
+        private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.Label weightedNum;
     }
 }

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -108,7 +108,7 @@ namespace UAS_MES.Make
                 }
                 //校验栈板号
                 sql.Clear();
-                sql.Append("select pa_id,pa_prodcode,pr_spec ||','|| pr_detail pr_detailspec,pa_makecode,pa_salecode,pa_totalqty,");
+                sql.Append("select pa_id,pa_prodcode,pr_detail,pa_makecode,pa_salecode,pa_totalqty,");
                 sql.Append("pa_packageqty from package left join product on pr_code=pa_prodcode where ");
                 sql.Append("pa_outboxcode=:code and pa_type='3'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select",palletcode.Text);