优化装箱打印

UAS_MES_ZT/FunctionCode/Make/Make_TestCollectionCT2.cs

@@ -453,6 +453,13 @@ namespace UAS_MES_NEW.Make
                                     oth.Focus();
                                     return;
                                 }
+                                string ms_sncode = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_OTHCODE1='" + oth.Text + "'").ToString();
+                                if (ms_sncode != "")
+                                {
+                                    OperateResult.AppendText(">>条码" + oth.Text + "已被序列号"+ ms_sncode + "采集\n", Color.Red, oth);
+                                    oth.Focus();
+                                    return;
+                                }
                                 DataTable dt1 = (DataTable)dh.ExecuteSql("select mm_code from makematerial where mm_code='" + ma_code.Text + "' and mm_prodcode in (select ms_prodcode from makeserial where ms_sncode='" + oth.Text + "')", "select");
                                 if (dt1.Rows.Count == 0)
                                 {
@@ -601,6 +608,13 @@ namespace UAS_MES_NEW.Make
                             oth.Focus();
                             return;
                         }
+                        string ms_sncode = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_OTHCODE1='" + oth.Text + "'").ToString();
+                        if (ms_sncode != "")
+                        {
+                            OperateResult.AppendText(">>条码" + oth.Text + "已被序列号" + ms_sncode + "采集\n", Color.Red, oth);
+                            oth.Focus();
+                            return;
+                        }
                         DataTable dt1 = (DataTable)dh.ExecuteSql("select mm_code from makematerial where mm_code='" + ma_code.Text + "' and mm_prodcode in (select ms_prodcode from makeserial where ms_sncode='" + oth.Text + "')", "select");
                         if (dt1.Rows.Count == 0)
                         {
@@ -1206,6 +1220,13 @@ namespace UAS_MES_NEW.Make
                         oth.Focus();
                         return;
                     }
+                    string sncode = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_OTHCODE1='" + oth.Text + "'").ToString();
+                    if (sncode != "")
+                    {
+                        OperateResult.AppendText(">>条码" + oth.Text + "已被序列号" + sncode + "采集\n", Color.Red, oth);
+                        oth.Focus();
+                        return;
+                    }
                     if (ms_status != "2")
                     {
                         OperateResult.AppendText(">>条码" + oth.Text + "未完工,不允许采集\n", Color.Red, oth);

UAS_MES_ZT/FunctionCode/Packing/Packing_PackageCollectionWeigh.Designer.cs

@@ -28,10 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Packing_PackageCollectionWeigh));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
             this.pa_makecode = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
             this.Cancel = new System.Windows.Forms.CheckBox();
@@ -87,7 +88,7 @@
             this.getwei = new System.Windows.Forms.CheckBox();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.PrintNum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip();
+            this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.PrintList = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.PreFix = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.SendCheck = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
@@ -113,13 +114,9 @@
             this.AutoPrint = new UAS_MES_NEW.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.label7 = new System.Windows.Forms.Label();
             this.ms_endremark = new System.Windows.Forms.Label();
-            this.PrintNum1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.PrintSecond = new System.Windows.Forms.CheckBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.PrintLabel1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip();
+            this.PrintLabel1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.label8 = new System.Windows.Forms.Label();
-            this.PrintList1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.label10 = new System.Windows.Forms.Label();
+            this.Printing1 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.SuspendLayout();
             // 
@@ -426,7 +423,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(240, 24);
+            this.PreFix_label.Location = new System.Drawing.Point(245, 28);
             this.PreFix_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.PreFix_label.Name = "PreFix_label";
             this.PreFix_label.Size = new System.Drawing.Size(71, 36);
@@ -438,7 +435,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(485, 28);
+            this.locksalecode.Location = new System.Drawing.Point(399, 37);
             this.locksalecode.Margin = new System.Windows.Forms.Padding(5);
             this.locksalecode.Name = "locksalecode";
             this.locksalecode.Size = new System.Drawing.Size(186, 28);
@@ -493,7 +490,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(59, 24);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(63, 29);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(71, 36);
@@ -667,18 +664,18 @@
             // 
             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(871, 162);
+            this.label3.Location = new System.Drawing.Point(868, 90);
             this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 238;
-            this.label3.Text = "打印标签";
+            this.label3.Text = "外箱标签";
             // 
             // PrintList_label
             // 
             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(871, 85);
+            this.PrintList_label.Location = new System.Drawing.Point(868, 23);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(178, 41);
@@ -689,7 +686,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(1295, 225);
+            this.PrintNum_label.Location = new System.Drawing.Point(1399, 225);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(82, 41);
@@ -712,7 +709,7 @@
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(1120, 2);
+            this.StepCount.Location = new System.Drawing.Point(583, -5);
             this.StepCount.Margin = new System.Windows.Forms.Padding(8, 13, 8, 13);
             this.StepCount.Name = "StepCount";
             this.StepCount.Size = new System.Drawing.Size(273, 79);
@@ -727,7 +724,7 @@
             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(1399, 230);
+            this.PrintNum.Location = new System.Drawing.Point(1503, 230);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(5);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
@@ -742,7 +739,7 @@
             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(1080, 165);
+            this.PrintLabel.Location = new System.Drawing.Point(1077, 93);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(296, 39);
@@ -751,7 +748,7 @@
             // PrintList
             // 
             this.PrintList.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintList.Location = new System.Drawing.Point(1080, 92);
+            this.PrintList.Location = new System.Drawing.Point(1077, 30);
             this.PrintList.Margin = new System.Windows.Forms.Padding(12, 13, 12, 13);
             this.PrintList.Name = "PrintList";
             this.PrintList.Size = new System.Drawing.Size(299, 56);
@@ -763,7 +760,7 @@
             this.PreFix.BackColor = System.Drawing.Color.White;
             this.PreFix.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PreFix.ID = null;
-            this.PreFix.Location = new System.Drawing.Point(336, 29);
+            this.PreFix.Location = new System.Drawing.Point(320, 30);
             this.PreFix.Margin = new System.Windows.Forms.Padding(12, 13, 12, 13);
             this.PreFix.Name = "PreFix";
             this.PreFix.Power = null;
@@ -781,7 +778,7 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(1468, 225);
+            this.SendCheck.Location = new System.Drawing.Point(1572, 225);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(5);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
@@ -818,7 +815,7 @@
             this.Packing.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Packing.Image = null;
             this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(888, 222);
+            this.Packing.Location = new System.Drawing.Point(817, 217);
             this.Packing.Margin = new System.Windows.Forms.Padding(5);
             this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
             this.Packing.Name = "Packing";
@@ -875,16 +872,16 @@
             this.Printing.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Printing.Image = null;
             this.Printing.IsShowBorder = true;
-            this.Printing.Location = new System.Drawing.Point(1193, 222);
+            this.Printing.Location = new System.Drawing.Point(1237, 218);
             this.Printing.Margin = new System.Windows.Forms.Padding(5);
             this.Printing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing.MoveImage")));
             this.Printing.Name = "Printing";
             this.Printing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printing.NormalImage")));
             this.Printing.Power = null;
-            this.Printing.Size = new System.Drawing.Size(91, 48);
+            this.Printing.Size = new System.Drawing.Size(121, 48);
             this.Printing.TabIndex = 150;
             this.Printing.Tag = "ifread";
-            this.Printing.Text = "打印";
+            this.Printing.Text = "打印外箱";
             this.Printing.UseVisualStyleBackColor = true;
             this.Printing.Click += new System.EventHandler(this.Print_Click);
             // 
@@ -1012,14 +1009,14 @@
             this.PackageDetail.AllowUserToAddRows = false;
             this.PackageDetail.AllowUserToDeleteRows = false;
             this.PackageDetail.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.PackageDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.PackageDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
             this.PackageDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.PackageDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.pd_barcode,
@@ -1028,27 +1025,27 @@
             this.pd_innerqty,
             this.pa_indate,
             this.pd_id});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.PackageDetail.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.PackageDetail.DefaultCellStyle = dataGridViewCellStyle17;
             this.PackageDetail.EnableContentClick = true;
             this.PackageDetail.Location = new System.Drawing.Point(23, 343);
             this.PackageDetail.Margin = new System.Windows.Forms.Padding(5);
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.ReadOnly = true;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.PackageDetail.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.PackageDetail.RowHeadersDefaultCellStyle = dataGridViewCellStyle18;
             this.PackageDetail.RowHeadersWidth = 82;
             this.PackageDetail.RowTemplate.Height = 23;
             this.PackageDetail.Size = new System.Drawing.Size(1243, 480);
@@ -1117,7 +1114,7 @@
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1003, 226);
+            this.AutoPrint.Location = new System.Drawing.Point(932, 221);
             this.AutoPrint.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
             this.AutoPrint.Name = "AutoPrint";
             this.AutoPrint.Size = new System.Drawing.Size(180, 45);
@@ -1127,7 +1124,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(880, 279);
+            this.label7.Location = new System.Drawing.Point(809, 274);
             this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(146, 41);
@@ -1138,58 +1135,18 @@
             // 
             this.ms_endremark.AutoSize = true;
             this.ms_endremark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_endremark.Location = new System.Drawing.Point(1048, 279);
+            this.ms_endremark.Location = new System.Drawing.Point(977, 274);
             this.ms_endremark.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.ms_endremark.Name = "ms_endremark";
             this.ms_endremark.Size = new System.Drawing.Size(0, 41);
             this.ms_endremark.TabIndex = 251;
             // 
-            // PrintNum1
-            // 
-            this.PrintNum1.AllPower = null;
-            this.PrintNum1.BackColor = System.Drawing.Color.White;
-            this.PrintNum1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum1.ID = null;
-            this.PrintNum1.Location = new System.Drawing.Point(1476, 839);
-            this.PrintNum1.Margin = new System.Windows.Forms.Padding(6);
-            this.PrintNum1.Name = "PrintNum1";
-            this.PrintNum1.Power = null;
-            this.PrintNum1.Size = new System.Drawing.Size(60, 39);
-            this.PrintNum1.Str = null;
-            this.PrintNum1.Str1 = null;
-            this.PrintNum1.Str2 = null;
-            this.PrintNum1.TabIndex = 254;
-            // 
-            // PrintSecond
-            // 
-            this.PrintSecond.AutoSize = true;
-            this.PrintSecond.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintSecond.ForeColor = System.Drawing.Color.Red;
-            this.PrintSecond.Location = new System.Drawing.Point(1173, 849);
-            this.PrintSecond.Margin = new System.Windows.Forms.Padding(6);
-            this.PrintSecond.Name = "PrintSecond";
-            this.PrintSecond.Size = new System.Drawing.Size(162, 28);
-            this.PrintSecond.TabIndex = 258;
-            this.PrintSecond.Text = "打印副标签";
-            this.PrintSecond.UseVisualStyleBackColor = true;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(1377, 840);
-            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(82, 41);
-            this.label9.TabIndex = 252;
-            this.label9.Text = "份数";
-            // 
             // PrintLabel1
             // 
             this.PrintLabel1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel1.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel1.FormattingEnabled = true;
-            this.PrintLabel1.Location = new System.Drawing.Point(1375, 948);
+            this.PrintLabel1.Location = new System.Drawing.Point(1077, 155);
             this.PrintLabel1.Margin = new System.Windows.Forms.Padding(4);
             this.PrintLabel1.Name = "PrintLabel1";
             this.PrintLabel1.Size = new System.Drawing.Size(296, 39);
@@ -1199,45 +1156,42 @@
             // 
             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(1167, 946);
+            this.label8.Location = new System.Drawing.Point(869, 153);
             this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(165, 41);
+            this.label8.Size = new System.Drawing.Size(146, 41);
             this.label8.TabIndex = 257;
-            this.label8.Text = "打印标签1";
-            // 
-            // PrintList1
-            // 
-            this.PrintList1.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintList1.Location = new System.Drawing.Point(1375, 895);
-            this.PrintList1.Margin = new System.Windows.Forms.Padding(12, 14, 12, 14);
-            this.PrintList1.Name = "PrintList1";
-            this.PrintList1.Size = new System.Drawing.Size(298, 56);
-            this.PrintList1.TabIndex = 255;
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(1167, 891);
-            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(197, 41);
-            this.label10.TabIndex = 253;
-            this.label10.Text = "打印机列表1";
+            this.label8.Text = "内箱标签";
+            // 
+            // Printing1
+            // 
+            this.Printing1.AllPower = "ifall";
+            this.Printing1.BackColor = System.Drawing.Color.Transparent;
+            this.Printing1.DownImage = ((System.Drawing.Image)(resources.GetObject("Printing1.DownImage")));
+            this.Printing1.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.Printing1.Image = null;
+            this.Printing1.IsShowBorder = true;
+            this.Printing1.Location = new System.Drawing.Point(1098, 218);
+            this.Printing1.Margin = new System.Windows.Forms.Padding(5);
+            this.Printing1.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing1.MoveImage")));
+            this.Printing1.Name = "Printing1";
+            this.Printing1.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printing1.NormalImage")));
+            this.Printing1.Power = null;
+            this.Printing1.Size = new System.Drawing.Size(119, 48);
+            this.Printing1.TabIndex = 259;
+            this.Printing1.Tag = "ifread";
+            this.Printing1.Text = "打印内箱";
+            this.Printing1.UseVisualStyleBackColor = true;
+            this.Printing1.Click += new System.EventHandler(this.Printing1_Click);
             // 
             // Packing_PackageCollectionWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1752, 1164);
-            this.Controls.Add(this.PrintNum1);
-            this.Controls.Add(this.PrintSecond);
-            this.Controls.Add(this.label9);
+            this.Controls.Add(this.Printing1);
             this.Controls.Add(this.PrintLabel1);
             this.Controls.Add(this.label8);
-            this.Controls.Add(this.PrintList1);
-            this.Controls.Add(this.label10);
             this.Controls.Add(this.label7);
             this.Controls.Add(this.ms_endremark);
             this.Controls.Add(this.AutoPrint);
@@ -1410,12 +1364,8 @@
         private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Label ms_endremark;
-        private CustomControl.TextBoxWithIcon.EnterTextBox PrintNum1;
-        private System.Windows.Forms.CheckBox PrintSecond;
-        private System.Windows.Forms.Label label9;
         private CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel1;
         private System.Windows.Forms.Label label8;
-        private CustomControl.ComBoxWithFocus.PrinterCombox PrintList1;
-        private System.Windows.Forms.Label label10;
+        private CustomControl.ButtonUtil.NormalButton Printing1;
     }
 }

UAS_MES_ZT/FunctionCode/Packing/Packing_PackageCollectionWeigh.cs

@@ -248,17 +248,7 @@ namespace UAS_MES_NEW.Packing
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }
-                    if (PrintSecond.Checked)
-                    {
-                        if (Print.SinglePrint(Tag.ToString(),engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, pa_outboxcode.Text, int.Parse(PrintNum1.Text), oMakeCode == "" ? pa_makecode.Text : oMakeCode, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
-                        {
-                            OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                        }
-                    }
+
                     if (!AutoGenBoxCode.Checked)
                     {
                         pa_outboxcode.Focus();
@@ -613,13 +603,13 @@ namespace UAS_MES_NEW.Packing
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
             LoadCheckQTY();
-            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");
+            dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_url1,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 = "la_url";
             PrintLabel.ValueMember = "la_id";
 
             PrintLabel1.DataSource = dt.Copy();
-            PrintLabel1.DisplayMember = "la_url";
+            PrintLabel1.DisplayMember = "la_url1";
             PrintLabel1.ValueMember = "la_id";
         }
 
@@ -1110,5 +1100,43 @@ namespace UAS_MES_NEW.Packing
                 PreFix.Enabled = true;
             }
         }
+
+        private void Printing1_Click(object sender, EventArgs e)
+        {
+            if (PrintLabel.Items.Count != 0)
+            {
+                if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
+                {
+                    dh.ExecuteSql("update package set pa_printcount=pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+                    if (getwei.Checked)
+                    {
+                        ActWeigh = weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Replace("g", "").Trim();
+                        float weigh = float.Parse(ActWeigh);
+                        dh.ExecuteSql("update package set pa_weight=" + weigh + " where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+                    }
+                    //doc = lbl.Documents.Open(PrintLabel.Text);
+                    if (Print.SinglePrint(Tag.ToString(), engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), oMakeCode == "" ? pa_makecode.Text : oMakeCode, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
+                    {
+                        OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                    }
+                    if (!AutoGenBoxCode.Checked)
+                    {
+                        pa_outboxcode.Focus();
+                        pa_outboxcode.SelectAll();
+                    }
+                    else
+                    {
+                        sn_code.Focus();
+                        sn_code.SelectAll();
+                    }
+                }
+                else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱，请封箱后执行打印\n", Color.Red);
+            }
+            else OperateResult.AppendText(">>产品" + pr_code.Text + "未维护打印标签\n", Color.Red);
+        }
     }
 }

UAS_MES_ZT/FunctionCode/Packing/Packing_PackageCollectionWeigh.resx

@@ -364,4 +364,42 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="Printing1.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Printing1.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="Printing1.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
+</value>
+  </data>
 </root>