卡通箱装栈板称重修改

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.Designer.cs

@@ -105,6 +105,7 @@
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBoxWithBorder3 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.StartWeight = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.RefreshWeigh = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.sumpalletweight = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
@@ -128,7 +129,6 @@
             this.label2 = new System.Windows.Forms.Label();
             this.ComList = new System.Windows.Forms.Label();
             this.BaudRate = new System.Windows.Forms.Label();
-            this.StartWeight = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -381,7 +381,7 @@
             // 
             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(529, 31);
+            this.label1.Location = new System.Drawing.Point(530, 32);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(146, 41);
@@ -404,7 +404,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Red;
-            this.checkweightlabel.Location = new System.Drawing.Point(55, 47);
+            this.checkweightlabel.Location = new System.Drawing.Point(56, 48);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(400, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -415,7 +415,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(691, 175);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(692, 176);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
@@ -425,7 +425,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(691, 99);
+            this.ob_batchqty.Location = new System.Drawing.Point(692, 100);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 41);
@@ -435,7 +435,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(529, 175);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(530, 176);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
@@ -446,7 +446,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(529, 103);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(530, 104);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
@@ -457,7 +457,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(691, 31);
+            this.ob_checkno.Location = new System.Drawing.Point(692, 32);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 41);
@@ -502,7 +502,7 @@
             this.Packing.Power = null;
             this.Packing.Size = new System.Drawing.Size(100, 48);
             this.Packing.TabIndex = 173;
-            this.Packing.Text = "封箱";
+            this.Packing.Text = "封栈板";
             this.Packing.UseVisualStyleBackColor = true;
             this.Packing.Click += new System.EventHandler(this.Packing_Click);
             // 
@@ -522,7 +522,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(15, 177);
+            this.label3.Location = new System.Drawing.Point(16, 178);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(146, 41);
@@ -572,7 +572,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(15, 97);
+            this.PrintList_label.Location = new System.Drawing.Point(16, 98);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(178, 41);
@@ -583,7 +583,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(415, 259);
+            this.PrintNum_label.Location = new System.Drawing.Point(416, 260);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(82, 41);
@@ -630,7 +630,7 @@
             this.locksalecode.AutoSize = true;
             this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.locksalecode.ForeColor = System.Drawing.Color.Red;
-            this.locksalecode.Location = new System.Drawing.Point(583, 33);
+            this.locksalecode.Location = new System.Drawing.Point(584, 34);
             this.locksalecode.Margin = new System.Windows.Forms.Padding(6);
             this.locksalecode.Name = "locksalecode";
             this.locksalecode.Size = new System.Drawing.Size(186, 28);
@@ -642,7 +642,7 @@
             // 
             this.PreFix_label.AutoSize = true;
             this.PreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PreFix_label.Location = new System.Drawing.Point(357, 29);
+            this.PreFix_label.Location = new System.Drawing.Point(358, 30);
             this.PreFix_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PreFix_label.Name = "PreFix_label";
             this.PreFix_label.Size = new System.Drawing.Size(71, 36);
@@ -670,7 +670,7 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(419, 273);
+            this.pa_salecode_label.Location = new System.Drawing.Point(420, 274);
             this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
             this.pa_salecode_label.Size = new System.Drawing.Size(146, 41);
@@ -681,7 +681,7 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(11, 273);
+            this.ma_code_label.Location = new System.Drawing.Point(12, 274);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(114, 41);
@@ -692,7 +692,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(581, 273);
+            this.ms_salecode.Location = new System.Drawing.Point(582, 274);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 41);
@@ -702,7 +702,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(183, 273);
+            this.ms_makecode.Location = new System.Drawing.Point(184, 274);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -713,7 +713,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(161, 29);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(162, 30);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(71, 36);
@@ -779,7 +779,7 @@
             this.AutoGenBoxCode.AutoSize = true;
             this.AutoGenBoxCode.Checked = true;
             this.AutoGenBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(495, 89);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(496, 90);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(178, 45);
@@ -792,7 +792,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(423, 153);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(424, 154);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(146, 41);
@@ -803,7 +803,7 @@
             // 
             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(419, 209);
+            this.pr_detail_label.Location = new System.Drawing.Point(420, 210);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
@@ -832,7 +832,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(579, 149);
+            this.pa_currentqty.Location = new System.Drawing.Point(580, 150);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 41);
@@ -842,7 +842,7 @@
             // 
             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(11, 209);
+            this.pr_code_label.Location = new System.Drawing.Point(12, 210);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(146, 41);
@@ -853,7 +853,7 @@
             // 
             this.pr_detail.AutoSize = true;
             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(581, 209);
+            this.pr_detail.Location = new System.Drawing.Point(582, 210);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -863,7 +863,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(11, 147);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(12, 148);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(146, 41);
@@ -874,7 +874,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(183, 209);
+            this.pr_code.Location = new System.Drawing.Point(184, 210);
             this.pr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_code.Name = "pr_code";
@@ -886,7 +886,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(11, 87);
+            this.pa_code_label.Location = new System.Drawing.Point(12, 88);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(82, 41);
@@ -1096,6 +1096,25 @@
             this.groupBoxWithBorder3.Text = "称量信息";
             this.groupBoxWithBorder3.TextColor = System.Drawing.Color.Black;
             // 
+            // StartWeight
+            // 
+            this.StartWeight.AllPower = null;
+            this.StartWeight.BackColor = System.Drawing.Color.Transparent;
+            this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
+            this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
+            this.StartWeight.IsShowBorder = true;
+            this.StartWeight.Location = new System.Drawing.Point(199, 32);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
+            this.StartWeight.Name = "StartWeight";
+            this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
+            this.StartWeight.Power = null;
+            this.StartWeight.Size = new System.Drawing.Size(141, 48);
+            this.StartWeight.TabIndex = 246;
+            this.StartWeight.Text = "开始称量";
+            this.StartWeight.UseVisualStyleBackColor = true;
+            this.StartWeight.Click += new System.EventHandler(this.StartWeight_Click);
+            // 
             // RefreshWeigh
             // 
             this.RefreshWeigh.AllPower = "ifall";
@@ -1120,7 +1139,7 @@
             // 
             this.sumpalletweight.AutoSize = true;
             this.sumpalletweight.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.sumpalletweight.Location = new System.Drawing.Point(25, 319);
+            this.sumpalletweight.Location = new System.Drawing.Point(26, 320);
             this.sumpalletweight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sumpalletweight.Name = "sumpalletweight";
             this.sumpalletweight.Size = new System.Drawing.Size(0, 88);
@@ -1130,7 +1149,7 @@
             // 
             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(9, 245);
+            this.label4.Location = new System.Drawing.Point(10, 246);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(210, 41);
@@ -1142,7 +1161,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.DarkGreen;
-            this.weight.Location = new System.Drawing.Point(21, 107);
+            this.weight.Location = new System.Drawing.Point(22, 108);
             this.weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 121);
@@ -1152,7 +1171,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(9, 39);
+            this.label5.Location = new System.Drawing.Point(10, 40);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(146, 41);
@@ -1377,25 +1396,6 @@
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
             // 
-            // StartWeight
-            // 
-            this.StartWeight.AllPower = null;
-            this.StartWeight.BackColor = System.Drawing.Color.Transparent;
-            this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
-            this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
-            this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(199, 32);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
-            this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
-            this.StartWeight.Name = "StartWeight";
-            this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
-            this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(141, 48);
-            this.StartWeight.TabIndex = 246;
-            this.StartWeight.Text = "开始称量";
-            this.StartWeight.UseVisualStyleBackColor = true;
-            this.StartWeight.Click += new System.EventHandler(this.StartWeight_Click);
-            // 
             // Packing_PackageCollectionPallet
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.cs

@@ -476,10 +476,30 @@ namespace UAS_MES_NEW.Packing
                                     }
                                     if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) == int.Parse(pr_outboxinnerqty.Text))
                                     {
+                                        double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Replace("g", "").Trim());
+                                        double palletWeightErrorValue = double.Parse(dh.GetConfig("palletWeightErrorValue", "MESSetting").ToString());
+                                        double totalweight = double.Parse(sumpalletweight.Text);
                                         if (PR_CHECKCARTONW != "0")
                                         {
-                                            OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "满箱处于称重工序，请在卡通箱称重界面进行称重打印\n", Color.Black, sn_code);
-                                            return;
+                                            if (palletWeightErrorValue == 0)
+                                            {
+                                                OperateResult.AppendText(">>产品" + pr_code.Text + "未维护栈板偏差值\n", Color.Red);
+                                                return;
+                                            }
+                                            if ((ActualWeight >= totalweight - palletWeightErrorValue) && (ActualWeight <= totalweight + palletWeightErrorValue))
+                                            {
+                                                OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "重量检测检测合格\n", Color.Green);
+                                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "栈板称重:" + weight.Text, "称量合格", pa_outboxcode.Text, "");
+                                                LogicHandler.RecordProdWeight(pa_outboxcode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
+                                                dh.ExecuteSql("update makeserial set ms_grossw='" + ActualWeight + "' where ms_id='" + oMsID + "'", "update");
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "重量检测未通过\n", Color.Red);
+                                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "栈板称重:" + weight.Text, "称量不合格", pa_outboxcode.Text, "");
+                                                LogicHandler.RecordProdWeight(pa_outboxcode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
+                                                return;
+                                            }
                                         }
                                         if (dh.getFieldDataByCondition("package", "PA_PALLETNO", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "")
                                         {
@@ -1023,8 +1043,11 @@ namespace UAS_MES_NEW.Packing
         private string RefreshWeight()
         {
             string boxweight = dh.getFieldDataByCondition("makeserial", "nvl(sum(MS_MIDBOXWEIGHT),0)", "ms_outboxcode='" + pa_outboxcode.Text + "'").ToString();
+            string pr_Singlelevelqty = dh.getFieldDataByCondition("makeserial left join product on ms_prodcode=pr_code", "nvl(pr_Singlelevelqty,1)", "ms_outboxcode='" + pa_outboxcode.Text + "'").ToString();
+            string palletweight = dh.getFieldDataByCondition("pallet", "nvl(PL_WEIGHT,0)", "PL_CODE=(select PA_PALLETNO from package where pa_outboxcode='" + pa_outboxcode.Text + "')").ToString();
             sumpalletweight.Text = (double.Parse(boxweight)).ToString();
             int packageqty = dh.getRowCount("makeserial", "ms_outboxcode='" + pa_outboxcode.Text + "'");
+            pr_Singlelevelqty = pr_Singlelevelqty == "" ? "1" : pr_Singlelevelqty;
             //根据单层装的数量，自动计算栈板装的层数
             int rowcount = 0;
             if (packageqty % int.Parse(pr_Singlelevelqty) == 0)
@@ -1066,6 +1089,10 @@ namespace UAS_MES_NEW.Packing
                     }
                 }
                 sumpalletweight.Text = (double.Parse(boxweight) + attach_weight).ToString();
+                if (palletweight != "")
+                {
+                    sumpalletweight.Text = (double.Parse(boxweight) + attach_weight + double.Parse(palletweight)).ToString();
+                }
             }
             return "";
         }
@@ -1132,18 +1159,26 @@ namespace UAS_MES_NEW.Packing
         {
             if (e.KeyCode == Keys.Enter)
             {
+                if (pa_outboxcode.Text == "")
+                {
+                    OperateResult.AppendText(">>请先输入箱号\n", Color.Red);
+                    return;
+                }
                 DataTable dt = (DataTable)dh.ExecuteSql("select pl_code from pallet where pl_code='" + PalletCode.Text + "'", "select");
                 if (dt.Rows.Count == 0)
                 {
-                    OperateResult.AppendText(">>卡板号" + pr_code.Text + "不存在\n", Color.Red);
+                    OperateResult.AppendText(">>卡板号" + PalletCode.Text + "不存在\n", Color.Red);
                     return;
                 }
                 string boxcode = dh.getFieldDataByCondition("package", "pa_outboxcode", "PA_PALLETNO='" + PalletCode.Text + "'").ToString();
                 if (boxcode != "")
                 {
-                    OperateResult.AppendText(">>卡板号" + pr_code.Text + "已绑定栈板" + boxcode + "\n", Color.Red);
+                    OperateResult.AppendText(">>卡板号" + PalletCode.Text + "已绑定栈板" + boxcode + "\n", Color.Red);
                     return;
                 }
+                dh.ExecuteSql("update package set PA_PALLETNO='" + PalletCode.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+                OperateResult.AppendText(">>卡板号" + PalletCode.Text + "绑定栈板号" + pa_outboxcode.Text + "成功\n", Color.Green);
+                RefreshWeight();
             }
         }
 

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.resx

@@ -367,7 +367,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN