Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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, 78);
+            this.panel4.Location = new System.Drawing.Point(46, 94);
             this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(491, 154);
+            this.panel4.Size = new System.Drawing.Size(552, 184);
             this.panel4.TabIndex = 92;
             // 
             // pr_cartonunit
@@ -87,12 +87,13 @@
             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, 62);
+            this.pr_cartonunit.Location = new System.Drawing.Point(460, 74);
             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(38, 31);
+            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
+            this.pr_cartonunit.Visible = false;
             // 
             // label22
             // 
@@ -100,10 +101,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(20, 62);
+            this.label22.Location = new System.Drawing.Point(22, 74);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
+            this.label22.Size = new System.Drawing.Size(75, 38);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -115,20 +116,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(139, 52);
+            this.weight.Location = new System.Drawing.Point(156, 62);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 50);
+            this.weight.Size = new System.Drawing.Size(0, 58);
             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, 12);
+            this.label15.Location = new System.Drawing.Point(46, 14);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(107, 39);
+            this.label15.Size = new System.Drawing.Size(128, 46);
             this.label15.TabIndex = 93;
             this.label15.Text = "栈板号";
             // 
@@ -136,10 +137,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(869, 78);
+            this.label1.Location = new System.Drawing.Point(978, 94);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 165;
             this.label1.Text = "打印标签";
             // 
@@ -147,10 +148,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(869, 18);
+            this.Printer_label.Location = new System.Drawing.Point(978, 22);
             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(112, 27);
+            this.Printer_label.Size = new System.Drawing.Size(134, 31);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -159,10 +160,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(1000, 82);
+            this.PrintLabel.Location = new System.Drawing.Point(1125, 98);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(175, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(196, 26);
             this.PrintLabel.TabIndex = 162;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -170,9 +171,9 @@
             // 
             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(978, 170);
             this.printNum_label.Name = "printNum_label";
-            this.printNum_label.Size = new System.Drawing.Size(52, 27);
+            this.printNum_label.Size = new System.Drawing.Size(62, 31);
             this.printNum_label.TabIndex = 167;
             this.printNum_label.Text = "份数";
             // 
@@ -180,9 +181,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(35, 262);
+            this.label2.Location = new System.Drawing.Point(39, 314);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(90, 32);
+            this.label2.Size = new System.Drawing.Size(107, 39);
             this.label2.TabIndex = 169;
             this.label2.Text = "工单号";
             // 
@@ -190,9 +191,9 @@
             // 
             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(39, 378);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(115, 32);
+            this.label3.Size = new System.Drawing.Size(137, 39);
             this.label3.TabIndex = 170;
             this.label3.Text = "栈内总数";
             // 
@@ -200,9 +201,9 @@
             // 
             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(39, 446);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(115, 32);
+            this.label4.Size = new System.Drawing.Size(137, 39);
             this.label4.TabIndex = 171;
             this.label4.Text = "产品编号";
             // 
@@ -210,9 +211,9 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(35, 428);
+            this.label5.Location = new System.Drawing.Point(39, 514);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(115, 32);
+            this.label5.Size = new System.Drawing.Size(137, 39);
             this.label5.TabIndex = 172;
             this.label5.Text = "产品名称";
             // 
@@ -220,9 +221,9 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label6.Location = new System.Drawing.Point(381, 262);
+            this.label6.Location = new System.Drawing.Point(429, 314);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(115, 32);
+            this.label6.Size = new System.Drawing.Size(137, 39);
             this.label6.TabIndex = 173;
             this.label6.Text = "订单编号";
             // 
@@ -230,9 +231,9 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(381, 315);
+            this.label7.Location = new System.Drawing.Point(429, 378);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(115, 32);
+            this.label7.Size = new System.Drawing.Size(137, 39);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
@@ -240,9 +241,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(869, 208);
+            this.label8.Location = new System.Drawing.Point(978, 250);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(52, 27);
+            this.label8.Size = new System.Drawing.Size(62, 31);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
@@ -254,10 +255,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.Location = new System.Drawing.Point(770, 378);
             this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(520, 422);
+            this.showResult.Size = new System.Drawing.Size(584, 506);
             this.showResult.TabIndex = 190;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -287,21 +288,21 @@
             // autoPrint
             // 
             this.autoPrint.Checked = false;
-            this.autoPrint.Location = new System.Drawing.Point(875, 262);
-            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.autoPrint.Location = new System.Drawing.Point(984, 314);
+            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.autoPrint.Name = "autoPrint";
-            this.autoPrint.Size = new System.Drawing.Size(125, 34);
+            this.autoPrint.Size = new System.Drawing.Size(141, 41);
             this.autoPrint.TabIndex = 193;
             // 
             // ComList
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(595, 152);
+            this.ComList.Location = new System.Drawing.Point(669, 182);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(63, 15);
+            this.ComList.Size = new System.Drawing.Size(71, 18);
             this.ComList.TabIndex = 191;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -311,12 +312,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.Location = new System.Drawing.Point(670, 134);
             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(159, 25);
+            this.BaudRate.Size = new System.Drawing.Size(178, 28);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -330,13 +331,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, 18);
+            this.stopWeigh.Location = new System.Drawing.Point(770, 22);
             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(96, 32);
+            this.stopWeigh.Size = new System.Drawing.Size(108, 38);
             this.stopWeigh.TabIndex = 187;
             this.stopWeigh.Text = "停止称重";
             this.stopWeigh.UseVisualStyleBackColor = false;
@@ -349,13 +350,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(579, 18);
+            this.startWeigh.Location = new System.Drawing.Point(651, 22);
             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(83, 32);
+            this.startWeigh.Size = new System.Drawing.Size(93, 38);
             this.startWeigh.TabIndex = 186;
             this.startWeigh.Text = "开始称重";
             this.startWeigh.UseVisualStyleBackColor = false;
@@ -366,10 +367,10 @@
             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(499, 315);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(179, 0);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(561, 378);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(201, 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, 39);
             this.PA_PACKAGEQTY.TabIndex = 184;
             // 
             // pa_salecode
@@ -377,10 +378,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(499, 262);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(179, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(561, 314);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(201, 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, 39);
             this.pa_salecode.TabIndex = 183;
             // 
             // pa_totalqty
@@ -388,10 +389,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(156, 315);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(179, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(176, 378);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(201, 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, 39);
             this.pa_totalqty.TabIndex = 180;
             // 
             // pa_makecode
@@ -399,10 +400,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(156, 262);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(179, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(176, 314);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(201, 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, 39);
             this.pa_makecode.TabIndex = 179;
             // 
             // PrintNum
@@ -412,12 +413,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(997, 142);
+            this.PrintNum.Location = new System.Drawing.Point(1122, 170);
             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(175, 25);
+            this.PrintNum.Size = new System.Drawing.Size(196, 28);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -427,20 +428,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.Location = new System.Drawing.Point(33, 574);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(589, 259);
+            this.OperateResult.Size = new System.Drawing.Size(662, 310);
             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);
+            this.Printer.Location = new System.Drawing.Point(1122, 24);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(173, 28);
+            this.Printer.Size = new System.Drawing.Size(195, 34);
             this.Printer.TabIndex = 163;
             // 
             // palletcode
@@ -449,11 +450,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.Location = new System.Drawing.Point(183, 14);
             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(369, 47);
+            this.palletcode.Size = new System.Drawing.Size(415, 55);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -464,35 +465,35 @@
             // 
             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(176, 446);
             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, 39);
             this.pa_prodcode.TabIndex = 194;
             // 
             // 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.Location = new System.Drawing.Point(176, 514);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 32);
+            this.pr_detail.Size = new System.Drawing.Size(0, 39);
             this.pr_detail.TabIndex = 195;
             // 
             // 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.Location = new System.Drawing.Point(1116, 250);
             this.weightedNum.Name = "weightedNum";
-            this.weightedNum.Size = new System.Drawing.Size(24, 27);
+            this.weightedNum.Size = new System.Drawing.Size(28, 31);
             this.weightedNum.TabIndex = 196;
             this.weightedNum.Text = "0";
             // 
             // Make_PalletWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1245, 752);
+            this.ClientSize = new System.Drawing.Size(1401, 902);
             this.Controls.Add(this.weightedNum);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pa_prodcode);

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -121,7 +121,7 @@ namespace UAS_MES.Make
                     //给页面赋值
                     BaseUtil.SetFormValue(this.Controls,dt);
                     //刷新grid的历史称重信息；
-                    if (double.Parse(weight.Text) == 0)
+                    if (double.Parse(weight.Text.Replace("kg","").Trim()) == 0)
                     {
                         OperateResult.AppendText("<<重量不能等于0\n", Color.Red, palletcode);
                         return;
@@ -129,7 +129,7 @@ namespace UAS_MES.Make
                     // 更新大箱重量
                     sql.Clear();
                     sql.Append("update package set pa_weight=:weight where pa_id=:pa_id ");
-                    dh.ExecuteSql(sql.GetString(),"update",weight.Text,dt.Rows[0]["pa_id"].ToString());
+                    dh.ExecuteSql(sql.GetString(),"update",weight.Text.Replace("kg","").Trim(),dt.Rows[0]["pa_id"].ToString());
                     //记录makeprocess    
                     //查询maid
                     info = (DataTable)dh.ExecuteSql("select ma_id,ma_wccode from make where ma_code='"+pa_makecode.Text+"'","select");
@@ -142,14 +142,20 @@ namespace UAS_MES.Make
                         sql.Append("mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,");
                         sql.Append("mp_snoutboxcode) values ( makeprocess_seq.nextval,:makecode,:ma_id,:craftcode,:craftname,'栈板称重'");
                         sql.Append(",:result,sysdate,:inman,:workcenter,:linecode,:source,:palletcode) ");
-                        dh.ExecuteSql(sql.GetString(), "insert", pa_makecode.Text, info.Rows[0]["ma_id"].ToString(), User.CurrentStepCode, User.CurrentStepName, "称重成功,栈板号:" + palletcode.Text + ",重量:" + weight.Text + "克", User.UserName, info.Rows[0]["ma_wccode"].ToString(), User.UserLineCode, User.UserSourceCode, palletcode.Text);
+                        dh.ExecuteSql(sql.GetString(), "insert", pa_makecode.Text, info.Rows[0]["ma_id"].ToString(), User.CurrentStepCode, User.CurrentStepName, "称重成功,栈板号:" + palletcode.Text + ",重量:" + weight.Text.Trim() , User.UserName, info.Rows[0]["ma_wccode"].ToString(), User.UserLineCode, User.UserSourceCode, palletcode.Text);
                         //提示信息栏显示：<< 栈板号：XXXX,重量：xxxx 克，
-                        OperateResult.AppendText("<<栈板号:" + palletcode.Text + ",重量:" + weight.Text + pr_cartonunit.Text+ "\n", Color.Green);
+                        OperateResult.AppendText("<<栈板号:" + palletcode.Text + ",重量:" + weight.Text.Trim() + "\n", Color.Green);
                         //记录日志
-                        LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,pa_makecode.Text,User.UserLineCode,User.UserSourceCode,"栈板称重","重量:" + weight.Text+"克\n",palletcode.Text,"");
+                        LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,pa_makecode.Text,User.UserLineCode,User.UserSourceCode,"栈板称重","重量:" + weight.Text.Trim()+"\n",palletcode.Text,"");
                         //刷新称重计数+1
                         weightedNum.Text = double.Parse(weightedNum.Text) + 1 + "";
-                        recordResult(palletcode.Text, weight.Text, System.DateTime.Now.ToString());
+                        recordResult(palletcode.Text, weight.Text.Trim(), System.DateTime.Now.ToString());
+                        //插入称重日志表
+                        sql.Clear();
+                        sql.Append("insert into weightlog(wl_id,wl_type,wl_scancode,wl_weight,wl_unit,wl_linecode,");
+                        sql.Append("wl_prodcode,wl_sccode,wl_indate,wl_inman) values (weightlog_seq.nextval,'PALLET',:palletcode,");
+                        sql.Append(":weight,'kg',:linecode,:prodcode,:sccode,sysdate,:inman)");
+                        dh.ExecuteSql(sql.GetString(), "insert", palletcode.Text, weight.Text.Replace("kg", "").Trim(), User.UserLineCode, pa_prodcode.Text, User.UserSourceCode, User.UserName);
                         //如果用户勾选了自动打印，调用打印, 打印成功，消息提示栏显示“打印成功”，“请输入栈板号”
                         if (autoPrint.Checked == true)
                         {
@@ -248,7 +254,8 @@ namespace UAS_MES.Make
                         {
                             try
                             {
-                                weight.Text = Regex.Replace(serialPort1.ReadLine(), "\\D+", "");
+                                //weight.Text = Regex.Replace(serialPort1.ReadLine(), "\\D+", "");
+                                weight.Text = serialPort1.ReadLine();
                             }
                             catch (Exception)
                             {

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1313,8 +1313,12 @@ namespace UAS_MES.PublicMethod
 
         public static void RecordProdWeight(string iSN, string iType, string iScanValue, float iWeight, string iUnit, string iLineCode, string iPrCode, string iSource, string iUser)
         {
-
-            sql.Append("");
+            //记录重量
+            sql.Clear();
+            sql.Append("insert into weightlog(wl_id,wl_type,wl_scancode,wl_weight,wl_unit,wl_linecode,");
+            sql.Append("wl_prodcode,wl_sccode,wl_indate,wl_inman) values (weightlog_seq.nextval,:type,:palletcode,");
+            sql.Append(":weight,:unit,:linecode,:prodcode,:sccode,sysdate,:inman)");
+            dh.ExecuteSql(sql.ToString(), "insert", iType,iScanValue, iWeight,iUnit, User.UserLineCode, iPrCode, iSource, iUser);
         }